Attempt to fix Win64 issues

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

diff --git a/simd/jcclrss2-64.asm b/simd/jcclrss2-64.asm
index 89d218558edee9d0b5c54911bc391adf38150570..6e3316390c888c6c77ea8e31211ec1807f95bdbf 100644 (file)
--- a/simd/jcclrss2-64.asm
+++ b/simd/jcclrss2-64.asm
@@ -52,14 +52,14 @@ EXTN(jsimd_rgb_ycc_convert_sse2):
        collect_args
        push    rbx
 
-       mov     rcx, r10
+       mov     ecx, r10d
        test    rcx,rcx
        jz      near .return
 
        push    rcx
 
        mov rsi, r12
-       mov rcx, r13
+       mov ecx, r13d
        mov     rdi, JSAMPARRAY [rsi+0*SIZEOF_JSAMPARRAY]
        mov     rbx, JSAMPARRAY [rsi+1*SIZEOF_JSAMPARRAY]
        mov     rdx, JSAMPARRAY [rsi+2*SIZEOF_JSAMPARRAY]
@@ -70,7 +70,7 @@ EXTN(jsimd_rgb_ycc_convert_sse2):
        pop     rcx
 
        mov rsi, r11
-       mov     rax, r14
+       mov     eax, r14d
        test    rax,rax
        jle     near .return
 .rowloop:

diff --git a/simd/jcqnts2f-64.asm b/simd/jcqnts2f-64.asm
index 6d8a123738f75108d9c540b6a857515ab188d213..3dbcebb8db8f96259cc40cf28290b6acd58f8f9e 100644 (file)
--- a/simd/jcqnts2f-64.asm
+++ b/simd/jcqnts2f-64.asm
@@ -50,7 +50,7 @@ EXTN(jsimd_convsamp_float_sse2):
        packsswb xmm7,xmm7              ; xmm7 = PB_CENTERJSAMPLE (0x808080..)
 
        mov rsi, r10
-       mov     rax, r11
+       mov     eax, r11d
        mov rdi, r12
        mov     rcx, DCTSIZE/2
 .convloop:

diff --git a/simd/jcqnts2i-64.asm b/simd/jcqnts2i-64.asm
index 419c59361b3dfaeb665a1120ec46809fcd91abb1..1d1c6afa8b49eaebf29556c69fd5d89466452792 100644 (file)
--- a/simd/jcqnts2i-64.asm
+++ b/simd/jcqnts2i-64.asm
@@ -50,7 +50,7 @@ EXTN(jsimd_convsamp_sse2):
        psllw   xmm7,7                  ; xmm7={0xFF80 0xFF80 0xFF80 0xFF80 ..}
 
        mov rsi, r10
-       mov rax, r11
+       mov eax, r11d
        mov rdi, r12
        mov     rcx, DCTSIZE/4
 .convloop:

diff --git a/simd/jcsamss2-64.asm b/simd/jcsamss2-64.asm
index 502d225311bd6530d31603fe796cdd36b6fa8830..2318375f179c8a2d290f1d9987d1327a92c911b8 100644 (file)
--- a/simd/jcsamss2-64.asm
+++ b/simd/jcsamss2-64.asm
@@ -49,11 +49,11 @@ EXTN(jsimd_h2v1_downsample_sse2):
        mov     rbp,rsp
        collect_args
 
-       mov rcx, r13
+       mov ecx, r13d
        shl     rcx,3                   ; imul rcx,DCTSIZE (rcx = output_cols)
        jz      near .return
 
-       mov rdx, r10
+       mov edx, r10d
 
        ; -- expand_right_edge
 
@@ -62,7 +62,7 @@ EXTN(jsimd_h2v1_downsample_sse2):
        sub     rcx,rdx
        jle     short .expand_end
 
-       mov     rax, r11
+       mov     eax, r11d
        test    rax,rax
        jle     short .expand_end
 
@@ -90,7 +90,7 @@ EXTN(jsimd_h2v1_downsample_sse2):
 
        ; -- h2v1_downsample
 
-       mov     rax, r12        ; rowctr
+       mov     eax, r12d       ; rowctr
        test    eax,eax
        jle     near .return
 
@@ -193,11 +193,11 @@ EXTN(jsimd_h2v2_downsample_sse2):
        mov     rbp,rsp
        collect_args
 
-       mov     rcx, r13
+       mov     ecx, r13d
        shl     rcx,3                   ; imul rcx,DCTSIZE (rcx = output_cols)
        jz      near .return
 
