x86inc.asm: remove private_prefix define and config.asm include

Makes using unmodified upstream x86inc.asm possible.

20 files changed, 21 insertions, 4 deletions

diff --git a/meson.build b/meson.build
index e657121..e354f09 100644
--- a/meson.build
+++ b/meson.build
@@ -351,6 +351,7 @@ cdata.set10('ARCH_X86_64', host_machine.cpu_family() == 'x86_64')
 cdata.set10('ARCH_X86_32', host_machine.cpu_family() == 'x86')
 
 if host_machine.cpu_family().startswith('x86')
+    cdata_asm.set('private_prefix', 'dav1d')
     cdata_asm.set10('ARCH_X86_64', host_machine.cpu_family() == 'x86_64')
     cdata_asm.set10('ARCH_X86_32', host_machine.cpu_family() == 'x86')
     cdata_asm.set10('PIC', true)
diff --git a/src/ext/x86/x86inc.asm b/src/ext/x86/x86inc.asm
index 16524ac..60384bf 100644
--- a/src/ext/x86/x86inc.asm
+++ b/src/ext/x86/x86inc.asm
@@ -27,10 +27,8 @@
 ; It also has various other useful features to simplify writing the kind of
 ; DSP functions that are most often used.
 
-%include "config.asm"
-
 %ifndef private_prefix
-    %define private_prefix dav1d
+    %error private_prefix not defined
 %endif
 
 %ifndef public_prefix
