ryan/mozjpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix the x86 build with NASM 0.98. Since NASM 0.98 is the default version on OS X, we want to at least allow people to build 32-bit code with it, even though it can't properly build 64-bit code.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/trunk@905 632fc199-4ca6-4c93-a231-07263d6284db
This commit is contained in:
DRC
2013-01-13 12:12:53 +00:00
parent 0f43551e08 b87a0b4687
commit 00c2cf3632
5 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog.txt
View File

@@ -43,6 +43,10 @@ bottom right corner (feature ported from jpeg-8d.)
[10] JPEG files using the RGB colorspace can now be decompressed into grayscale [10] JPEG files using the RGB colorspace can now be decompressed into grayscale
images (feature ported from jpeg-8d.) images (feature ported from jpeg-8d.)
[11] 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 1.2.1
===== =====

8
simd/jdclrss2-64.asm
View File

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

9
simd/jdclrss2.asm
View File

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

10
simd/jdmrgss2-64.asm
View File

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

9
simd/jdmrgss2.asm
View File

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