Page MenuHomeFreeBSD

D61751.1795336412.diff
No OneTemporary

Authored By
Unknown
Size
9 KB
Referenced Files
None
Subscribers
None

D61751.1795336412.diff

diff --git a/lib/libc/powerpc64/gen/Makefile.inc b/lib/libc/powerpc64/gen/Makefile.inc
--- a/lib/libc/powerpc64/gen/Makefile.inc
+++ b/lib/libc/powerpc64/gen/Makefile.inc
@@ -1,6 +1,7 @@
SRCS += _ctx_start.S fabs.S flt_rounds.c fpgetmask.c fpgetround.c \
fpgetsticky.c fpsetmask.c fpsetround.c \
- infinity.c ldexp.c makecontext.c _setjmp.S \
- setjmp.S sigsetjmp.S signalcontext.c syncicache.c \
+ infinity.c ldexp.c makecontext.c _setjmp.S _setjmp_altivec.S \
+ setjmp.S setjmp_altivec.S setjmp_resolver.c sigsetjmp.S \
+ sigsetjmp_altivec.S signalcontext.c syncicache.c \
trivial-getcontextx.c
diff --git a/lib/libc/powerpc64/gen/_setjmp.S b/lib/libc/powerpc64/gen/_setjmp.S
--- a/lib/libc/powerpc64/gen/_setjmp.S
+++ b/lib/libc/powerpc64/gen/_setjmp.S
@@ -48,7 +48,12 @@
* | ... |
*/
-ENTRY(_setjmp)
+#ifndef FN_SETJMP
+#define FN_SETJMP ___setjmp
+#define FN_LONGJMP ___longjmp
+#endif
+
+ENTRY(FN_SETJMP)
mflr %r11
mfcr %r12
mr %r10,%r1
@@ -94,11 +99,42 @@
std %r29,40 + 20*8(%r3)
std %r30,40 + 21*8(%r3)
std %r31,40 + 22*8(%r3)
+#ifdef SETJMP_ALTIVEC
+ /*
+ * v20-v31 are non-volatile too. stvx needs 16-byte alignment, which
+ * jmp_buf doesn't have, so round the save area up.
+ */
+ addi %r5,%r3,40 + 41*8 + 15
+ clrrdi %r5,%r5,4
+ stvx %v20,0,%r5
+ addi %r5,%r5,16
+ stvx %v21,0,%r5
+ addi %r5,%r5,16
+ stvx %v22,0,%r5
+ addi %r5,%r5,16
+ stvx %v23,0,%r5
+ addi %r5,%r5,16
+ stvx %v24,0,%r5
+ addi %r5,%r5,16
+ stvx %v25,0,%r5
+ addi %r5,%r5,16
+ stvx %v26,0,%r5
+ addi %r5,%r5,16
+ stvx %v27,0,%r5
+ addi %r5,%r5,16
+ stvx %v28,0,%r5
+ addi %r5,%r5,16
+ stvx %v29,0,%r5
+ addi %r5,%r5,16
+ stvx %v30,0,%r5
+ addi %r5,%r5,16
+ stvx %v31,0,%r5
+#endif
li %r3,0
blr
-END(_setjmp)
+END(FN_SETJMP)
-ENTRY(_longjmp)
+ENTRY(FN_LONGJMP)
ld %r9,40 + 0*8(%r3)
lfd %f14,40 + 23*8(%r3)
ld %r10,40 + 1*8(%r3)
@@ -139,6 +175,34 @@
ld %r29,40 + 20*8(%r3)
ld %r30,40 + 21*8(%r3)
ld %r31,40 + 22*8(%r3)
+#ifdef SETJMP_ALTIVEC
+ /* v20-v31, see above */
+ addi %r5,%r3,40 + 41*8 + 15
+ clrrdi %r5,%r5,4
+ lvx %v20,0,%r5
+ addi %r5,%r5,16
+ lvx %v21,0,%r5
+ addi %r5,%r5,16
+ lvx %v22,0,%r5
+ addi %r5,%r5,16
+ lvx %v23,0,%r5
+ addi %r5,%r5,16
+ lvx %v24,0,%r5
+ addi %r5,%r5,16
+ lvx %v25,0,%r5
+ addi %r5,%r5,16
+ lvx %v26,0,%r5
+ addi %r5,%r5,16
+ lvx %v27,0,%r5
+ addi %r5,%r5,16
+ lvx %v28,0,%r5
+ addi %r5,%r5,16
+ lvx %v29,0,%r5
+ addi %r5,%r5,16
+ lvx %v30,0,%r5
+ addi %r5,%r5,16
+ lvx %v31,0,%r5
+#endif
mtlr %r11
mtcr %r12
@@ -148,6 +212,6 @@
bnelr
li %r3,1
blr
-END(_longjmp)
+END(FN_LONGJMP)
.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc/powerpc64/gen/_setjmp_altivec.S b/lib/libc/powerpc64/gen/_setjmp_altivec.S
new file mode 100644
--- /dev/null
+++ b/lib/libc/powerpc64/gen/_setjmp_altivec.S
@@ -0,0 +1,11 @@
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2026 Piotr Kubaj
+ */
+
+#define FN_SETJMP ___setjmp_altivec
+#define FN_LONGJMP ___longjmp_altivec
+#define SETJMP_ALTIVEC
+
+#include "_setjmp.S"
diff --git a/lib/libc/powerpc64/gen/setjmp.S b/lib/libc/powerpc64/gen/setjmp.S
--- a/lib/libc/powerpc64/gen/setjmp.S
+++ b/lib/libc/powerpc64/gen/setjmp.S
@@ -50,7 +50,12 @@
* | ... |
*/
-ENTRY(setjmp)
+#ifndef FN_SETJMP
+#define FN_SETJMP __setjmp
+#define FN_LONGJMP __longjmp
+#endif
+
+ENTRY(FN_SETJMP)
mr %r6,%r3
li %r3,1 /* SIG_BLOCK, but doesn't matter */
/* since set == NULL */
@@ -106,14 +111,43 @@
std %r30,40 + 21*8(%r6)
std %r31,40 + 22*8(%r6)
- /* XXX Altivec regs */
+#ifdef SETJMP_ALTIVEC
+ /*
+ * v20-v31 are non-volatile too. stvx needs 16-byte alignment, which
+ * jmp_buf doesn't have, so round the save area up.
+ */
+ addi %r5,%r6,40 + 41*8 + 15
+ clrrdi %r5,%r5,4
+ stvx %v20,0,%r5
+ addi %r5,%r5,16
+ stvx %v21,0,%r5
+ addi %r5,%r5,16
+ stvx %v22,0,%r5
+ addi %r5,%r5,16
+ stvx %v23,0,%r5
+ addi %r5,%r5,16
+ stvx %v24,0,%r5
+ addi %r5,%r5,16
+ stvx %v25,0,%r5
+ addi %r5,%r5,16
+ stvx %v26,0,%r5
+ addi %r5,%r5,16
+ stvx %v27,0,%r5
+ addi %r5,%r5,16
+ stvx %v28,0,%r5
+ addi %r5,%r5,16
+ stvx %v29,0,%r5
+ addi %r5,%r5,16
+ stvx %v30,0,%r5
+ addi %r5,%r5,16
+ stvx %v31,0,%r5
+#endif
li %r3,0 /* return (0) */
blr
-END(setjmp)
+END(FN_SETJMP)
- WEAK_REFERENCE(__longjmp, longjmp)
-ENTRY(__longjmp)
+ENTRY(FN_LONGJMP)
ld %r9,40 + 0*8(%r3)
lfd %f14,40 + 23*8(%r3)
ld %r10,40 + 1*8(%r3)
@@ -154,6 +188,34 @@
ld %r29,40 + 20*8(%r3)
ld %r30,40 + 21*8(%r3)
ld %r31,40 + 22*8(%r3)
+#ifdef SETJMP_ALTIVEC
+ /* v20-v31, see above */
+ addi %r5,%r3,40 + 41*8 + 15
+ clrrdi %r5,%r5,4
+ lvx %v20,0,%r5
+ addi %r5,%r5,16
+ lvx %v21,0,%r5
+ addi %r5,%r5,16
+ lvx %v22,0,%r5
+ addi %r5,%r5,16
+ lvx %v23,0,%r5
+ addi %r5,%r5,16
+ lvx %v24,0,%r5
+ addi %r5,%r5,16
+ lvx %v25,0,%r5
+ addi %r5,%r5,16
+ lvx %v26,0,%r5
+ addi %r5,%r5,16
+ lvx %v27,0,%r5
+ addi %r5,%r5,16
+ lvx %v28,0,%r5
+ addi %r5,%r5,16
+ lvx %v29,0,%r5
+ addi %r5,%r5,16
+ lvx %v30,0,%r5
+ addi %r5,%r5,16
+ lvx %v31,0,%r5
+#endif
mr %r6,%r4 /* save val param */
mtlr %r11 /* r11 -> link reg */
mtcr %r12 /* r12 -> condition reg */
@@ -169,6 +231,6 @@
bnelr
li %r3,1
blr
-END(__longjmp)
+END(FN_LONGJMP)
.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc/powerpc64/gen/setjmp_altivec.S b/lib/libc/powerpc64/gen/setjmp_altivec.S
new file mode 100644
--- /dev/null
+++ b/lib/libc/powerpc64/gen/setjmp_altivec.S
@@ -0,0 +1,11 @@
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2026 Piotr Kubaj
+ */
+
+#define FN_SETJMP __setjmp_altivec
+#define FN_LONGJMP __longjmp_altivec
+#define SETJMP_ALTIVEC
+
+#include "setjmp.S"
diff --git a/lib/libc/powerpc64/gen/setjmp_resolver.c b/lib/libc/powerpc64/gen/setjmp_resolver.c
new file mode 100644
--- /dev/null
+++ b/lib/libc/powerpc64/gen/setjmp_resolver.c
@@ -0,0 +1,27 @@
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2026 Piotr Kubaj
+ */
+
+#include <machine/cpu.h>
+#include <machine/ifunc.h>
+
+#include <setjmp.h>
+
+#define SETJMP_IFUNC(ret, name, args) \
+ret __CONCAT(__,name) args; \
+ret __CONCAT(__CONCAT(__,name),_altivec) args; \
+DEFINE_UIFUNC(, ret, name, args) \
+{ \
+ if (cpu_features & PPC_FEATURE_HAS_ALTIVEC) \
+ return (__CONCAT(__CONCAT(__,name),_altivec)); \
+ return (__CONCAT(__,name)); \
+}
+
+SETJMP_IFUNC(int, _setjmp, (jmp_buf))
+SETJMP_IFUNC(void, _longjmp, (jmp_buf, int))
+SETJMP_IFUNC(int, setjmp, (jmp_buf))
+SETJMP_IFUNC(void, longjmp, (jmp_buf, int))
+SETJMP_IFUNC(int, sigsetjmp, (sigjmp_buf, int))
+SETJMP_IFUNC(void, siglongjmp, (sigjmp_buf, int))
diff --git a/lib/libc/powerpc64/gen/sigsetjmp.S b/lib/libc/powerpc64/gen/sigsetjmp.S
--- a/lib/libc/powerpc64/gen/sigsetjmp.S
+++ b/lib/libc/powerpc64/gen/sigsetjmp.S
@@ -51,7 +51,21 @@
#include <sys/syscall.h>
-ENTRY(sigsetjmp)
+#ifndef FN_SETJMP
+#define FN_SETJMP __sigsetjmp
+#define FN_LONGJMP __siglongjmp
+#endif
+
+#if defined(PIC) && defined(SETJMP_ALTIVEC) == defined(__ALTIVEC__)
+/*
+ * rtld can't use ifuncs. It takes the variant for the CPU it's built for
+ * from libc_nossp_pic.a.
+ */
+WEAK_REFERENCE(FN_SETJMP, sigsetjmp)
+WEAK_REFERENCE(FN_LONGJMP, siglongjmp)
+#endif
+
+ENTRY(FN_SETJMP)
mr %r6,%r3
stw %r4,0(%r3)
or. %r7,%r4,%r4
@@ -110,12 +124,43 @@
std %r29,40 + 20*8(%r6)
std %r30,40 + 21*8(%r6)
std %r31,40 + 22*8(%r6)
+#ifdef SETJMP_ALTIVEC
+ /*
+ * v20-v31 are non-volatile too. stvx needs 16-byte alignment, which
+ * jmp_buf doesn't have, so round the save area up.
+ */
+ addi %r5,%r6,40 + 41*8 + 15
+ clrrdi %r5,%r5,4
+ stvx %v20,0,%r5
+ addi %r5,%r5,16
+ stvx %v21,0,%r5
+ addi %r5,%r5,16
+ stvx %v22,0,%r5
+ addi %r5,%r5,16
+ stvx %v23,0,%r5
+ addi %r5,%r5,16
+ stvx %v24,0,%r5
+ addi %r5,%r5,16
+ stvx %v25,0,%r5
+ addi %r5,%r5,16
+ stvx %v26,0,%r5
+ addi %r5,%r5,16
+ stvx %v27,0,%r5
+ addi %r5,%r5,16
+ stvx %v28,0,%r5
+ addi %r5,%r5,16
+ stvx %v29,0,%r5
+ addi %r5,%r5,16
+ stvx %v30,0,%r5
+ addi %r5,%r5,16
+ stvx %v31,0,%r5
+#endif
li %r3,0
blr
-END(sigsetjmp)
+END(FN_SETJMP)
-ENTRY(siglongjmp)
+ENTRY(FN_LONGJMP)
ld %r9,40 + 0*8(%r3)
lfd %f14,40 + 23*8(%r3)
ld %r10,40 + 1*8(%r3)
@@ -156,6 +201,34 @@
ld %r29,40 + 20*8(%r3)
ld %r30,40 + 21*8(%r3)
ld %r31,40 + 22*8(%r3)
+#ifdef SETJMP_ALTIVEC
+ /* v20-v31, see above */
+ addi %r5,%r3,40 + 41*8 + 15
+ clrrdi %r5,%r5,4
+ lvx %v20,0,%r5
+ addi %r5,%r5,16
+ lvx %v21,0,%r5
+ addi %r5,%r5,16
+ lvx %v22,0,%r5
+ addi %r5,%r5,16
+ lvx %v23,0,%r5
+ addi %r5,%r5,16
+ lvx %v24,0,%r5
+ addi %r5,%r5,16
+ lvx %v25,0,%r5
+ addi %r5,%r5,16
+ lvx %v26,0,%r5
+ addi %r5,%r5,16
+ lvx %v27,0,%r5
+ addi %r5,%r5,16
+ lvx %v28,0,%r5
+ addi %r5,%r5,16
+ lvx %v29,0,%r5
+ addi %r5,%r5,16
+ lvx %v30,0,%r5
+ addi %r5,%r5,16
+ lvx %v31,0,%r5
+#endif
lwz %r7,0(%r3)
mr %r6,%r4
@@ -176,6 +249,6 @@
bnelr
li %r3,1
blr
-END(siglongjmp)
+END(FN_LONGJMP)
.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc/powerpc64/gen/sigsetjmp_altivec.S b/lib/libc/powerpc64/gen/sigsetjmp_altivec.S
new file mode 100644
--- /dev/null
+++ b/lib/libc/powerpc64/gen/sigsetjmp_altivec.S
@@ -0,0 +1,11 @@
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2026 Piotr Kubaj
+ */
+
+#define FN_SETJMP __sigsetjmp_altivec
+#define FN_LONGJMP __siglongjmp_altivec
+#define SETJMP_ALTIVEC
+
+#include "sigsetjmp.S"
diff --git a/libexec/rtld-elf/rtld-libc/Makefile.inc b/libexec/rtld-elf/rtld-libc/Makefile.inc
--- a/libexec/rtld-elf/rtld-libc/Makefile.inc
+++ b/libexec/rtld-elf/rtld-libc/Makefile.inc
@@ -73,8 +73,8 @@
# ppc needs __syncicache and abs for reloc.c
_libc_other_objects+=syncicache abs
.elif ${LIBC_ARCH} == "powerpc64"
-# ppc64 needs __syncicache for reloc.c
-_libc_other_objects+=syncicache
+# ppc64 needs __syncicache for reloc.c and sigsetjmp may be the Altivec one
+_libc_other_objects+=syncicache sigsetjmp_altivec
.endif
# Extract all the .o files from libc_nossp_pic.a and libsys_pic.a. This

File Metadata

Mime Type
text/plain
Expires
Sun, Nov 22, 8:33 AM (4 h, 48 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
41889280
Default Alt Text
D61751.1795336412.diff (9 KB)

Event Timeline