mailing list of musl libc
 help / color / mirror / code / Atom feed
* [musl] [PATCH 1/3] setjmp: fix x86-64 longjmp argument adjustment
@ 2020-08-11 18:11 Alexander Monakov
  2020-08-11 18:11 ` [musl] [PATCH 2/3] setjmp: avoid useless REX-prefix on xor %eax, %eax Alexander Monakov
                   ` (3 more replies)
  0 siblings, 4 replies; 11+ messages in thread
From: Alexander Monakov @ 2020-08-11 18:11 UTC (permalink / raw)
  To: musl

longjmp 'val' argument is an int, but the assembly is referencing 64-bit
registers as if the argument was a long, or the caller was responsible
for extending the argument. Though the psABI is not clear on this, the
interpretation in GCC is that high bits may be arbitrary and the callee
is responsible for sign/zero-extending the value as needed (likewise for
return values: callers must anticipate that high bits may be garbage).

Therefore testing %rax is a functional bug: setjmp would wrongly return
zero if longjmp was called with val==0, but high bits of %rsi happened
to be non-zero.

Rewrite the prologue to refer to 32-bit registers. In passing, change
'test' to use %rsi, as there's no advantage to using %rax and the new
form is cheaper on processors that do not perform move elimination.
---
 src/setjmp/x32/longjmp.s    | 6 +++---
 src/setjmp/x86_64/longjmp.s | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/setjmp/x32/longjmp.s b/src/setjmp/x32/longjmp.s
index e175a4b9..e709acad 100644
--- a/src/setjmp/x32/longjmp.s
+++ b/src/setjmp/x32/longjmp.s
@@ -5,10 +5,10 @@
 .type longjmp,@function
 _longjmp:
 longjmp:
-	mov %rsi,%rax           /* val will be longjmp return */
-	test %rax,%rax
+	mov %esi,%eax           /* val will be longjmp return */
+	test %esi,%esi
 	jnz 1f
-	inc %rax                /* if val==0, val=1 per longjmp semantics */
+	inc %eax                /* if val==0, val=1 per longjmp semantics */
 1:
 	mov (%rdi),%rbx         /* rdi is the jmp_buf, restore regs from it */
 	mov 8(%rdi),%rbp
diff --git a/src/setjmp/x86_64/longjmp.s b/src/setjmp/x86_64/longjmp.s
index e175a4b9..e709acad 100644
--- a/src/setjmp/x86_64/longjmp.s
+++ b/src/setjmp/x86_64/longjmp.s
@@ -5,10 +5,10 @@
 .type longjmp,@function
 _longjmp:
 longjmp:
-	mov %rsi,%rax           /* val will be longjmp return */
-	test %rax,%rax
+	mov %esi,%eax           /* val will be longjmp return */
+	test %esi,%esi
 	jnz 1f
-	inc %rax                /* if val==0, val=1 per longjmp semantics */
+	inc %eax                /* if val==0, val=1 per longjmp semantics */
 1:
 	mov (%rdi),%rbx         /* rdi is the jmp_buf, restore regs from it */
 	mov 8(%rdi),%rbp
-- 
2.11.0


^ permalink raw reply	[flat|nested] 11+ messages in thread

end of thread, other threads:[~2020-08-13  8:54 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-08-11 18:11 [musl] [PATCH 1/3] setjmp: fix x86-64 longjmp argument adjustment Alexander Monakov
2020-08-11 18:11 ` [musl] [PATCH 2/3] setjmp: avoid useless REX-prefix on xor %eax, %eax Alexander Monakov
2020-08-11 18:11 ` [musl] [PATCH 3/3] setjmp: optimize x86 longjmp epilogues Alexander Monakov
2020-08-11 18:45 ` [musl] [PATCH 1/3] setjmp: fix x86-64 longjmp argument adjustment Rich Felker
2020-08-12 13:29   ` Alexander Monakov
2020-08-12 21:44     ` Szabolcs Nagy
2020-08-12 22:13       ` Szabolcs Nagy
2020-08-13  8:01     ` Jens Gustedt
2020-08-13  8:53       ` Alexander Monakov
2020-08-11 23:10 ` [musl] [PATCH] setjmp: optimize x86-64 longjmp prologues Alexander Monakov
2020-08-12 11:34   ` [musl] [PATCH 4/3] setjmp: optimize " Alexander Monakov

Code repositories for project(s) associated with this public inbox

	https://git.vuxu.org/mirror/musl/

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).