-       mov     rdx, r10
+       mov     edx, r10d
 
        ; -- expand_right_edge
 
@@ -206,7 +206,7 @@ EXTN(jsimd_h2v2_downsample_sse2):
        sub     rcx,rdx
        jle     short .expand_end
 
-       mov     rax, r11
+       mov     eax, r11d
        test    rax,rax
        jle     short .expand_end
 
@@ -234,7 +234,7 @@ EXTN(jsimd_h2v2_downsample_sse2):
 
        ; -- h2v2_downsample
 
-       mov     rax, r12        ; rowctr
+       mov     eax, r12d       ; rowctr
        test    rax,rax
        jle     near .return
 

diff --git a/simd/jdclrss2-64.asm b/simd/jdclrss2-64.asm
index 52d133f450a8becd1bf9698c05c1c327b8c2937e..52421ba4235ce0e97d49920a3a1a7b16f0b69335 100644 (file)
--- a/simd/jdclrss2-64.asm
+++ b/simd/jdclrss2-64.asm
@@ -54,14 +54,14 @@ EXTN(jsimd_ycc_rgb_convert_sse2):
        collect_args
        push    rbx
 
-       mov     rcx, r10        ; num_cols
+       mov     ecx, r10d       ; num_cols
        test    rcx,rcx
        jz      near .return
 
        push    rcx
 
        mov     rdi, r11
-       mov     rcx, r12
+       mov     ecx, r12d
        mov     rsi, JSAMPARRAY [rdi+0*SIZEOF_JSAMPARRAY]
        mov     rbx, JSAMPARRAY [rdi+1*SIZEOF_JSAMPARRAY]
        mov     rdx, JSAMPARRAY [rdi+2*SIZEOF_JSAMPARRAY]
@@ -72,7 +72,7 @@ EXTN(jsimd_ycc_rgb_convert_sse2):
        pop     rcx
 
        mov     rdi, r13
-       mov     rax, r14
+       mov     eax, r14d
        test    rax,rax
        jle     near .return
 .rowloop:

diff --git a/simd/jdmrgss2-64.asm b/simd/jdmrgss2-64.asm
index c51c91b5c0758a10eb5a4dff78051f80c5f6dd1a..38c842e004f8ff8ae0634aad55f975d5c5344b59 100644 (file)
--- a/simd/jdmrgss2-64.asm
+++ b/simd/jdmrgss2-64.asm
@@ -54,14 +54,14 @@ EXTN(jsimd_h2v1_merged_upsample_sse2):
        collect_args
        push    rbx
 
-       mov     rcx, r10        ; col
+       mov     ecx, r10d       ; col
        test    rcx,rcx
        jz      near .return
 
        push    rcx
 
        mov     rdi, r11
-       mov     rcx, r12
+       mov     ecx, r12d
        mov     rsi, JSAMPARRAY [rdi+0*SIZEOF_JSAMPARRAY]
        mov     rbx, JSAMPARRAY [rdi+1*SIZEOF_JSAMPARRAY]
        mov     rdx, JSAMPARRAY [rdi+2*SIZEOF_JSAMPARRAY]
@@ -501,10 +501,10 @@ EXTN(jsimd_h2v2_merged_upsample_sse2):
        collect_args
        push    rbx
 
-       mov     rax, r10
+       mov     eax, r10d
 
        mov     rdi, r11
-       mov     rcx, r12
+       mov     ecx, r12d
        mov     rsi, JSAMPARRAY [rdi+0*SIZEOF_JSAMPARRAY]
        mov     rbx, JSAMPARRAY [rdi+1*SIZEOF_JSAMPARRAY]
        mov     rdx, JSAMPARRAY [rdi+2*SIZEOF_JSAMPARRAY]

diff --git a/simd/jdsamss2-64.asm b/simd/jdsamss2-64.asm
index f9c61fc9ec81636995cdb8e1403e9ce84570204b..8c69fe7aac43c334141f1107e52c9df0a201c02a 100644 (file)
--- a/simd/jdsamss2-64.asm
+++ b/simd/jdsamss2-64.asm
@@ -67,11 +67,11 @@ EXTN(jsimd_h2v1_fancy_upsample_sse2):
        mov     rbp,rsp
        collect_args
 
-       mov     rax, r11  ; colctr
+       mov     eax, r11d  ; colctr
        test    rax,rax
        jz      near .return
 
-       mov     rcx, r10        ; rowctr
+       mov     ecx, r10d       ; rowctr
        test    rcx,rcx
        jz      near .return
 
