runtime: use regset indexes for PPC register values Using names depended on <asm/ptrace.h>, which glibc includes somewhere but musl did not. Change to just always use indexes. Based on patch by Sören Tempel. Change-Id: I9bc4920c46bbfad1d8aefd015cd35a33de01142b Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/400214 Reviewed-by: Cherry Mui <cherryyz@google.com> Reviewed-by: Than McIntosh <thanm@google.com>
diff --git a/libgo/runtime/go-signal.c b/libgo/runtime/go-signal.c index 9c919e1..2caddd0 100644 --- a/libgo/runtime/go-signal.c +++ b/libgo/runtime/go-signal.c
@@ -230,15 +230,10 @@ ret.sigpc = ((ucontext_t*)(context))->uc_mcontext.gregs[REG_EIP]; #elif defined(__alpha__) && defined(__linux__) ret.sigpc = ((ucontext_t*)(context))->uc_mcontext.sc_pc; +#elif defined(__PPC64__) && defined(__linux__) + ret.sigpc = ((ucontext_t*)(context))->uc_mcontext.gp_regs[32]; #elif defined(__PPC__) && defined(__linux__) - // For some reason different libc implementations use - // different names. -#if defined(__PPC64__) || defined(__GLIBC__) - ret.sigpc = ((ucontext_t*)(context))->uc_mcontext.regs->nip; -#else - // Assumed to be ppc32 musl. ret.sigpc = ((ucontext_t*)(context))->uc_mcontext.gregs[32]; -#endif #elif defined(__PPC__) && defined(_AIX) ret.sigpc = ((ucontext_t*)(context))->uc_mcontext.jmp_context.iar; #elif defined(__aarch64__) && defined(__linux__) @@ -354,15 +349,15 @@ mcontext_t *m = &((ucontext_t*)(context))->uc_mcontext; int i; -#if defined(__PPC64__) || defined(__GLIBC__) +#if defined(__PPC64__) for (i = 0; i < 32; i++) - runtime_printf("r%d %X\n", i, m->regs->gpr[i]); - runtime_printf("pc %X\n", m->regs->nip); - runtime_printf("msr %X\n", m->regs->msr); - runtime_printf("cr %X\n", m->regs->ccr); - runtime_printf("lr %X\n", m->regs->link); - runtime_printf("ctr %X\n", m->regs->ctr); - runtime_printf("xer %X\n", m->regs->xer); + runtime_printf("r%d %X\n", i, m->gp_regs[i]); + runtime_printf("pc %X\n", m->gp_regs[32]); + runtime_printf("msr %X\n", m->gp_regs[33]); + runtime_printf("cr %X\n", m->gp_regs[38]); + runtime_printf("lr %X\n", m->gp_regs[36]); + runtime_printf("ctr %X\n", m->gp_regs[35]); + runtime_printf("xer %X\n", m->gp_regs[37]); #else for (i = 0; i < 32; i++) runtime_printf("r%d %X\n", i, m->gregs[i]);