Fix the x86 build with NASM 0.98. Since NASM 0.98 is the default version on OS X...

git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/branches/1.2.x@906 632fc199-4ca6-4c93-a231-07263d6284db

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 0cc61fde07f71d568216107b72f0ba99b6894d7d..12a0b54e3ba76cb5f018749c167d9fd370a08892 100644 (file)
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -8,6 +8,10 @@ symlinks in /usr/lib/i386-linux-gnu for the TurboJPEG libraries in /usr/lib32.
 This allows those libraries to be used on MultiArch-compatible systems (such as
 Ubuntu 11 and later) without setting the linker path.
 
+[3] Fixed a regression caused by 1.2.1[7] whereby the build would fail with
+multiple "Mismatch in operand sizes" errors when attempting to build the x86
+SIMD code with NASM 0.98.
+
 
 1.2.1
 =====

diff --git a/simd/jdclrss2-64.asm b/simd/jdclrss2-64.asm
index 9b2e9308fe1c493e5e50f8efba0c548f93884864..7d17c52b81cdb93a5c2e922e2cdde737ebbfc0b7 100644 (file)
--- a/simd/jdclrss2-64.asm
+++ b/simd/jdclrss2-64.asm
@@ -2,7 +2,7 @@
 ; jdclrss2-64.asm - colorspace conversion (64-bit SSE2)
 ;
 ; Copyright 2009, 2012 Pierre Ossman <ossman@cendio.se> for Cendio AB
-; Copyright 2009 D. R. Commander
+; Copyright 2009, 2012 D. R. Commander
 ;
 ; Based on
 ; x86 SIMD extension for IJG JPEG library
@@ -288,7 +288,7 @@ EXTN(jsimd_ycc_rgb_convert_sse2):
        ; space.
        cmp     rcx, byte SIZEOF_MMWORD
        jb      short .column_st7
-       movq    MMWORD [rdi], xmmA
+       movq    XMM_MMWORD [rdi], xmmA
        add     rdi, byte SIZEOF_MMWORD
        sub     rcx, byte SIZEOF_MMWORD
        psrldq  xmmA, SIZEOF_MMWORD
@@ -297,7 +297,7 @@ EXTN(jsimd_ycc_rgb_convert_sse2):
        ; space.
        cmp     rcx, byte SIZEOF_DWORD
        jb      short .column_st3
-       movd    DWORD [rdi], xmmA
+       movd    XMM_DWORD [rdi], xmmA
        add     rdi, byte SIZEOF_DWORD
        sub     rcx, byte SIZEOF_DWORD
        psrldq  xmmA, SIZEOF_DWORD
@@ -407,7 +407,7 @@ EXTN(jsimd_ycc_rgb_convert_sse2):
        ; space.
        test    rcx, rcx
        jz      short .nextrow
-       movd    DWORD [rdi], xmmA
+       movd    XMM_DWORD [rdi], xmmA
 
 %endif ; RGB_PIXELSIZE ; ---------------
 

diff --git a/simd/jdclrss2.asm b/simd/jdclrss2.asm
index d26a5bbb69a57bdc701b1c13fac5e36cbb8b93b6..97754cb435ca95674a0b4a947110d25fc4c939b4 100644 (file)
--- a/simd/jdclrss2.asm
+++ b/simd/jdclrss2.asm
@@ -2,6 +2,7 @@
 ; jdclrss2.asm - colorspace conversion (SSE2)
 ;
 ; Copyright 2009, 2012 Pierre Ossman <ossman@cendio.se> for Cendio AB
+; Copyright 2012 D. R. Commander
 ;
 ; Based on
 ; x86 SIMD extension for IJG JPEG library
@@ -300,7 +301,7 @@ EXTN(jsimd_ycc_rgb_convert_sse2):
        ; space.
        cmp     ecx, byte SIZEOF_MMWORD
        jb      short .column_st7
-       movq    MMWORD [edi], xmmA
+       movq    XMM_MMWORD [edi], xmmA
        add     edi, byte SIZEOF_MMWORD
        sub     ecx, byte SIZEOF_MMWORD
        psrldq  xmmA, SIZEOF_MMWORD
@@ -309,7 +310,7 @@ EXTN(jsimd_ycc_rgb_convert_sse2):
        ; space.
        cmp     ecx, byte SIZEOF_DWORD
        jb      short .column_st3
-       movd    DWORD [edi], xmmA
+       movd    XMM_DWORD [edi], xmmA
        add     edi, byte SIZEOF_DWORD
        sub     ecx, byte SIZEOF_DWORD
        psrldq  xmmA, SIZEOF_DWORD
@@ -411,7 +412,7 @@ EXTN(jsimd_ycc_rgb_convert_sse2):
        ; space.
        cmp     ecx, byte SIZEOF_XMMWORD/8
        jb      short .column_st7
-       movq    MMWORD [edi], xmmA
+       movq    XMM_MMWORD [edi], xmmA
        add     edi, byte SIZEOF_XMMWORD/8*4
        sub     ecx, byte SIZEOF_XMMWORD/8
        psrldq  xmmA, SIZEOF_XMMWORD/8*4
@@ -420,7 +421,7 @@ EXTN(jsimd_ycc_rgb_convert_sse2):
        ; space.
        test    ecx, ecx
        jz      short .nextrow
