d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix an embarresing transcription error from i386 to amd64. Put the arguments

Browse Source 
to sigprocmask(2) int the correct order. *blush*.
For sigsetjmp(), match up the pushq/popq in the non-savemask case.
This commit is contained in:
Peter Wemm 2003-05-08 06:25:03 +00:00
parent 65162a6169
commit 7ef6516c60
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/libc/amd64/gen/setjmp.S
View File

@ -55,9 +55,9 @@ __FBSDID("$FreeBSD$");
ENTRY(setjmp)
pushq %rdi
movq %rdi,%rcx
leaq 72(%rcx),%rdi /* (sigset_t*)oset */
movq $1,%rdi /* SIG_BLOCK */
movq $0,%rsi /* (sigset_t*)set */
movq $1,%rdx /* SIG_BLOCK */
leaq 72(%rcx),%rdx /* (sigset_t*)oset */
call PIC_PLT(CNAME(_sigprocmask))
popq %rdi
movq %rdi,%rcx
@ -80,9 +80,9 @@ ENTRY(__longjmp)
pushq %rdi
pushq %rsi
movq %rdi,%rdx
movq $0,%rdi /* (sigset_t*)oset */
movq $1,%rdi /* SIG_SETMASK */
leaq 72(%rdx),%rsi /* (sigset_t*)set */
movq $3,%rdx /* SIG_SETMASK */
movq $0,%rdx /* (sigset_t*)oset */
call PIC_PLT(CNAME(_sigprocmask))
popq %rsi
popq %rdi /* jmpbuf */

17
lib/libc/amd64/gen/sigsetjmp.S
View File

@ -58,18 +58,17 @@ __FBSDID("$FreeBSD$");
*/
ENTRY(sigsetjmp)
pushq %rdi
movq %rdi,%rcx
movl %esi,88(%rcx)
movl %esi,88(%rdi)
testl %esi,%esi
jz 2f
leaq 72(%rcx),%rdi /* (sigset_t*)oset */
pushq %rdi
movq $1,%rdi /* SIG_BLOCK */
movq $0,%rsi /* (sigset_t*)set */
movq $1,%rdx /* SIG_BLOCK */
leaq 72(%rcx),%rdx /* (sigset_t*)oset */
call PIC_PLT(CNAME(_sigprocmask))
popq %rdi
movq %rdi,%rcx
2: movq 0(%rsp),%rdx /* retval */
2: movq %rdi,%rcx
movq 0(%rsp),%rdx /* retval */
movq %rdx, 0(%rcx) /* retval */
movq %rbx, 8(%rcx)
movq %rsp,16(%rcx)
@ -90,9 +89,9 @@ ENTRY(__siglongjmp)
movq %rdi,%rdx
pushq %rdi
pushq %rsi
movq $0,%rdi /* (sigset_t*)oset */
movq $3,%rdi /* SIG_SETMASK */
leaq 72(%rdx),%rsi /* (sigset_t*)set */
movq $3,%rdx /* SIG_SETMASK */
movq $0,%rdx /* (sigset_t*)oset */
call PIC_PLT(CNAME(_sigprocmask))
popq %rsi
popq %rdi /* jmpbuf */