Attempt to fix Win64 issues

git-svn-id: https://libjpeg-turbo.svn.sourceforge.net/svnroot/libjpeg-turbo@170 3789f03b-4d11-0410-bbf8-ca57d06f2519

11 files changed, 33 insertions, 33 deletions

diff --git a/trunk/simd/jcclrss2-64.asm b/trunk/simd/jcclrss2-64.asm
index 89d2185..6e33163 100644
--- a/trunk/simd/jcclrss2-64.asm
+++ b/trunk/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/trunk/simd/jcqnts2f-64.asm b/trunk/simd/jcqnts2f-64.asm
index 6d8a123..3dbcebb 100644
--- a/trunk/simd/jcqnts2f-64.asm
+++ b/trunk/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/trunk/simd/jcqnts2i-64.asm b/trunk/simd/jcqnts2i-64.asm
index 419c593..1d1c6af 100644
--- a/trunk/simd/jcqnts2i-64.asm
+++ b/trunk/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/trunk/simd/jcsamss2-64.asm b/trunk/simd/jcsamss2-64.asm
index 502d225..2318375 100644
--- a/trunk/simd/jcsamss2-64.asm
+++ b/trunk/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/trunk/simd/jdclrss2-64.asm b/trunk/simd/jdclrss2-64.asm
index 52d133f..52421ba 100644
--- a/trunk/simd/jdclrss2-64.asm
+++ b/trunk/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/trunk/simd/jdmrgss2-64.asm b/trunk/simd/jdmrgss2-64.asm
index c51c91b..38c842e 100644
--- a/trunk/simd/jdmrgss2-64.asm
+++ b/trunk/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/trunk/simd/jdsamss2-64.asm b/trunk/simd/jdsamss2-64.asm
index f9c61fc..8c69fe7 100644
--- a/trunk/simd/jdsamss2-64.asm
+++ b/trunk/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/trunk/simd/jiss2flt-64.asm b/trunk/simd/jiss2flt-64.asm
index 3db52ee..1cd51a8 100644
--- a/trunk/simd/jiss2flt-64.asm
+++ b/trunk/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/trunk/simd/jiss2fst-64.asm b/trunk/simd/jiss2fst-64.asm
index 9e56a2c..5056313 100644
--- a/trunk/simd/jiss2fst-64.asm
+++ b/trunk/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/trunk/simd/jiss2int-64.asm b/trunk/simd/jiss2int-64.asm
index 82da0a7..54fed6a 100644
--- a/trunk/simd/jiss2int-64.asm
+++ b/trunk/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/trunk/simd/jiss2red-64.asm b/trunk/simd/jiss2red-64.asm
index f390367..0121aea 100644
--- a/trunk/simd/jiss2red-64.asm
+++ b/trunk/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 |        |