Oops. The Windows version of collect_args/uncollect_args uses rsp, so…

… we still need the rsp prologue/epilogue, despite the fact that we aren't using the stack as a work area. This fixes a segfault on Windows caused by r1335. git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/trunk@1336 632fc199-4ca6-4c93-a231-07263d6284db
nvdla · Aug 9, 2014 · 8a74848 · 8a74848
1 parent a8ab342
commit 8a74848
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 0 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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