-       movd    DWORD [edi], xmmA
+       movd    XMM_DWORD [edi], xmmA
 
 %endif ; RGB_PIXELSIZE ; ---------------
 

diff --git a/simd/jdmrgss2-64.asm b/simd/jdmrgss2-64.asm
index 5d8fc462fefd5898ad01582ef68ce51c416ea17a..ffbf6b25e40e7c60c278a33888b947bb779cc535 100644 (file)
--- a/simd/jdmrgss2-64.asm
+++ b/simd/jdmrgss2-64.asm
@@ -2,7 +2,7 @@
 ; jdmrgss2-64.asm - merged upsampling/color conversion (64-bit SSE2)
 ;
 ; Copyright 2009, 2012 Pierre Ossman <ossman@cendio.se> for Cendio AB
-; Copyright 2009 D. R. Commander
+; Copyright 2009, 2012 D. R. Commander
 ;
 ; Based on
 ; x86 SIMD extension for IJG JPEG library
@@ -292,7 +292,7 @@ EXTN(jsimd_h2v1_merged_upsample_sse2):
        ; space.
        cmp     rcx, byte SIZEOF_MMWORD
        jb      short .column_st7
-       movq    MMWORD [rdi], xmmA
+       movq    XMM_MMWORD [rdi], xmmA
        add     rdi, byte SIZEOF_MMWORD
        sub     rcx, byte SIZEOF_MMWORD
        psrldq  xmmA, SIZEOF_MMWORD
@@ -301,7 +301,7 @@ EXTN(jsimd_h2v1_merged_upsample_sse2):
        ; space.
        cmp     rcx, byte SIZEOF_DWORD
        jb      short .column_st3
-       movd    DWORD [rdi], xmmA
+       movd    XMM_DWORD [rdi], xmmA
        add     rdi, byte SIZEOF_DWORD
        sub     rcx, byte SIZEOF_DWORD
        psrldq  xmmA, SIZEOF_DWORD
@@ -405,7 +405,7 @@ EXTN(jsimd_h2v1_merged_upsample_sse2):
        ; space.
        cmp     rcx, byte SIZEOF_XMMWORD/8
        jb      short .column_st7
-       movq    MMWORD [rdi], xmmA
+       movq    XMM_MMWORD [rdi], xmmA
        add     rdi, byte SIZEOF_XMMWORD/8*4
        sub     rcx, byte SIZEOF_XMMWORD/8
        psrldq  xmmA, SIZEOF_XMMWORD/8*4
@@ -414,7 +414,7 @@ EXTN(jsimd_h2v1_merged_upsample_sse2):
        ; space.
        test    rcx, rcx
        jz      short .endcolumn
-       movd    DWORD [rdi], xmmA
+       movd    XMM_DWORD [rdi], xmmA
 
 %endif ; RGB_PIXELSIZE ; ---------------
 

diff --git a/simd/jdmrgss2.asm b/simd/jdmrgss2.asm
index f190468a5eff937a24d79e4afb92298d4e2ae520..6494340f215be7db70b49b850cc64e9fbedc2840 100644 (file)
--- a/simd/jdmrgss2.asm
+++ b/simd/jdmrgss2.asm
@@ -2,6 +2,7 @@
 ; jdmrgss2.asm - merged upsampling/color conversion (SSE2)
 ;
 ; Copyright 2009, 2012 Pierre Ossman <ossman@cendio.se> for Cendio AB
+; Copyright 2012 D. R. Commander
 ;
 ; Based on
 ; x86 SIMD extension for IJG JPEG library
@@ -305,7 +306,7 @@ EXTN(jsimd_h2v1_merged_upsample_sse2):
        ; space.
        cmp     ecx, byte SIZEOF_MMWORD
        jb      short .column_st7
-       movq    MMWORD [edi], xmmA
+       movq    XMM_MMWORD [edi], xmmA
        add     edi, byte SIZEOF_MMWORD
        sub     ecx, byte SIZEOF_MMWORD
        psrldq  xmmA, SIZEOF_MMWORD
@@ -314,7 +315,7 @@ EXTN(jsimd_h2v1_merged_upsample_sse2):
        ; space.
        cmp     ecx, byte SIZEOF_DWORD
        jb      short .column_st3
-       movd    DWORD [edi], xmmA
+       movd    XMM_DWORD [edi], xmmA
        add     edi, byte SIZEOF_DWORD
        sub     ecx, byte SIZEOF_DWORD
        psrldq  xmmA, SIZEOF_DWORD
@@ -419,7 +420,7 @@ EXTN(jsimd_h2v1_merged_upsample_sse2):
        ; space.
        cmp     ecx, byte SIZEOF_XMMWORD/8
        jb      short .column_st7
-       movq    MMWORD [edi], xmmA
+       movq    XMM_MMWORD [edi], xmmA
        add     edi, byte SIZEOF_XMMWORD/8*4
        sub     ecx, byte SIZEOF_XMMWORD/8
        psrldq  xmmA, SIZEOF_XMMWORD/8*4
@@ -428,7 +429,7 @@ EXTN(jsimd_h2v1_merged_upsample_sse2):
        ; space.
        test    ecx, ecx
        jz      short .endcolumn
-       movd    DWORD [edi], xmmA
+       movd    XMM_DWORD [edi], xmmA
 
 %endif ; RGB_PIXELSIZE ; ---------------