From daf6dc85b1c6c4aa44dbd96210c5972cb31eabdf Mon Sep 17 00:00:00 2001 From: Jim Blandy Date: Fri, 7 May 2004 20:50:37 +0000 Subject: [PATCH] * aix-thread.c (fetch_regs_kernel_thread, fill_gprs64, fill_gprs32, store_regs_kernel_thread): Use tdep->ppc_gp0_regnum to recognize gpr regnums, instead of assuming that tdep->ppc_fp0_regnum marks the end of the general-purpose registers. --- gdb/ChangeLog | 6 ++++++ gdb/aix-thread.c | 20 ++++++++++++-------- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 3b25992416f..66b8ad7de5c 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,11 @@ 2004-05-07 Jim Blandy + * aix-thread.c (fetch_regs_kernel_thread, fill_gprs64, + fill_gprs32, store_regs_kernel_thread): Use tdep->ppc_gp0_regnum + to recognize gpr regnums, instead of assuming that + tdep->ppc_fp0_regnum marks the end of the general-purpose + registers. + * ppc-sysv-tdep.c (ppc64_sysv_abi_return_value): Assert that the given architecture has floating-point registers. diff --git a/gdb/aix-thread.c b/gdb/aix-thread.c index 36174b4499a..2f790713463 100644 --- a/gdb/aix-thread.c +++ b/gdb/aix-thread.c @@ -1157,7 +1157,9 @@ fetch_regs_kernel_thread (int regno, pthdb_tid_t tid) (long) tid, regno, arch64); /* General-purpose registers. */ - if (regno == -1 || regno < tdep->ppc_fp0_regnum) + if (regno == -1 + || (tdep->ppc_gp0_regnum <= regno + && regno < tdep->ppc_gp0_regnum + ppc_num_gprs)) { if (arch64) { @@ -1246,9 +1248,9 @@ fill_gprs64 (uint64_t *vals) struct gdbarch_tdep *tdep = gdbarch_tdep (current_gdbarch); int regno; - for (regno = 0; regno < tdep->ppc_fp0_regnum; regno++) - if (register_cached (regno)) - regcache_collect (regno, vals + regno); + for (regno = 0; regno < ppc_num_gprs; regno++) + if (register_cached (tdep->ppc_gp0_regnum + regno)) + regcache_collect (tdep->ppc_gp0_regnum + regno, vals + regno); } static void @@ -1257,9 +1259,9 @@ fill_gprs32 (uint32_t *vals) struct gdbarch_tdep *tdep = gdbarch_tdep (current_gdbarch); int regno; - for (regno = 0; regno < tdep->ppc_fp0_regnum; regno++) - if (register_cached (regno)) - regcache_collect (regno, vals + regno); + for (regno = 0; regno < ppc_num_gprs; regno++) + if (register_cached (tdep->ppc_gp0_regnum + regno)) + regcache_collect (tdep->ppc_gp0_regnum + regno, vals + regno); } /* Store the floating point registers into a double array. */ @@ -1456,7 +1458,9 @@ store_regs_kernel_thread (int regno, pthdb_tid_t tid) (long) tid, regno); /* General-purpose registers. */ - if (regno == -1 || regno < tdep->ppc_fp0_regnum) + if (regno == -1 + || (tdep->ppc_gp0_regnum <= regno + && regno < tdep->ppc_gp0_regnum + ppc_num_fprs)) { if (arch64) { -- 2.30.2