Fixed regression caused by a bug in the 32-bit strict memory access code in jdmrgss2...

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

diff --git a/simd/jdmrgss2-64.asm b/simd/jdmrgss2-64.asm
index 36e25822d5c03937c18919ad07742803454cce0d..ba3de350ed58ab14443032667241438e67939db1 100644 (file)
--- a/simd/jdmrgss2-64.asm
+++ b/simd/jdmrgss2-64.asm
@@ -12,7 +12,7 @@
 ; This file should be assembled with NASM (Netwide Assembler),
 ; can *not* be assembled with Microsoft's MASM or any compatible
 ; assembler (including Borland's Turbo Assembler).
-; NASM is available from http://nasm.sourceforge.net/ for
+; NASM is available from http://nasm.sourceforge.net/ or
 ; http://sourceforge.net/project/showfiles.php?group_id=6208
 ;
 ; [TAB8]

diff --git a/simd/jdmrgss2.asm b/simd/jdmrgss2.asm
index 6a0dbd9198c56c87e08e3ad582e0e7144c32ed9d..a00e53980bd2b0045e3b62e34da280e15c2447a8 100644 (file)
--- a/simd/jdmrgss2.asm
+++ b/simd/jdmrgss2.asm
@@ -478,9 +478,9 @@ EXTN(jsimd_h2v1_merged_upsample_sse2):
        cmp     ecx, byte SIZEOF_XMMWORD/8
        jb      short .column_st7
        movq    MMWORD [edi], xmmA
-       add     edi, byte SIZEOF_XMMWORD/2
+       add     edi, byte SIZEOF_XMMWORD/8*4
        sub     ecx, byte SIZEOF_XMMWORD/8
-       psrldq  xmmA, 64
+       psrldq  xmmA, SIZEOF_XMMWORD/8*4
 .column_st7:
        ; Store one pixel (4 bytes) of xmmA to the output when it has enough
        ; space.