From 85492558cd94f608ec69c8b3f65e52a8ace301ae Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Thu, 21 Jan 2010 14:11:21 +0000 Subject: [PATCH] * spu-low.c (spu_fetch_registers, spu_store_registers): Change prototype to take a regcache. Adjust. --- gdb/gdbserver/ChangeLog | 5 +++++ gdb/gdbserver/spu-low.c | 14 +++++++------- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index 393d22d..35ce8fe 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,3 +1,8 @@ +2010-01-21 Pedro Alves + + * spu-low.c (spu_fetch_registers, spu_store_registers): Change + prototype to take a regcache. Adjust. + 2010-01-20 Pedro Alves * regcache.h (struct thread_info): Forward declare. diff --git a/gdb/gdbserver/spu-low.c b/gdb/gdbserver/spu-low.c index c54af47..b2eb913 100644 --- a/gdb/gdbserver/spu-low.c +++ b/gdb/gdbserver/spu-low.c @@ -477,7 +477,7 @@ spu_wait (ptid_t ptid, struct target_waitstatus *ourstatus, int options) /* Fetch inferior registers. */ static void -spu_fetch_registers (int regno) +spu_fetch_registers (struct regcache *regcache, int regno) { int fd; CORE_ADDR addr; @@ -488,14 +488,14 @@ spu_fetch_registers (int regno) /* The ID register holds the spufs file handle. */ if (regno == -1 || regno == SPU_ID_REGNUM) - supply_register (SPU_ID_REGNUM, (char *)&fd); + supply_register (regcache, SPU_ID_REGNUM, (char *)&fd); /* The NPC register is found at ADDR. */ if (regno == -1 || regno == SPU_PC_REGNUM) { char buf[4]; if (fetch_ppc_memory (addr, buf, 4) == 0) - supply_register (SPU_PC_REGNUM, buf); + supply_register (regcache, SPU_PC_REGNUM, buf); } /* The GPRs are found in the "regs" spufs file. */ @@ -508,13 +508,13 @@ spu_fetch_registers (int regno) sprintf (annex, "%d/regs", fd); if (spu_proc_xfer_spu (annex, buf, NULL, 0, sizeof buf) == sizeof buf) for (i = 0; i < SPU_NUM_CORE_REGS; i++) - supply_register (i, buf + i*16); + supply_register (regcache, i, buf + i*16); } } /* Store inferior registers. */ static void -spu_store_registers (int regno) +spu_store_registers (struct regcache *regcache, int regno) { int fd; CORE_ADDR addr; @@ -531,7 +531,7 @@ spu_store_registers (int regno) if (regno == -1 || regno == SPU_PC_REGNUM) { char buf[4]; - collect_register (SPU_PC_REGNUM, buf); + collect_register (regcache, SPU_PC_REGNUM, buf); store_ppc_memory (addr, buf, 4); } @@ -543,7 +543,7 @@ spu_store_registers (int regno) int i; for (i = 0; i < SPU_NUM_CORE_REGS; i++) - collect_register (i, buf + i*16); + collect_register (regcache, i, buf + i*16); sprintf (annex, "%d/regs", fd); spu_proc_xfer_spu (annex, NULL, buf, 0, sizeof buf); -- 2.7.4