Oops. The Windows version of collect_args/uncollect_args uses rsp, so we still need...

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

diff --git a/simd/jccolext-sse2-64.asm b/simd/jccolext-sse2-64.asm
index 5dbdc273b3a9e3d814ccf266577065b0134fa0e3..079953ac2c70b46417ba8a72acffbc7713140350 100644 (file)
--- a/simd/jccolext-sse2-64.asm
+++ b/simd/jccolext-sse2-64.asm
@@ -37,6 +37,9 @@
         global  EXTN(jsimd_rgb_ycc_convert_sse2)
 
 EXTN(jsimd_rgb_ycc_convert_sse2):
+        push    rbp
+        mov     rax,rsp
+        mov     rbp,rsp
         collect_args
         push    rbx
 
@@ -453,6 +456,7 @@ EXTN(jsimd_rgb_ycc_convert_sse2):
 .return:
         pop     rbx
         uncollect_args
+        pop     rbp
         ret
 
 ; For some reason, the OS X linker does not honor the request to align the

diff --git a/simd/jcgryext-sse2-64.asm b/simd/jcgryext-sse2-64.asm
index e399be9c20c8ae8791eb0f9a1fbfce2701cac417..abdd9a06aa65989ecc6fbc0bcc53db9345344819 100644 (file)
--- a/simd/jcgryext-sse2-64.asm
+++ b/simd/jcgryext-sse2-64.asm
@@ -37,6 +37,9 @@
         global  EXTN(jsimd_rgb_gray_convert_sse2)
 
 EXTN(jsimd_rgb_gray_convert_sse2):
+        push    rbp
+        mov     rax,rsp
+        mov     rbp,rsp
         collect_args
         push    rbx
 
@@ -338,6 +341,7 @@ EXTN(jsimd_rgb_gray_convert_sse2):
 .return:
         pop     rbx
         uncollect_args
+        pop     rbp
         ret
 
 ; For some reason, the OS X linker does not honor the request to align the

diff --git a/simd/jfdctfst-sse2-64.asm b/simd/jfdctfst-sse2-64.asm
index 0e2bd90d28254fcc1035ed00c82d42c80183aa17..fe87fccd5484a731027e1a0b7884146acc3a8f7d 100644 (file)
--- a/simd/jfdctfst-sse2-64.asm
+++ b/simd/jfdctfst-sse2-64.asm
@@ -80,6 +80,9 @@ PW_F1306        times 8 dw  F_1_306 << CONST_SHIFT
         global  EXTN(jsimd_fdct_ifast_sse2)
 
 EXTN(jsimd_fdct_ifast_sse2):
+        push    rbp
+        mov     rax,rsp
+        mov     rbp,rsp
         collect_args
 
         ; ---- Pass 1: process rows.
@@ -343,6 +346,7 @@ EXTN(jsimd_fdct_ifast_sse2):
         movdqa  XMMWORD [XMMBLOCK(7,0,rdx,SIZEOF_DCTELEM)], xmm15
 
         uncollect_args
+        pop     rbp
         ret
 
 ; For some reason, the OS X linker does not honor the request to align the

diff --git a/simd/jfdctint-sse2-64.asm b/simd/jfdctint-sse2-64.asm
index 6a7c002884457c568033686ac03821bef0c56e86..996a53b3872ac5e775d4321502ee441376622381 100644 (file)
--- a/simd/jfdctint-sse2-64.asm
+++ b/simd/jfdctint-sse2-64.asm
@@ -101,6 +101,9 @@ PW_DESCALE_P2X  times 8 dw  1 << (PASS1_BITS-1)
         global  EXTN(jsimd_fdct_islow_sse2)
 
 EXTN(jsimd_fdct_islow_sse2):
+        push    rbp
+        mov     rax,rsp
+        mov     rbp,rsp
         collect_args
 
         ; ---- Pass 1: process rows.
@@ -552,6 +555,7 @@ EXTN(jsimd_fdct_islow_sse2):
         movdqa  XMMWORD [XMMBLOCK(7,0,rdx,SIZEOF_DCTELEM)], xmm15
 
         uncollect_args
+        pop     rbp
         ret
 
 ; For some reason, the OS X linker does not honor the request to align the