* ppc-linux-nat.c (ppc_register_u_addr): Correctly compute u-area

register offsets for both the 32- and 64-bit interfaces.
This commit is contained in:
Jim Blandy 2003-06-13 00:03:03 +00:00
parent e850da0b12
commit 49ff75ad91
2 changed files with 17 additions and 11 deletions

View File

@ -1,5 +1,8 @@
2003-06-12 Jim Blandy <jimb@redhat.com>
* ppc-linux-nat.c (ppc_register_u_addr): Correctly compute u-area
register offsets for both the 32- and 64-bit interfaces.
Actually finish the job started by my change of 2003-05-29.
* config/powerpc/tm-linux.h (SKIP_TRAMPOLINE_CODE): Remove the
other #definition of this.

View File

@ -127,34 +127,37 @@ ppc_register_u_addr (int regno)
{
int u_addr = -1;
struct gdbarch_tdep *tdep = gdbarch_tdep (current_gdbarch);
int wordsize = tdep->wordsize;
/* General purpose registers occupy 1 slot each in the buffer */
if (regno >= tdep->ppc_gp0_regnum && regno <= tdep->ppc_gplast_regnum )
u_addr = ((PT_R0 + regno) * 4);
u_addr = ((PT_R0 + regno) * wordsize);
/* Floating point regs: 2 slots each */
/* Floating point regs: eight bytes each in both 32- and 64-bit
ptrace interfaces. Thus, two slots each in 32-bit interface, one
slot each in 64-bit interface. */
if (regno >= FP0_REGNUM && regno <= FPLAST_REGNUM)
u_addr = ((PT_FPR0 + (regno - FP0_REGNUM) * 2) * 4);
u_addr = (PT_FPR0 * wordsize) + ((regno - FP0_REGNUM) * 8);
/* UISA special purpose registers: 1 slot each */
if (regno == PC_REGNUM)
u_addr = PT_NIP * 4;
u_addr = PT_NIP * wordsize;
if (regno == tdep->ppc_lr_regnum)
u_addr = PT_LNK * 4;
u_addr = PT_LNK * wordsize;
if (regno == tdep->ppc_cr_regnum)
u_addr = PT_CCR * 4;
u_addr = PT_CCR * wordsize;
if (regno == tdep->ppc_xer_regnum)
u_addr = PT_XER * 4;
u_addr = PT_XER * wordsize;
if (regno == tdep->ppc_ctr_regnum)
u_addr = PT_CTR * 4;
u_addr = PT_CTR * wordsize;
#ifdef PT_MQ
if (regno == tdep->ppc_mq_regnum)
u_addr = PT_MQ * 4;
u_addr = PT_MQ * wordsize;
#endif
if (regno == tdep->ppc_ps_regnum)
u_addr = PT_MSR * 4;
u_addr = PT_MSR * wordsize;
if (regno == tdep->ppc_fpscr_regnum)
u_addr = PT_FPSCR * 4;
u_addr = PT_FPSCR * wordsize;
return u_addr;
}