about summary refs log tree commit diff
path: root/src/signal/microblaze/sigsetjmp.s
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2015-04-17 21:54:42 -0400
committerRich Felker <dalias@aerifal.cx>2015-04-17 21:54:42 -0400
commit583e55122e767b1586286a0d9c35e2a4027998ab (patch)
tree369bc1f292ee44f7bdd702203aaf535d97569caf /src/signal/microblaze/sigsetjmp.s
parent81e18eb3cd61f7b68a8f99b3e6c728f2a4d79221 (diff)
downloadmusl-583e55122e767b1586286a0d9c35e2a4027998ab.tar.gz
musl-583e55122e767b1586286a0d9c35e2a4027998ab.tar.xz
musl-583e55122e767b1586286a0d9c35e2a4027998ab.zip
redesign sigsetjmp so that signal mask is restored after longjmp
the conventional way to implement sigsetjmp is to save the signal mask
then tail-call to setjmp; siglongjmp then restores the signal mask and
calls longjmp. the problem with this approach is that a signal already
pending, or arriving between unmasking of signals and restoration of
the saved stack pointer, will have its signal handler run on the stack
that was active before siglongjmp was called. this can lead to
unbounded stack usage when siglongjmp is used to leave a signal
handler.

in the new design, sigsetjmp saves its own return address inside the
extended part of the sigjmp_buf (outside the __jmp_buf part used by
setjmp) then calls setjmp to save a jmp_buf inside its own execution.
it then tail-calls to __sigsetjmp_tail, which uses the return value of
setjmp to determine whether to save the current signal mask or restore
a previously-saved mask.

as an added bonus, this design makes it so that siglongjmp and longjmp
are identical. this is useful because the __longjmp_chk function we
need to add for ABI-compatibility assumes siglongjmp and longjmp are
the same, but for different reasons -- it was designed assuming either
can access a flag just past the __jmp_buf indicating whether the
signal masked was saved, and act on that flag. however, early versions
of musl did not have space past the __jmp_buf for the non-sigjmp_buf
version of jmp_buf, so our setjmp cannot store such a flag without
risking clobbering memory on (very) old binaries.
Diffstat (limited to 'src/signal/microblaze/sigsetjmp.s')
-rw-r--r--src/signal/microblaze/sigsetjmp.s26
1 files changed, 13 insertions, 13 deletions
diff --git a/src/signal/microblaze/sigsetjmp.s b/src/signal/microblaze/sigsetjmp.s
index 2a23d147..8430c9c4 100644
--- a/src/signal/microblaze/sigsetjmp.s
+++ b/src/signal/microblaze/sigsetjmp.s
@@ -4,18 +4,18 @@
 .type __sigsetjmp,@function
 sigsetjmp:
 __sigsetjmp:
-	swi     r6, r5, 72
-	beqi    r6, setjmp@PLT
+	beqi r6, setjmp@PLT
 
-	addi    r1, r1, -32
-	swi     r15, r1, 28
-	swi     r5, r1, 24
-	addi    r7, r5, 76
-	add     r6, r0, r0
-	brlid   r15, sigprocmask@PLT
-	ori     r5, r0, 2
+	swi r15,r5,72
+	swi r19,r5,72+4+8
 
-	lwi     r15, r1, 28
-	lwi     r5, r1, 24
-	brid    setjmp@PLT
-	addi    r1, r1, 32
+	brlid r15,setjmp@PLT
+	 ori r19,r5,0
+
+	ori r6,r3,0
+	ori r5,r19,0
+	lwi r15,r5,72
+	lwi r19,r5,72+4+8
+
+.hidden __sigsetjmp_tail
+	bri __sigsetjmp_tail