mirror of
https://github.com/bminor/binutils-gdb.git
synced 2025-12-26 17:18:55 +00:00
ChangeLog:
* Makefile.in (ppc_linux_tdep_h): New macro. (powerpc_32l_c, powerpc_altivec32_c, powerpc_altivec32l_c): Likewise. (powerpc_64l_c, powerpc_altivec64_c, powerpc_altivec64l_c): Likewise. (powerpc_e500l_c): Likewise. (ppc-linux-nat.o): Update dependencies. (ppc-linux-tdep.o): Update dependencies. (rs6000-tdep.o): Update dependencies. * ppc-tdep.h (ppc_linux_memory_remove_breakpoint): Remove. (ppc_linux_svr4_fetch_link_map_offsets): Remove. (ppc_linux_gregset, ppc_linux_fpregset): Move to ppc-linux-tdep.h (ppc_supply_reg, ppc_collect_reg): Add prototypes. (tdesc_powerpc_e500): Remove. * rs6000.c: Include "features/rs6000/powerpc-altivec32.c" and "features/rs6000/powerpc-altivec64.c". (ppc_supply_reg, ppc_collect_reg): Make global. (variants): Use tdesc_powerpc_32 for "powerpc" and tdesc_powerpc_altivec64 for "powerpc64". (_initialize_rs6000_tdep): Initialize AltiVec descriptions. * ppc-linux-tdep.h: New file. * ppc-linux-tdep.c: Include "ppc-linux-tdep.c". Include "features/rs6000/powerpc-32l.c". Include "features/rs6000/powerpc-altivec32l.c". Include "features/rs6000/powerpc-64l.c". Include "features/rs6000/powerpc-altivec64l.c". Include "features/rs6000/powerpc-e500l.c". (ppc_linux_supply_gregset): New function. (ppc_linux_collect_gregset): Handle orig_r3 and trap registers. (ppc32_linux_gregset): Use ppc_linux_supply_gregset. (ppc64_linux_gregset): Likewise. (ppc_linux_sigtramp_cache): Handle orig_r3 and trap registers. (ppc_linux_trap_reg_p): New function. (ppc_linux_write_pc): New function. (ppc_linux_core_read_description): New function. (ppc_linux_init_abi): Install ppc_linux_write_pc and ppc_linux_core_read_description. Install orig_r3 and trap registers if present in the target description. (_initialize_ppc_linux_tdep): Initialize Linux target descriptions. * ppc-linux-nat.c: Include "ppc-linux-tdep.h". (PT_ORIG_R3, PT_TRAP): Define if necessary. (ppc_register_u_addr): Handle orig_r3 and trap registers. (fetch_ppc_registers): Likewise. (store_ppc_registers): Likewise. (store_register): Likewise. (ppc_linux_read_description): Check whether AltiVec is supported. Check whether inferior is 32-bit or 64-bit. Return the appropriate Linux target description. * features/Makefile (WHICH): Use rs6000/powerpc-32l and rs6000/powerpc-altivec32l instead of rs6000/powerpc-32. Use rs6000/powerpc-64l and rs6000/powerpc-altivec64l instead of rs6000/powerpc-64. Use rs6000/powerpc-e500l instead of rs6000/powerpc-e500. Update -expedite variables accordingly. * features/rs6000/power-spe.xml: Use regnum 73 for "acc". * features/rs6000/powerpc-32.xml: Do not include power-altivec.xml. * features/rs6000/powerpc-64.xml: Do not include power-altivec.xml. * features/rs6000/powerpc-e500.c: Regenerate. * features/rs6000/powerpc-32.c: Regenerate. * features/rs6000/powerpc-64.c: Regenerate. * features/rs6000/power-linux.xml: New file. * features/rs6000/power64-linux.xml: New file. * features/rs6000/powerpc-32l.xml: New file. * features/rs6000/powerpc-altivec32l.xml: New file. * features/rs6000/powerpc-64l.xml: New file. * features/rs6000/powerpc-altivec64l.xml: New file. * features/rs6000/powerpc-e500l.xml: New file. * features/rs6000/powerpc-32l.c: New (generated) file. * features/rs6000/powerpc-altivec32l.c: New (generated) file. * features/rs6000/powerpc-64l.c: New (generated) file. * features/rs6000/powerpc-altivec64l.c: New (generated) file. * features/rs6000/powerpc-e500l.xml: New (generated) file. * regformats/reg-ppc.dat: Remove. * regformats/reg-ppc64.dat: Remove. * regformats/rs6000/powerpc-32.dat: Remove. * regformats/rs6000/powerpc-64.dat: Remove. * regformats/rs6000/powerpc-e500.dat: Remove. * regformats/rs6000/powerpc-32l.dat: New (generated) file. * regformats/rs6000/powerpc-altivec32l.dat: New (generated) file. * regformats/rs6000/powerpc-64l.dat: New (generated) file. * regformats/rs6000/powerpc-altivec64l.dat: New (generated) file. * regformats/rs6000/powerpc-e500l.dat: New (generated) file. gdbserver/ChangeLog: * configure.srv (powerpc*-*-linux*): Set srv_regobj to powerpc-32l.o, powerpc-altivec32l.o, powerpc-e500l.o, powerpc-64l.o, and powerpc-altivec64l.o. Remove rs6000/powerpc-32.xml, rs6000/powerpc-64.xml, and rs6000/powerpc-e500.xml; add rs6000/powerpc-32l.xml, rs6000/powerpc-altivec32l.xml, rs6000/powerpc-e500l.xml, rs6000/powerpc-64l.xml, rs6000/powerpc-altivec64l.xml, rs6000/power-linux.xml, and rs6000/power64-linux.xml to srv_xmlfiles. * Makefile.in (reg-ppc.o, reg-ppc.c): Remove, replace by ... (powerpc-32l.o, powerpc-32l.c): ... these new rules. (powerpc-32.o, powerpc-32.c): Remove, replace by ... (powerpc-altivec32l.o, powerpc-altivec32l.c): ... these new rules. (powerpc-e500.o, powerpc-e500.c): Remove, replace by ... (powerpc-e500l.o, powerpc-e500l.c): ... these new rules. (reg-ppc64.o, reg-ppc64.c): Remove, replace by ... (powerpc-64l.o, powerpc-64l.c): ... these new rules. (powerpc-64.o, powerpc-64.c): Remove, replace by ... (powerpc-altivec64l.o, powerpc-altivec64l.c): ... these new rules. (clean): Update. * linux-ppc-low.c (init_registers_ppc): Remove, replace by ... (init_registers_powerpc_32l): ... this new prototype. (init_registers_powerpc_32): Remove, replace by ... (init_registers_powerpc_altivec32l): ... this new prototype. (init_registers_powerpc_e500): Remove, replace by ... (init_registers_powerpc_e500l): ... this new prototype. (init_registers_ppc64): Remove, replace by ... (init_registers_powerpc_64l): ... this new prototype. (init_registers_powerpc_64): Remove, replace by ... (init_registers_powerpc_altivec64l): ... this new prototype. (ppc_num_regs): Set to 73. (PT_ORIG_R3, PT_TRAP): Define if necessary. (ppc_regmap, ppc_regmap_e500): Add values for orig_r3 and trap. (ppc_cannot_store_register): Handle orig_r3 and trap. (ppc_arch_setup): Update init_registers_... calls. (ppc_fill_gregset): Handle orig_r3 and trap. * inferiors.c (clear_inferiors): Reset current_inferior.
This commit is contained in:
Ulrich Weigand
@@ -42,6 +42,15 @@
|
||||
/* Prototypes for supply_gregset etc. */
|
||||
#include "gregset.h"
|
||||
#include "ppc-tdep.h"
|
||||
#include "ppc-linux-tdep.h"
|
||||
|
||||
/* This sometimes isn't defined. */
|
||||
#ifndef PT_ORIG_R3
|
||||
#define PT_ORIG_R3 34
|
||||
#endif
|
||||
#ifndef PT_TRAP
|
||||
#define PT_TRAP 40
|
||||
#endif
|
||||
|
||||
/* Glibc's headers don't define PTRACE_GETVRREGS so we cannot use a
|
||||
configure time check. Some older glibc's (for instance 2.2.1)
|
||||
@@ -200,6 +209,10 @@ ppc_register_u_addr (struct gdbarch *gdbarch, int regno)
|
||||
#endif
|
||||
if (regno == tdep->ppc_ps_regnum)
|
||||
u_addr = PT_MSR * wordsize;
|
||||
if (regno == PPC_ORIG_R3_REGNUM)
|
||||
u_addr = PT_ORIG_R3 * wordsize;
|
||||
if (regno == PPC_TRAP_REGNUM)
|
||||
u_addr = PT_TRAP * wordsize;
|
||||
if (tdep->ppc_fpscr_regnum >= 0
|
||||
&& regno == tdep->ppc_fpscr_regnum)
|
||||
{
|
||||
@@ -476,6 +489,11 @@ fetch_ppc_registers (struct regcache *regcache, int tid)
|
||||
fetch_register (regcache, tid, tdep->ppc_xer_regnum);
|
||||
if (tdep->ppc_mq_regnum != -1)
|
||||
fetch_register (regcache, tid, tdep->ppc_mq_regnum);
|
||||
if (ppc_linux_trap_reg_p (gdbarch))
|
||||
{
|
||||
fetch_register (regcache, tid, PPC_ORIG_R3_REGNUM);
|
||||
fetch_register (regcache, tid, PPC_TRAP_REGNUM);
|
||||
}
|
||||
if (tdep->ppc_fpscr_regnum != -1)
|
||||
fetch_register (regcache, tid, tdep->ppc_fpscr_regnum);
|
||||
if (have_ptrace_getvrregs)
|
||||
@@ -676,9 +694,12 @@ store_register (const struct regcache *regcache, int tid, int regno)
|
||||
regaddr += sizeof (long);
|
||||
|
||||
if (errno == EIO
|
||||
&& regno == tdep->ppc_fpscr_regnum)
|
||||
&& (regno == tdep->ppc_fpscr_regnum
|
||||
|| regno == PPC_ORIG_R3_REGNUM
|
||||
|| regno == PPC_TRAP_REGNUM))
|
||||
{
|
||||
/* Some older kernel versions don't allow fpscr to be written. */
|
||||
/* Some older kernel versions don't allow fpscr, orig_r3
|
||||
or trap to be written. */
|
||||
continue;
|
||||
}
|
||||
|
||||
@@ -765,6 +786,11 @@ store_ppc_registers (const struct regcache *regcache, int tid)
|
||||
store_register (regcache, tid, tdep->ppc_mq_regnum);
|
||||
if (tdep->ppc_fpscr_regnum != -1)
|
||||
store_register (regcache, tid, tdep->ppc_fpscr_regnum);
|
||||
if (ppc_linux_trap_reg_p (gdbarch))
|
||||
{
|
||||
store_register (regcache, tid, PPC_ORIG_R3_REGNUM);
|
||||
store_register (regcache, tid, PPC_TRAP_REGNUM);
|
||||
}
|
||||
if (have_ptrace_getvrregs)
|
||||
if (tdep->ppc_vr0_regnum != -1 && tdep->ppc_vrsave_regnum != -1)
|
||||
store_altivec_registers (regcache, tid);
|
||||
@@ -962,28 +988,51 @@ fill_fpregset (const struct regcache *regcache,
|
||||
static const struct target_desc *
|
||||
ppc_linux_read_description (struct target_ops *ops)
|
||||
{
|
||||
int altivec = 0;
|
||||
|
||||
int tid = TIDGET (inferior_ptid);
|
||||
if (tid == 0)
|
||||
tid = PIDGET (inferior_ptid);
|
||||
|
||||
if (have_ptrace_getsetevrregs)
|
||||
{
|
||||
struct gdb_evrregset_t evrregset;
|
||||
int tid = TIDGET (inferior_ptid);
|
||||
|
||||
if (tid == 0)
|
||||
tid = PIDGET (inferior_ptid);
|
||||
|
||||
if (ptrace (PTRACE_GETEVRREGS, tid, 0, &evrregset) >= 0)
|
||||
return tdesc_powerpc_e500;
|
||||
else
|
||||
{
|
||||
/* EIO means that the PTRACE_GETEVRREGS request isn't supported. */
|
||||
if (errno == EIO)
|
||||
return NULL;
|
||||
else
|
||||
/* Anything else needs to be reported. */
|
||||
perror_with_name (_("Unable to fetch SPE registers"));
|
||||
}
|
||||
return tdesc_powerpc_e500l;
|
||||
|
||||
/* EIO means that the PTRACE_GETEVRREGS request isn't supported.
|
||||
Anything else needs to be reported. */
|
||||
else if (errno != EIO)
|
||||
perror_with_name (_("Unable to fetch SPE registers"));
|
||||
}
|
||||
|
||||
return NULL;
|
||||
if (have_ptrace_getvrregs)
|
||||
{
|
||||
gdb_vrregset_t vrregset;
|
||||
|
||||
if (ptrace (PTRACE_GETVRREGS, tid, 0, &vrregset) >= 0)
|
||||
altivec = 1;
|
||||
|
||||
/* EIO means that the PTRACE_GETVRREGS request isn't supported.
|
||||
Anything else needs to be reported. */
|
||||
else if (errno != EIO)
|
||||
perror_with_name (_("Unable to fetch AltiVec registers"));
|
||||
}
|
||||
|
||||
/* Check for 64-bit inferior process. This is the case when the host is
|
||||
64-bit, and in addition the top bit of the MSR register is set. */
|
||||
#ifdef __powerpc64__
|
||||
{
|
||||
long msr;
|
||||
errno = 0;
|
||||
msr = (long) ptrace (PTRACE_PEEKUSER, tid, PT_MSR * 8, 0);
|
||||
if (errno == 0 && msr < 0)
|
||||
return altivec? tdesc_powerpc_altivec64l : tdesc_powerpc_64l;
|
||||
}
|
||||
#endif
|
||||
|
||||
return altivec? tdesc_powerpc_altivec32l : tdesc_powerpc_32l;
|
||||
}
|
||||
|
||||
void _initialize_ppc_linux_nat (void);
|
||||
|
||||
Reference in New Issue
Block a user