diff options
| author |   kettenis <kettenis@openbsd.org> | 2020-07-02 08:59:45 +0000 |
|---|---|---|
| committer | kettenis <kettenis@openbsd.org> | 2020-07-02 08:59:45 +0000 |
| commit | b1b451713294b18b425f1e01de165421b8b8cef5 (patch) | |
| tree | 4ff2effb2a893708319b31e9f201458789e25025 | |
| parent | Preseed modify bits in pmap_enter(9). For some reason the hardware bits (diff) | |
| download | wireguard-openbsd-b1b451713294b18b425f1e01de165421b8b8cef5.tar.xz wireguard-openbsd-b1b451713294b18b425f1e01de165421b8b8cef5.zip | |
Use a relative branch to jump from setjmp(3) into _setjmp(4).
Use correct register to reference the location where we store CR.
| -rw-r--r-- | lib/libc/arch/powerpc64/gen/setjmp.S | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/lib/libc/arch/powerpc64/gen/setjmp.S b/lib/libc/arch/powerpc64/gen/setjmp.S index 7de3cfca4b8..170aa9ec4b4 100644 --- a/lib/libc/arch/powerpc64/gen/setjmp.S +++ b/lib/libc/arch/powerpc64/gen/setjmp.S @@ -1,4 +1,4 @@ -/* $OpenBSD: setjmp.S,v 1.2 2020/06/28 11:53:20 kettenis Exp $ */ +/* $OpenBSD: setjmp.S,v 1.3 2020/07/02 08:59:45 kettenis Exp $ */ /* * Copyright (c) 2020 Dale Rahn. All rights reserved. * @@ -72,13 +72,12 @@ ENTRY(setjmp) li %r0, SYS_sigprocmask sc std %r3, JMP_sig(%r5) - mr %r3, %r5 - b _setjmp + b 1f nop ENTRY(_setjmp) mr %r5, %r3 /* save jmpbuf addr in r5 */ - +1: addis %r7, %r2, __jmpxor@toc@ha addi %r7, %r7, __jmpxor@toc@l ld %r0, 0(%r7) /* xor for r1 */ @@ -110,7 +109,7 @@ ENTRY(_setjmp) xor %r7, %r6, %r7 /* use and overwrite the lr xor */ std %r7, JMP_lr(%r5) mfcr %r0 - std %r0, JMP_cr(3) + std %r0, JMP_cr(%r5) mfctr %r0 std %r0, JMP_ctr(%r5) mfxer %r0 |