@@ -214,11 +214,11 @@ EXTN(jsimd_h2v2_fancy_upsample_sse2):
        collect_args
        push    rbx
 
-       mov     rax, r11  ; colctr
+       mov     eax, r11d  ; colctr
        test    rax,rax
        jz      near .return
 
-       mov     rcx, r10        ; rowctr
+       mov     ecx, r10d       ; rowctr
        test    rcx,rcx
        jz      near .return
 
@@ -506,12 +506,12 @@ EXTN(jsimd_h2v1_upsample_sse2):
        mov     rbp,rsp
        collect_args
 
-       mov     rdx, r11
+       mov     edx, r11d
        add     rdx, byte (2*SIZEOF_XMMWORD)-1
        and     rdx, byte -(2*SIZEOF_XMMWORD)
        jz      near .return
 
-       mov     rcx, r10        ; rowctr
+       mov     ecx, r10d       ; rowctr
        test    rcx,rcx
        jz      short .return
 
@@ -596,12 +596,12 @@ EXTN(jsimd_h2v2_upsample_sse2):
        collect_args
        push    rbx
 
-       mov     rdx, r11
+       mov     edx, r11d
        add     rdx, byte (2*SIZEOF_XMMWORD)-1
        and     rdx, byte -(2*SIZEOF_XMMWORD)
        jz      near .return
 
-       mov     rcx, r10        ; rowctr
+       mov     ecx, r10d       ; rowctr
        test    rcx,rcx
        jz      near .return
 

diff --git a/simd/jiss2flt-64.asm b/simd/jiss2flt-64.asm
index 3db52eecee3653ba059b05e6ea7ae1e5b5ff2be4..1cd51a861d6f67967b1e2ea6d8e2dec4cc42d33c 100644 (file)
--- a/simd/jiss2flt-64.asm
+++ b/simd/jiss2flt-64.asm
@@ -326,7 +326,7 @@ EXTN(jsimd_idct_float_sse2):
        mov     rax, [original_rbp]
        lea     rsi, [workspace]                        ; FAST_FLOAT * wsptr
        mov     rdi, r12        ; (JSAMPROW *)
-       mov     rax, r13
+       mov     eax, r13d
        mov     rcx, DCTSIZE/4                          ; ctr
 .rowloop:
 

diff --git a/simd/jiss2fst-64.asm b/simd/jiss2fst-64.asm
index 9e56a2cb398335ea889e146efd0bcaa19b4bf509..505631356102e3cf6400d975064f6de86d6ace3f 100644 (file)
--- a/simd/jiss2fst-64.asm
+++ b/simd/jiss2fst-64.asm
@@ -323,7 +323,7 @@ EXTN(jsimd_idct_ifast_sse2):
 
        mov     rax, [original_rbp]
        mov     rdi, r12        ; (JSAMPROW *)
-       mov     rax, r13
+       mov     eax, r13d
 
        ; -- Even part
 

diff --git a/simd/jiss2int-64.asm b/simd/jiss2int-64.asm
index 82da0a7184daf74a212302b0030a21bef16cdb51..54fed6afec4978f9e0516145df0caf249171dd80 100644 (file)
--- a/simd/jiss2int-64.asm
+++ b/simd/jiss2int-64.asm
@@ -515,7 +515,7 @@ EXTN(jsimd_idct_islow_sse2):
 
        mov     rax, [original_rbp]
        mov     rdi, r12        ; (JSAMPROW *)
-       mov     rax, r13
+       mov     eax, r13d
 
        ; -- Even part
 

diff --git a/simd/jiss2red-64.asm b/simd/jiss2red-64.asm
index f390367190d8bd13aa00ba1338b7bf6139103ec3..0121aeae5e536067b041c25ef3c7b18961474b0a 100644 (file)
--- a/simd/jiss2red-64.asm
+++ b/simd/jiss2red-64.asm
@@ -312,7 +312,7 @@ EXTN(jsimd_idct_4x4_sse2):
 
        mov     rax, [original_rbp]
        mov     rdi, r12        ; (JSAMPROW *)
-       mov     rax, r13
+       mov     eax, r13d
 
        ; -- Even part
 
@@ -521,7 +521,7 @@ EXTN(jsimd_idct_2x2_sse2):
        ; ---- Pass 2: process rows, store into output array.
 
        mov     rdi, r12        ; (JSAMPROW *)
-       mov     rax, r13
+       mov     eax, r13d
 
        ; | input:| result:|
        ; | A0 B0 |        |