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

[PowerPC] Fix *context on ELFv2

Browse Source 
Due to ELFv1 specific code in _ctx_start.S and makecontext.c, userspace
context switching was completely broken on ELFv2.

With this change, we now pass the libthr test suite.

Approved by: jhibbits (mentor)
Differential Revision: https://reviews.freebsd.org/D22421
This commit is contained in:
bdragon 2019-11-16 20:33:46 +00:00
parent 838a5da897
commit ca5420f1d8
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/libc/powerpc64/gen/_ctx_start.S
View File

@ -32,8 +32,14 @@
.globl CNAME(abort) .globl CNAME(abort)
ENTRY(_ctx_start) ENTRY(_ctx_start)
#if !defined(_CALL_ELF) || _CALL_ELF == 1
/* Load values from function descriptor */
ld %r2,8(%r14) ld %r2,8(%r14)
ld %r14,0(%r14) ld %r14,0(%r14)
#else
/* Load global entry point */
mr %r12,%r14
#endif
mtlr %r14 mtlr %r14
blrl /* branch to start function */ blrl /* branch to start function */
mr %r3,%r15 /* pass pointer to ucontext as argument */ mr %r3,%r15 /* pass pointer to ucontext as argument */

5
lib/libc/powerpc64/gen/makecontext.c
View File

@ -113,7 +113,12 @@ __makecontext(ucontext_t *ucp, void (*start)(void), int argc, ...)
* Use caller-saved regs 14/15 to hold params that _ctx_start * Use caller-saved regs 14/15 to hold params that _ctx_start
* will use to invoke the user-supplied func * will use to invoke the user-supplied func
*/ */
#if !defined(_CALL_ELF) || _CALL_ELF == 1
/* Cast to ensure this is treated as a function descriptor. */
mc->mc_srr0 = *(uintptr_t *)_ctx_start; mc->mc_srr0 = *(uintptr_t *)_ctx_start;
#else
mc->mc_srr0 = (uintptr_t) _ctx_start;
#endif
mc->mc_gpr[1] = (uintptr_t) sp; /* new stack pointer */ mc->mc_gpr[1] = (uintptr_t) sp; /* new stack pointer */
mc->mc_gpr[14] = (uintptr_t) start; /* r14 <- start */ mc->mc_gpr[14] = (uintptr_t) start; /* r14 <- start */
mc->mc_gpr[15] = (uintptr_t) ucp; /* r15 <- ucp */ mc->mc_gpr[15] = (uintptr_t) ucp; /* r15 <- ucp */