diff --git a/src/x86/cdef_avx2.asm b/src/x86/cdef_avx2.asm
index 643caa0..672fae7 100644
--- a/src/x86/cdef_avx2.asm
+++ b/src/x86/cdef_avx2.asm
@@ -23,6 +23,7 @@
 ; (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 ; SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+%include "config.asm"
 %include "ext/x86/x86inc.asm"
 
 %if ARCH_X86_64
diff --git a/src/x86/cdef_avx512.asm b/src/x86/cdef_avx512.asm
index e7eee9e..b1fa1ad 100644
--- a/src/x86/cdef_avx512.asm
+++ b/src/x86/cdef_avx512.asm
@@ -23,6 +23,7 @@
 ; (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 ; SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+%include "config.asm"
 %include "ext/x86/x86inc.asm"
 
 %if HAVE_AVX512ICL && ARCH_X86_64
diff --git a/src/x86/cdef_sse.asm b/src/x86/cdef_sse.asm
index c626d8f..2dcaf22 100644
--- a/src/x86/cdef_sse.asm
+++ b/src/x86/cdef_sse.asm
@@ -24,6 +24,7 @@
 ; (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 ; SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+%include "config.asm"
 %include "ext/x86/x86inc.asm"
 
 SECTION_RODATA 16
diff --git a/src/x86/cpuid.asm b/src/x86/cpuid.asm
index c08df50..d4ee682 100644
--- a/src/x86/cpuid.asm
+++ b/src/x86/cpuid.asm
@@ -23,6 +23,7 @@
 ; (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 ; SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+%include "config.asm"
 %include "ext/x86/x86inc.asm"
 
 SECTION .text
diff --git a/src/x86/film_grain.asm b/src/x86/film_grain.asm
index 94ee123..72a1e3c 100644
--- a/src/x86/film_grain.asm
+++ b/src/x86/film_grain.asm
@@ -23,6 +23,7 @@
 ; (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 ; SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+%include "config.asm"
 %include "ext/x86/x86inc.asm"
 
 %if ARCH_X86_64
diff --git a/src/x86/film_grain_ssse3.asm b/src/x86/film_grain_ssse3.asm
index 8212846..9e47ea0 100644
--- a/src/x86/film_grain_ssse3.asm
+++ b/src/x86/film_grain_ssse3.asm
@@ -23,6 +23,7 @@
 ; (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 ; SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+%include "config.asm"
 %include "ext/x86/x86inc.asm"
 
 SECTION_RODATA
diff --git a/src/x86/ipred.asm b/src/x86/ipred.asm
index ad05b3b..20fd89d 100644
--- a/src/x86/ipred.asm
+++ b/src/x86/ipred.asm
@@ -23,6 +23,7 @@
 ; (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 ; SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+%include "config.asm"
 %include "ext/x86/x86inc.asm"
 
 %if ARCH_X86_64
diff --git a/src/x86/ipred_ssse3.asm b/src/x86/ipred_ssse3.asm
index 58cb0a4..06ee256 100644
--- a/src/x86/ipred_ssse3.asm
+++ b/src/x86/ipred_ssse3.asm
@@ -23,6 +23,7 @@
 ; (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 ; SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+%include "config.asm"
 %include "ext/x86/x86inc.asm"
 
 SECTION_RODATA 16
diff --git a/src/x86/itx.asm b/src/x86/itx.asm
index f27b900..5b373c5 100644
--- a/src/x86/itx.asm
+++ b/src/x86/itx.asm
@@ -23,6 +23,7 @@
 ; (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 ; SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+%include "config.asm"
 %include "ext/x86/x86inc.asm"
 
 %if ARCH_X86_64
diff --git a/src/x86/itx_ssse3.asm b/src/x86/itx_ssse3.asm
index 91cf666..3ebd3cc 100644
--- a/src/x86/itx_ssse3.asm
+++ b/src/x86/itx_ssse3.asm
@@ -23,6 +23,7 @@
 ; (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 ; SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+%include "config.asm"
 %include "ext/x86/x86inc.asm"
 
 
diff --git a/src/x86/loopfilter.asm b/src/x86/loopfilter.asm
index 5011868..8cf20b6 100644
--- a/src/x86/loopfilter.asm
+++ b/src/x86/loopfilter.asm
@@ -23,6 +23,7 @@
 ; (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 ; SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+%include "config.asm"
 %include "ext/x86/x86inc.asm"
 
 %if ARCH_X86_64
diff --git a/src/x86/looprestoration.asm b/src/x86/looprestoration.asm
index 3e3c35c..fc6e9f1 100644
--- a/src/x86/looprestoration.asm
+++ b/src/x86/looprestoration.asm
@@ -23,6 +23,7 @@
 ; (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 ; SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+%include "config.asm"
 %include "ext/x86/x86inc.asm"
 
 %if ARCH_X86_64
diff --git a/src/x86/looprestoration_ssse3.asm b/src/x86/looprestoration_ssse3.asm
index aaaea78..d11f68e 100644
--- a/src/x86/looprestoration_ssse3.asm
+++ b/src/x86/looprestoration_ssse3.asm
@@ -24,6 +24,7 @@
 ; (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 ; SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+%include "config.asm"
 %include "ext/x86/x86inc.asm"
 
 SECTION_RODATA 16
diff --git a/src/x86/mc_avx2.asm b/src/x86/mc_avx2.asm
index bc1c0cf..d1de9ba 100644
--- a/src/x86/mc_avx2.asm
+++ b/src/x86/mc_avx2.asm
@@ -23,6 +23,7 @@
 ; (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 ; SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+%include "config.asm"
 %include "ext/x86/x86inc.asm"
 
 %if ARCH_X86_64
diff --git a/src/x86/mc_avx512.asm b/src/x86/mc_avx512.asm
index ca8283b..a13c242 100644
--- a/src/x86/mc_avx512.asm
+++ b/src/x86/mc_avx512.asm
@@ -23,6 +23,7 @@
 ; (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 ; SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+%include "config.asm"
 %include "ext/x86/x86inc.asm"
 
 %if HAVE_AVX512ICL && ARCH_X86_64
diff --git a/src/x86/mc_sse.asm b/src/x86/mc_sse.asm
index bfe1037..9ee7061 100644
--- a/src/x86/mc_sse.asm
+++ b/src/x86/mc_sse.asm
@@ -24,6 +24,7 @@
 ; (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 ; SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+%include "config.asm"
 %include "ext/x86/x86inc.asm"
 
 SECTION_RODATA 16
diff --git a/src/x86/msac.asm b/src/x86/msac.asm
index 756e19b..8d59c64 100644
--- a/src/x86/msac.asm
+++ b/src/x86/msac.asm
@@ -23,6 +23,7 @@
 ; (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 ; SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+%include "config.asm"
 %include "ext/x86/x86inc.asm"
 
 SECTION_RODATA 64 ; avoids cacheline splits
diff --git a/tests/checkasm/x86/checkasm.asm b/tests/checkasm/x86/checkasm.asm
index bc7ec22..5ec7287 100644
--- a/tests/checkasm/x86/checkasm.asm
+++ b/tests/checkasm/x86/checkasm.asm
@@ -23,8 +23,9 @@
 ; (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 ; SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-%define private_prefix checkasm
 %include "config.asm"
+%undef private_prefix
+%define private_prefix checkasm
 %include "ext/x86/x86inc.asm"
 
 SECTION_RODATA 16