mozilla
/
mozjpeg
зеркало из https://github.com/mozilla/mozjpeg.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

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. 

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
Родитель 0f43551e08 b87a0b4687
Коммит 00c2cf3632
5 изменённых файлов: 23 добавлений и 17 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

4
ChangeLog.txt
Просмотреть файл

@ -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
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
=====

8
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 ; ---------------

9
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 ; ---------------

10
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 ; ---------------

9
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 ; ---------------