From 7bcda025ec2abe0f8a8583a11083ee06e6b46d86 Mon Sep 17 00:00:00 2001 From: Jim Blandy Date: Mon, 10 May 2004 18:58:44 +0000 Subject: [PATCH] Back out change. The NetBSD changes need Jason Thorpe's approval, but he hasn't reviewed it yet. --- gdb/ChangeLog | 60 ---------------------------------------------------- gdb/Makefile.in | 12 +++++------ gdb/aix-thread.c | 42 ++++++++++++------------------------ gdb/ppc-bdm.c | 13 ------------ gdb/ppc-linux-nat.c | 32 +++++++--------------------- gdb/ppc-linux-tdep.c | 23 +++++++------------- gdb/ppc-tdep.h | 8 ++----- gdb/ppcnbsd-nat.c | 9 -------- gdb/ppcnbsd-tdep.c | 16 -------------- gdb/ppcobsd-tdep.c | 17 --------------- gdb/rs6000-nat.c | 42 ++++++++++++++---------------------- gdb/rs6000-tdep.c | 54 +++++++++++----------------------------------- 12 files changed, 65 insertions(+), 263 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 599cdd4..4eccaff 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -28,66 +28,6 @@ 2004-05-10 Jim Blandy - * ppc-tdep.h (struct gdbarch_tdep): Change definition of - ppc_fp0_regnum and ppc_fpscr_regnum: if they are -1, then this - processor variant lacks those registers. - (ppc_floating_point_unit_p): Change description to make it clear - that this returns info about the ISA, not the ABI. - * rs6000-tdep.c (ppc_floating_point_unit_p): Decide whether to - return true or false by checking tdep->ppc_fp0_regnum and - tdep->ppc_fpscr_regnum. The original code replicated the BFD - arch/mach switching done in rs6000_gdbarch_init; it's better to - keep that logic there, and just check the results here. - (rs6000_gdbarch_init): On the E500, set tdep->ppc_fp0_regnum and - tdep->ppc_fpscr_regnum to -1 to indicate that we have no - floating-point registers. - (ppc_supply_fpregset, ppc_collect_fpregset) - (rs6000_push_dummy_call, rs6000_extract_return_value) - (rs6000_store_return_value): Assert that we have floating-point - registers. - (rs6000_dwarf2_stab_reg_to_regnum): Add FIXME. - (rs6000_frame_cache): Don't note the locations at which - floating-point registers were saved if we have no fprs. - * aix-thread.c (supply_fprs, fill_fprs): Assert that we have FP - registers. - (fetch_regs_user_thread, fetch_regs_kernel_thread) - (store_regs_user_thread, store_regs_kernel_thread): Only call - supply_fprs / fill_fprs if we actually have floating-point - registers. - (special_register_p): Check ppc_fpscr_regnum before matching - against it. - (supply_sprs64, supply_sprs32, fill_sprs64, fill_sprs32): Don't - supply / collect fpscr if we don't have it. - * ppc-bdm.c: #include "gdb_assert.h". - (bdm_ppc_fetch_registers, bdm_ppc_store_registers): Assert that we - have floating-point registers, since I can't test this code on - FP-free systems to adapt it. - * ppc-linux-nat.c (ppc_register_u_addr): Don't match against the - fpscr and floating point register numbers if they don't exist. - (fetch_register): Assert that we have floating-point registers - before we reach the code that handles them. - (store_register): Same. And use tdep instead of calling - gdbarch_tdep again. - (fill_fpregset): Don't try to collect FP registers and fpscr if we - don't have them. - (ppc_linux_sigtramp_cache): Don't record the saved locations of - fprs and fpscr if we don't have them. - (ppc_linux_supply_fpregset): Don't supply fp regs and fpscr if we - don't have them. - * ppcnbsd-nat.c: #include "gdb_assert.h". - (getfpregs_supplies): Assert that we have floating-point registers. - * ppcnbsd-tdep.c (ppcnbsd_supply_fpreg, ppcnbsd_fill_fpreg): Same. - * ppcobsd-tdep.c: #include "gdb_assert.h". - (ppcobsd_supply_gregset, ppcobsd_collect_gregset): Assert that we - have floating-point registers. - * rs6000-nat.c (regmap): Don't match against the fpscr and - floating point register numbers if they don't exist. - (fetch_inferior_registers, store_inferior_registers, - fetch_core_registers): Only fetch / store / supply the - floating-point registers and the fpscr if we have them. - * Makefile.in (ppc-bdm.o, ppc-linux-nat.o, ppcnbsd-nat.o) - (ppcobsd-tdep.o): Update dependencies. - * rs6000-tdep.c (ppc_collect_gregset): When regnum == -1, do collect all the gprs. diff --git a/gdb/Makefile.in b/gdb/Makefile.in index 151cb1d..4497fa8 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -2148,26 +2148,26 @@ p-lang.o: p-lang.c $(defs_h) $(gdb_string_h) $(symtab_h) $(gdbtypes_h) \ ppc-bdm.o: ppc-bdm.c $(defs_h) $(gdbcore_h) $(gdb_string_h) $(frame_h) \ $(inferior_h) $(bfd_h) $(symfile_h) $(target_h) $(gdbcmd_h) \ $(objfiles_h) $(gdb_stabs_h) $(serial_h) $(ocd_h) $(ppc_tdep_h) \ - $(regcache_h) $(gdb_assert_h) + $(regcache_h) ppcbug-rom.o: ppcbug-rom.c $(defs_h) $(gdbcore_h) $(target_h) $(monitor_h) \ $(serial_h) $(regcache_h) ppc-linux-nat.o: ppc-linux-nat.c $(defs_h) $(gdb_string_h) $(frame_h) \ - $(inferior_h) $(gdbcore_h) $(regcache_h) $(gdb_assert_h) \ - $(gdb_wait_h) $(gregset_h) $(ppc_tdep_h) + $(inferior_h) $(gdbcore_h) $(regcache_h) $(gdb_wait_h) $(gregset_h) \ + $(ppc_tdep_h) ppc-linux-tdep.o: ppc-linux-tdep.c $(defs_h) $(frame_h) $(inferior_h) \ $(symtab_h) $(target_h) $(gdbcore_h) $(gdbcmd_h) $(symfile_h) \ $(objfiles_h) $(regcache_h) $(value_h) $(osabi_h) $(regset_h) \ $(solib_svr4_h) $(ppc_tdep_h) $(trad_frame_h) $(frame_unwind_h) ppcnbsd-nat.o: ppcnbsd-nat.c $(defs_h) $(inferior_h) $(ppc_tdep_h) \ - $(ppcnbsd_tdep_h) $(gdb_assert_h) + $(ppcnbsd_tdep_h) ppcnbsd-tdep.o: ppcnbsd-tdep.c $(defs_h) $(gdbcore_h) $(regcache_h) \ $(target_h) $(breakpoint_h) $(value_h) $(osabi_h) $(ppc_tdep_h) \ $(ppcnbsd_tdep_h) $(nbsd_tdep_h) $(solib_svr4_h) ppcobsd-nat.o: ppcobsd-nat.c $(defs_h) $(inferior_h) $(regcache_h) \ $(ppc_tdep_h) $(ppcobsd_tdep_h) ppcobsd-tdep.o: ppcobsd-tdep.c $(defs_h) $(arch_utils_h) $(osabi_h) \ - $(regcache_h) $(regset_h) $(gdb_assert_h) $(gdb_string_h) \ - $(ppc_tdep_h) $(ppcobsd_tdep_h) $(solib_svr4_h) + $(regcache_h) $(regset_h) $(gdb_string_h) $(ppc_tdep_h) \ + $(ppcobsd_tdep_h) $(solib_svr4_h) ppc-sysv-tdep.o: ppc-sysv-tdep.c $(defs_h) $(gdbcore_h) $(inferior_h) \ $(regcache_h) $(value_h) $(gdb_string_h) $(gdb_assert_h) \ $(ppc_tdep_h) $(target_h) $(objfiles_h) diff --git a/gdb/aix-thread.c b/gdb/aix-thread.c index dcaa3fb..2f79071 100644 --- a/gdb/aix-thread.c +++ b/gdb/aix-thread.c @@ -1023,10 +1023,6 @@ supply_fprs (double *vals) struct gdbarch_tdep *tdep = gdbarch_tdep (current_gdbarch); int regno; - /* This function should never be called on architectures without - floating-point registers. */ - gdb_assert (ppc_floating_point_p (current_gdbarch)); - for (regno = 0; regno < 32; regno++) supply_register (regno + tdep->ppc_fp0_regnum, (char *) (vals + regno)); } @@ -1043,7 +1039,7 @@ special_register_p (int regno) || regno == tdep->ppc_lr_regnum || regno == tdep->ppc_ctr_regnum || regno == tdep->ppc_xer_regnum - || (tdep->ppc_fpscr_regnum >= 0 && regno == tdep->ppc_fpscr_regnum) + || regno == tdep->ppc_fpscr_regnum || (tdep->ppc_mq_regnum >= 0 && regno == tdep->ppc_mq_regnum); } @@ -1064,8 +1060,7 @@ supply_sprs64 (uint64_t iar, uint64_t msr, uint32_t cr, supply_register (tdep->ppc_lr_regnum, (char *) &lr); supply_register (tdep->ppc_ctr_regnum, (char *) &ctr); supply_register (tdep->ppc_xer_regnum, (char *) &xer); - if (tdep->ppc_fpscr_regnum >= 0) - supply_register (tdep->ppc_fpscr_regnum, (char *) &fpscr); + supply_register (tdep->ppc_fpscr_regnum, (char *) &fpscr); } /* Record that the special registers contain the specified 32-bit @@ -1084,8 +1079,7 @@ supply_sprs32 (uint32_t iar, uint32_t msr, uint32_t cr, supply_register (tdep->ppc_lr_regnum, (char *) &lr); supply_register (tdep->ppc_ctr_regnum, (char *) &ctr); supply_register (tdep->ppc_xer_regnum, (char *) &xer); - if (tdep->ppc_fpscr_regnum >= 0) - supply_register (tdep->ppc_fpscr_regnum, (char *) &fpscr); + supply_register (tdep->ppc_fpscr_regnum, (char *) &fpscr); } /* Fetch all registers from pthread PDTID, which doesn't have a kernel @@ -1119,8 +1113,7 @@ fetch_regs_user_thread (pthdb_pthread_t pdtid) /* Floating-point registers. */ - if (ppc_floating_point_p (current_gdbarch)) - supply_fprs (ctx.fpr); + supply_fprs (ctx.fpr); /* Special registers. */ @@ -1186,10 +1179,9 @@ fetch_regs_kernel_thread (int regno, pthdb_tid_t tid) /* Floating-point registers. */ - if (ppc_floating_point_unit_p (current_gdbarch) - && (regno == -1 - || (regno >= tdep->ppc_fp0_regnum - && regno < tdep->ppc_fp0_regnum + ppc_num_fprs))) + if (regno == -1 + || (regno >= tdep->ppc_fp0_regnum + && regno < tdep->ppc_fp0_regnum + ppc_num_fprs)) { if (!ptrace32 (PTT_READ_FPRS, tid, (int *) fprs, 0, NULL)) memset (fprs, 0, sizeof (fprs)); @@ -1279,10 +1271,6 @@ fill_fprs (double *vals) struct gdbarch_tdep *tdep = gdbarch_tdep (current_gdbarch); int regno; - /* This function should never be called on architectures without - floating-point registers. */ - gdb_assert (ppc_floating_point_p (current_gdbarch)); - for (regno = tdep->ppc_fp0_regnum; regno < tdep->ppc_fp0_regnum + ppc_num_fprs; regno++) @@ -1319,8 +1307,7 @@ fill_sprs64 (uint64_t *iar, uint64_t *msr, uint32_t *cr, regcache_collect (tdep->ppc_ctr_regnum, ctr); if (register_cached (tdep->ppc_xer_regnum)) regcache_collect (tdep->ppc_xer_regnum, xer); - if (tdep->ppc_fpscr_regnum >= 0 - && register_cached (tdep->ppc_fpscr_regnum)) + if (register_cached (tdep->ppc_fpscr_regnum)) regcache_collect (tdep->ppc_fpscr_regnum, fpscr); } @@ -1355,8 +1342,7 @@ fill_sprs32 (unsigned long *iar, unsigned long *msr, unsigned long *cr, regcache_collect (tdep->ppc_ctr_regnum, ctr); if (register_cached (tdep->ppc_xer_regnum)) regcache_collect (tdep->ppc_xer_regnum, xer); - if (tdep->ppc_fpscr_regnum >= 0 - && register_cached (tdep->ppc_fpscr_regnum)) + if (register_cached (tdep->ppc_fpscr_regnum)) regcache_collect (tdep->ppc_fpscr_regnum, fpscr); } @@ -1404,8 +1390,7 @@ store_regs_user_thread (pthdb_pthread_t pdtid) } /* Collect floating-point register values from the regcache. */ - if (ppc_floating_point_p (current_gdbarch)) - fill_fprs (ctx.fpr); + fill_fprs (ctx.fpr); /* Special registers (always kept in ctx as 64 bits). */ if (arch64) @@ -1495,10 +1480,9 @@ store_regs_kernel_thread (int regno, pthdb_tid_t tid) /* Floating-point registers. */ - if (ppc_floating_point_unit_p (current_gdbarch) - && (regno == -1 - || (regno >= tdep->ppc_fp0_regnum - && regno < tdep->ppc_fp0_regnum + ppc_num_fprs))) + if (regno == -1 + || (regno >= tdep->ppc_fp0_regnum + && regno < tdep->ppc_fp0_regnum + ppc_num_fprs)) { /* Pre-fetch: some regs may not be in the cache. */ ptrace32 (PTT_READ_FPRS, tid, (int *) fprs, 0, NULL); diff --git a/gdb/ppc-bdm.c b/gdb/ppc-bdm.c index cf37b2e..59fac1f 100644 --- a/gdb/ppc-bdm.c +++ b/gdb/ppc-bdm.c @@ -37,7 +37,6 @@ #include "ocd.h" #include "ppc-tdep.h" #include "regcache.h" -#include "gdb_assert.h" static void bdm_ppc_open (char *name, int from_tty); @@ -194,12 +193,6 @@ bdm_ppc_fetch_registers (int regno) return; /* Unsupported register */ } - /* FIXME: jimb/2004-05-04: I'm not sure how to adapt this code to - processors that lack floating point registers, and I don't have - have the equipment to test it. So we'll leave that case for the - next person who encounters it. */ - gdb_assert (ppc_floating_point_unit_p (current_gdbarch)); - #if 1 /* Can't ask for floating point regs on ppc 8xx, also need to avoid asking for the mq register. */ @@ -294,12 +287,6 @@ bdm_ppc_store_registers (int regno) if (first_bdm_regno == -1) return; /* Unsupported register */ - /* FIXME: jimb/2004-05-04: I'm not sure how to adapt this code to - processors that lack floating point registers, and I don't have - have the equipment to test it. So we'll leave that case for the - next person who encounters it. */ - gdb_assert (ppc_floating_point_unit_p (current_gdbarch)); - for (i = first_regno; i <= last_regno; i++) { int bdm_regno; diff --git a/gdb/ppc-linux-nat.c b/gdb/ppc-linux-nat.c index 460d48a..6d64665 100644 --- a/gdb/ppc-linux-nat.c +++ b/gdb/ppc-linux-nat.c @@ -26,7 +26,6 @@ #include "inferior.h" #include "gdbcore.h" #include "regcache.h" -#include "gdb_assert.h" #include #include @@ -140,8 +139,7 @@ ppc_register_u_addr (int regno) /* 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 (tdep->ppc_fp0_regnum >= 0 - && regno >= tdep->ppc_fp0_regnum + if (regno >= tdep->ppc_fp0_regnum && regno < tdep->ppc_fp0_regnum + ppc_num_fprs) u_addr = (PT_FPR0 * wordsize) + ((regno - tdep->ppc_fp0_regnum) * 8); @@ -162,8 +160,7 @@ ppc_register_u_addr (int regno) #endif if (regno == tdep->ppc_ps_regnum) u_addr = PT_MSR * wordsize; - if (tdep->ppc_fpscr_regnum >= 0 - && regno == tdep->ppc_fpscr_regnum) + if (regno == tdep->ppc_fpscr_regnum) u_addr = PT_FPSCR * wordsize; return u_addr; @@ -237,11 +234,6 @@ fetch_register (int tid, int regno) return; } - /* If the current architecture has no floating-point registers, we - should never reach this point: ppc_register_u_addr should have - returned -1, and we should have caught that above. */ - gdb_assert (ppc_floating_point_unit_p (current_gdbarch)); - /* Read the raw register using PTRACE_XFER_TYPE sized chunks. On a 32-bit platform, 64-bit floating-point registers will require two transfers. */ @@ -420,11 +412,6 @@ store_register (int tid, int regno) if (regaddr == -1) return; - /* If the current architecture has no floating-point registers, we - should never reach this point: ppc_register_u_addr should have - returned -1, and we should have caught that above. */ - gdb_assert (ppc_floating_point_unit_p (current_gdbarch)); - /* First collect the register value from the regcache. Be careful to to convert the regcache's wordsize into ptrace's wordsize. */ memset (buf, 0, sizeof buf); @@ -449,7 +436,7 @@ store_register (int tid, int regno) regaddr += sizeof (PTRACE_XFER_TYPE); if (errno == EIO - && regno == tdep->ppc_fpscr_regnum) + && regno == gdbarch_tdep (current_gdbarch)->ppc_fpscr_regnum) { /* Some older kernel versions don't allow fpscr to be written. */ continue; @@ -633,14 +620,11 @@ fill_fpregset (gdb_fpregset_t *fpregsetp, int regno) struct gdbarch_tdep *tdep = gdbarch_tdep (current_gdbarch); bfd_byte *fpp = (void *) fpregsetp; - if (ppc_floating_point_unit_p (current_gdbarch)) + for (regi = 0; regi < 32; regi++) { - for (regi = 0; regi < ppc_num_fprs; regi++) - { - if ((regno == -1) || (regno == tdep->ppc_fp0_regnum + regi)) - regcache_collect (tdep->ppc_fp0_regnum + regi, fpp + 8 * regi); - } - if (regno == -1 || regno == tdep->ppc_fpscr_regnum) - right_fill_reg (tdep->ppc_fpscr_regnum, (fpp + 8 * 32)); + if ((regno == -1) || (regno == tdep->ppc_fp0_regnum + regi)) + regcache_collect (tdep->ppc_fp0_regnum + regi, fpp + 8 * regi); } + if ((regno == -1) || regno == tdep->ppc_fpscr_regnum) + right_fill_reg (tdep->ppc_fpscr_regnum, (fpp + 8 * 32)); } diff --git a/gdb/ppc-linux-tdep.c b/gdb/ppc-linux-tdep.c index 49f4ad6..94c67f1 100644 --- a/gdb/ppc-linux-tdep.c +++ b/gdb/ppc-linux-tdep.c @@ -944,16 +944,12 @@ ppc_linux_sigtramp_cache (struct frame_info *next_frame, void **this_cache) cache->saved_regs[tdep->ppc_cr_regnum].addr = gpregs + 38 * tdep->wordsize; /* Floating point registers. */ - if (ppc_floating_point_unit_p (gdbarch)) + for (i = 0; i < 32; i++) { - for (i = 0; i < ppc_num_fprs; i++) - { - int regnum = i + tdep->ppc_fp0_regnum; - cache->saved_regs[regnum].addr = fpregs + i * tdep->wordsize; - } - cache->saved_regs[tdep->ppc_fpscr_regnum].addr - = fpregs + 32 * tdep->wordsize; + int regnum = i + tdep->ppc_fp0_regnum; + cache->saved_regs[regnum].addr = fpregs + i * tdep->wordsize; } + cache->saved_regs[tdep->ppc_fpscr_regnum].addr = fpregs + 32 * tdep->wordsize; return cache; } @@ -1022,18 +1018,15 @@ ppc_linux_supply_fpregset (const struct regset *regset, struct gdbarch_tdep *regcache_tdep = gdbarch_tdep (regcache_arch); const bfd_byte *buf = fpset; - if (! ppc_floating_point_unit_p (regcache_arch)) - return; - - for (regi = 0; regi < ppc_num_fprs; regi++) + for (regi = 0; regi < 32; regi++) regcache_raw_supply (regcache, regcache_tdep->ppc_fp0_regnum + regi, buf + 8 * regi); - /* The FPSCR is stored in the low order word of the last - doubleword in the fpregset. */ + /* The FPSCR is stored in the low order word of the last doubleword in the + fpregset. */ regcache_raw_supply (regcache, regcache_tdep->ppc_fpscr_regnum, - buf + 8 * 32 + 4); + buf + 8 * 32 + 4); } static struct regset ppc_linux_fpregset = { NULL, ppc_linux_supply_fpregset }; diff --git a/gdb/ppc-tdep.h b/gdb/ppc-tdep.h index a47fdfc..9bfb68e 100644 --- a/gdb/ppc-tdep.h +++ b/gdb/ppc-tdep.h @@ -74,8 +74,8 @@ enum return_value_convention ppc64_sysv_abi_return_value (struct gdbarch *gdbarc /* From rs6000-tdep.c... */ int altivec_register_p (int regno); -/* Return non-zero if the architecture described by GDBARCH has - floating-point registers (f0 --- f31 and fpscr). */ +/* Return non-zero when the architecture has an FPU (or at least when + the ABI is using the FPU). */ int ppc_floating_point_unit_p (struct gdbarch *gdbarch); /* Register set description. */ @@ -150,13 +150,9 @@ struct gdbarch_tdep int ppc_lr_regnum; /* Link register */ int ppc_ctr_regnum; /* Count register */ int ppc_xer_regnum; /* Integer exception register */ - - /* On PPC and RS6000 variants that have no floating-point - registers, the next two members will be -1. */ int ppc_fp0_regnum; /* floating-point register 0 */ int ppc_fpscr_regnum; /* Floating point status and condition register */ - int ppc_mq_regnum; /* Multiply/Divide extension register */ int ppc_vr0_regnum; /* First AltiVec register */ int ppc_vrsave_regnum; /* Last AltiVec register */ diff --git a/gdb/ppcnbsd-nat.c b/gdb/ppcnbsd-nat.c index 453b95d..9b7a550 100644 --- a/gdb/ppcnbsd-nat.c +++ b/gdb/ppcnbsd-nat.c @@ -25,7 +25,6 @@ #include "defs.h" #include "inferior.h" -#include "gdb_assert.h" #include "ppc-tdep.h" #include "ppcnbsd-tdep.h" @@ -50,14 +49,6 @@ getfpregs_supplies (int regno) { struct gdbarch_tdep *tdep = gdbarch_tdep (current_gdbarch); - /* FIXME: jimb/2004-05-05: Some PPC variants don't have - floating-point registers. For such variants, - tdep->ppc_fp0_regnum and tdep->ppc_fpscr_regnum will be -1. I - don't think NetBSD runs on any of those chips, but we can at - least make sure that if someone tries it, they'll get a proper - notification. */ - gdb_assert (ppc_floating_point_unit_p (current_gdbarch)); - return ((regno >= tdep->ppc_fp0_regnum && regno < tdep->ppc_fp0_regnum + ppc_num_fprs) || regno == tdep->ppc_fpscr_regnum); diff --git a/gdb/ppcnbsd-tdep.c b/gdb/ppcnbsd-tdep.c index c1d4146..891b74fc 100644 --- a/gdb/ppcnbsd-tdep.c +++ b/gdb/ppcnbsd-tdep.c @@ -111,14 +111,6 @@ ppcnbsd_supply_fpreg (char *fpregs, int regno) struct gdbarch_tdep *tdep = gdbarch_tdep (current_gdbarch); int i; - /* FIXME: jimb/2004-05-05: Some PPC variants don't have - floating-point registers. For such variants, - tdep->ppc_fp0_regnum and tdep->ppc_fpscr_regnum will be -1. I - don't think NetBSD runs on any of those chips, but we can at - least make sure that if someone tries it, they'll get a proper - notification. */ - gdb_assert (ppc_floating_point_unit_p (current_gdbarch)); - for (i = 0; i < ppc_num_fprs; i++) { if (regno == tdep->ppc_fp0_regnum + i || regno == -1) @@ -136,14 +128,6 @@ ppcnbsd_fill_fpreg (char *fpregs, int regno) struct gdbarch_tdep *tdep = gdbarch_tdep (current_gdbarch); int i; - /* FIXME: jimb/2004-05-05: Some PPC variants don't have - floating-point registers. For such variants, - tdep->ppc_fp0_regnum and tdep->ppc_fpscr_regnum will be -1. I - don't think NetBSD runs on any of those chips, but we can at - least make sure that if someone tries it, they'll get a proper - notification. */ - gdb_assert (ppc_floating_point_unit_p (current_gdbarch)); - for (i = 0; i < ppc_num_fprs; i++) { if (regno == tdep->ppc_fp0_regnum + i || regno == -1) diff --git a/gdb/ppcobsd-tdep.c b/gdb/ppcobsd-tdep.c index 641f372..90381e4 100644 --- a/gdb/ppcobsd-tdep.c +++ b/gdb/ppcobsd-tdep.c @@ -24,7 +24,6 @@ #include "osabi.h" #include "regcache.h" #include "regset.h" -#include "gdb_assert.h" #include "gdb_string.h" @@ -47,14 +46,6 @@ ppcobsd_supply_gregset (const struct regset *regset, struct regcache *regcache, int regnum, const void *gregs, size_t len) { - /* FIXME: jimb/2004-05-05: Some PPC variants don't have - floating-point registers. For such variants, - tdep->ppc_fp0_regnum and tdep->ppc_fpscr_regnum will be -1. I - don't think OpenBSD runs on any of those chips, but we can at - least make sure that if someone tries it, they'll get a proper - notification. */ - gdb_assert (ppc_floating_point_unit_p (current_gdbarch)); - ppc_supply_gregset (regset, regcache, regnum, gregs, len); ppc_supply_fpregset (regset, regcache, regnum, gregs, len); } @@ -69,14 +60,6 @@ ppcobsd_collect_gregset (const struct regset *regset, const struct regcache *regcache, int regnum, void *gregs, size_t len) { - /* FIXME: jimb/2004-05-05: Some PPC variants don't have - floating-point registers. For such variants, - tdep->ppc_fp0_regnum and tdep->ppc_fpscr_regnum will be -1. I - don't think OpenBSD runs on any of those chips, but we can at - least make sure that if someone tries it, they'll get a proper - notification. */ - gdb_assert (ppc_floating_point_unit_p (current_gdbarch)); - ppc_collect_gregset (regset, regcache, regnum, gregs, len); ppc_collect_fpregset (regset, regcache, regnum, gregs, len); } diff --git a/gdb/rs6000-nat.c b/gdb/rs6000-nat.c index 5fbf334..b80b5a5 100644 --- a/gdb/rs6000-nat.c +++ b/gdb/rs6000-nat.c @@ -159,8 +159,7 @@ regmap (int regno, int *isfloat) if (tdep->ppc_gp0_regnum <= regno && regno < tdep->ppc_gp0_regnum + ppc_num_gprs) return regno; - else if (tdep->ppc_fp0_regnum >= 0 - && tdep->ppc_fp0_regnum <= regno + else if (tdep->ppc_fp0_regnum <= regno && regno < tdep->ppc_fp0_regnum + ppc_num_fprs) { *isfloat = 1; @@ -178,8 +177,7 @@ regmap (int regno, int *isfloat) return CTR; else if (regno == tdep->ppc_xer_regnum) return XER; - else if (tdep->ppc_fpscr_regnum >= 0 - && regno == tdep->ppc_fpscr_regnum) + else if (regno == tdep->ppc_fpscr_regnum) return FPSCR; else if (tdep->ppc_mq_regnum >= 0 && regno == tdep->ppc_mq_regnum) return MQ; @@ -361,9 +359,8 @@ fetch_inferior_registers (int regno) } /* Read general purpose floating point registers. */ - if (tdep->ppc_fp0_regnum >= 0) - for (regno = 0; regno < ppc_num_fprs; regno++) - fetch_register (tdep->ppc_fp0_regnum + regno); + for (regno = 0; regno < ppc_num_fprs; regno++) + fetch_register (tdep->ppc_fp0_regnum + regno); /* Read special registers. */ fetch_register (PC_REGNUM); @@ -372,8 +369,7 @@ fetch_inferior_registers (int regno) fetch_register (tdep->ppc_lr_regnum); fetch_register (tdep->ppc_ctr_regnum); fetch_register (tdep->ppc_xer_regnum); - if (tdep->ppc_fpscr_regnum >= 0) - fetch_register (tdep->ppc_fpscr_regnum); + fetch_register (tdep->ppc_fpscr_regnum); if (tdep->ppc_mq_regnum >= 0) fetch_register (tdep->ppc_mq_regnum); } @@ -402,9 +398,8 @@ store_inferior_registers (int regno) } /* Write floating point registers. */ - if (tdep->ppc_fp0_regnum >= 0) - for (regno = 0; regno < ppc_num_fprs; regno++) - store_register (tdep->ppc_fp0_regnum + regno); + for (regno = 0; regno < ppc_num_fprs; regno++) + store_register (tdep->ppc_fp0_regnum + regno); /* Write special registers. */ store_register (PC_REGNUM); @@ -413,8 +408,7 @@ store_inferior_registers (int regno) store_register (tdep->ppc_lr_regnum); store_register (tdep->ppc_ctr_regnum); store_register (tdep->ppc_xer_regnum); - if (tdep->ppc_fpscr_regnum >= 0) - store_register (tdep->ppc_fpscr_regnum); + store_register (tdep->ppc_fpscr_regnum); if (tdep->ppc_mq_regnum >= 0) store_register (tdep->ppc_mq_regnum); } @@ -589,10 +583,9 @@ fetch_core_registers (char *core_reg_sect, unsigned core_reg_size, for (regi = 0; regi < 32; regi++) supply_register (regi, (char *) ®s->r64.gpr[regi]); - if (tdep->ppc_fp0_regnum >= 0) - for (regi = 0; regi < 32; regi++) - supply_register (tdep->ppc_fp0_regnum + regi, - (char *) ®s->r64.fpr[regi]); + for (regi = 0; regi < 32; regi++) + supply_register (tdep->ppc_fp0_regnum + regi, + (char *) ®s->r64.fpr[regi]); supply_register (PC_REGNUM, (char *) ®s->r64.iar); supply_register (tdep->ppc_ps_regnum, (char *) ®s->r64.msr); @@ -600,18 +593,16 @@ fetch_core_registers (char *core_reg_sect, unsigned core_reg_size, supply_register (tdep->ppc_lr_regnum, (char *) ®s->r64.lr); supply_register (tdep->ppc_ctr_regnum, (char *) ®s->r64.ctr); supply_register (tdep->ppc_xer_regnum, (char *) ®s->r64.xer); - if (tdep->ppc_fpscr_regnum >= 0) - supply_register (tdep->ppc_fpscr_regnum, (char *) ®s->r64.fpscr); + supply_register (tdep->ppc_fpscr_regnum, (char *) ®s->r64.fpscr); } else { for (regi = 0; regi < 32; regi++) supply_register (regi, (char *) ®s->r32.gpr[regi]); - if (tdep->ppc_fp0_regnum >= 0) - for (regi = 0; regi < 32; regi++) - supply_register (tdep->ppc_fp0_regnum + regi, - (char *) ®s->r32.fpr[regi]); + for (regi = 0; regi < 32; regi++) + supply_register (tdep->ppc_fp0_regnum + regi, + (char *) ®s->r32.fpr[regi]); supply_register (PC_REGNUM, (char *) ®s->r32.iar); supply_register (tdep->ppc_ps_regnum, (char *) ®s->r32.msr); @@ -619,8 +610,7 @@ fetch_core_registers (char *core_reg_sect, unsigned core_reg_size, supply_register (tdep->ppc_lr_regnum, (char *) ®s->r32.lr); supply_register (tdep->ppc_ctr_regnum, (char *) ®s->r32.ctr); supply_register (tdep->ppc_xer_regnum, (char *) ®s->r32.xer); - if (tdep->ppc_fpscr_regnum >= 0) - supply_register (tdep->ppc_fpscr_regnum, (char *) ®s->r32.fpscr); + supply_register (tdep->ppc_fpscr_regnum, (char *) ®s->r32.fpscr); if (tdep->ppc_mq_regnum >= 0) supply_register (tdep->ppc_mq_regnum, (char *) ®s->r32.mq); } diff --git a/gdb/rs6000-tdep.c b/gdb/rs6000-tdep.c index 5879c2c..4ce8fa1 100644 --- a/gdb/rs6000-tdep.c +++ b/gdb/rs6000-tdep.c @@ -140,16 +140,16 @@ altivec_register_p (int regno) return (regno >= tdep->ppc_vr0_regnum && regno <= tdep->ppc_vrsave_regnum); } - -/* Return non-zero if the architecture described by GDBARCH has - floating-point registers (f0 --- f31 and fpscr). */ +/* Use the architectures FP registers? */ int ppc_floating_point_unit_p (struct gdbarch *gdbarch) { - struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); - - return (tdep->ppc_fp0_regnum >= 0 - && tdep->ppc_fpscr_regnum >= 0); + const struct bfd_arch_info *info = gdbarch_bfd_arch_info (gdbarch); + if (info->arch == bfd_arch_powerpc) + return (info->mach != bfd_mach_ppc_e500); + if (info->arch == bfd_arch_rs6000) + return 1; + return 0; } @@ -226,8 +226,6 @@ ppc_supply_fpregset (const struct regset *regset, struct regcache *regcache, size_t offset; int i; - gdb_assert (ppc_floating_point_unit_p (gdbarch)); - offset = offsets->f0_offset; for (i = tdep->ppc_fp0_regnum; i < tdep->ppc_fp0_regnum + ppc_num_fprs; @@ -303,8 +301,6 @@ ppc_collect_fpregset (const struct regset *regset, size_t offset; int i; - gdb_assert (ppc_floating_point_unit_p (gdbarch)); - offset = offsets->f0_offset; for (i = tdep->ppc_fp0_regnum; i <= tdep->ppc_fp0_regnum + ppc_num_fprs; @@ -1194,11 +1190,6 @@ rs6000_push_dummy_call (struct gdbarch *gdbarch, CORE_ADDR func_addr, CORE_ADDR saved_sp; - /* The calling convention this function implements assumes the - processor has floating-point registers. We shouldn't be using it - on PPC variants that lack them. */ - gdb_assert (ppc_floating_point_unit_p (current_gdbarch)); - /* The first eight words of ther arguments are passed in registers. Copy them appropriately. */ ii = 0; @@ -1425,11 +1416,6 @@ rs6000_extract_return_value (struct type *valtype, char *regbuf, char *valbuf) int offset = 0; struct gdbarch_tdep *tdep = gdbarch_tdep (current_gdbarch); - /* The calling convention this function implements assumes the - processor has floating-point registers. We shouldn't be using it - on PPC variants that lack them. */ - gdb_assert (ppc_floating_point_unit_p (current_gdbarch)); - if (TYPE_CODE (valtype) == TYPE_CODE_FLT) { @@ -1741,9 +1727,6 @@ rs6000_dwarf2_stab_reg_to_regnum (int num) if (0 <= num && num <= 31) return tdep->ppc_gp0_regnum + num; else if (32 <= num && num <= 63) - /* FIXME: jimb/2004-05-05: What should we do when the debug info - specifies registers the architecture doesn't have? Our - callers don't check the value we return. */ return tdep->ppc_fp0_regnum + (num - 32); else if (1200 <= num && num < 1200 + 32) return tdep->ppc_ev0_regnum + (num - 1200); @@ -1782,11 +1765,6 @@ rs6000_store_return_value (struct type *type, char *valbuf) { struct gdbarch_tdep *tdep = gdbarch_tdep (current_gdbarch); - /* The calling convention this function implements assumes the - processor has floating-point registers. We shouldn't be using it - on PPC variants that lack them. */ - gdb_assert (ppc_floating_point_unit_p (current_gdbarch)); - if (TYPE_CODE (type) == TYPE_CODE_FLT) /* Floating point values are returned starting from FPR1 and up. @@ -2467,17 +2445,11 @@ rs6000_frame_cache (struct frame_info *next_frame, void **this_cache) { int i; CORE_ADDR fpr_addr = cache->base + fdata.fpr_offset; - - /* If skip_prologue says floating-point registers were saved, - but the current architecture has no floating-point registers, - then that's strange. But we have no indices to even record - the addresses under, so we just ignore it. */ - if (ppc_floating_point_unit_p (gdbarch)) - for (i = fdata.saved_fpr; i < 32; i++) - { - cache->saved_regs[tdep->ppc_fp0_regnum + i].addr = fpr_addr; - fpr_addr += 8; - } + for (i = fdata.saved_fpr; i < 32; i++) + { + cache->saved_regs[tdep->ppc_fp0_regnum + i].addr = fpr_addr; + fpr_addr += 8; + } } /* if != -1, fdata.saved_gpr is the smallest number of saved_gpr. @@ -2791,8 +2763,6 @@ rs6000_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) tdep->ppc_xer_regnum = 5; tdep->ppc_ev0_regnum = 7; tdep->ppc_ev31_regnum = 38; - tdep->ppc_fp0_regnum = -1; - tdep->ppc_fpscr_regnum = -1; set_gdbarch_pc_regnum (gdbarch, 0); set_gdbarch_sp_regnum (gdbarch, tdep->ppc_gp0_regnum + 1); set_gdbarch_deprecated_fp_regnum (gdbarch, tdep->ppc_gp0_regnum + 1); -- 2.7.4