From 7f7fe91e15ea6d4eb8e1f600ce962b944f5df2c0 Mon Sep 17 00:00:00 2001 From: Ulrich Weigand Date: Sun, 6 May 2007 14:32:31 +0000 Subject: * gregset.h (struct regcache): Add forward declaration. (supply_gregset): Add REGCACHE parameter, make GREGS const. (supply_fpregset): Add REGCACHE parameter, make FPREGS const. (supply_fpxregset): Add REGCACHE parameter, make FPXREGS const. (fill_gregset): Add REGCACHE parameter. (fill_fpregset): Likewise. (fill_fpxregset): Likewise. Update all definitions accordingly: * alphabsd-nat.c, alpha-linux-nat.c, alpha-nat.c, amd64-linux-nat.c, arm-linux-nat.c, hppa-linux-nat.c, i386gnu-nat.c, i386-linux-nat.c, i386-sol2-nat.c, i386v4-nat.c, ia64-linux-nat.c, irix5-nat.c, m32r-linux-nat.c, m68klinux-nat.c, mips-linux-nat.c, ppc-linux-nat.c, s390-nat.c, sparc64-linux-nat.c, sparc-linux-nat.c, sparc-sol2-nat.c (supply_gregset): Add REGCACHE parameter, use it instead of current_regcache. Make GREGSETP parameter const, adapt casts. (supply_fpregset): Add REGCACHE parameter, use it instead of current_regcache. Make FPREGSETP parameter const, adapt casts. (fill_gregset): Add REGCACHE parameter, use it instead of current_regcache. (fill_fpregset): Likewise. Update all callers to pass in current_regcache as the new argument: * core-regset.c: Include "regcache.h". (fetch_core_registers): Update supply_gregset,and supply_fpregset calls. * procfs.c: Include "regcache.h". (procfs_fetch_registers): Update supply_gregset, supply_fpregset calls. (procfs_store_registers): Update fill_gregset, fill_fpregset calls. (procfs_do_thread_registers): Likewise. (procfs_make_note_section): Likewise. * proc-service.c: Include "regcache.h". (ps_lgetregs): Update fill_gregset call. (ps_lsetregs): Update supply_gregset call. (ps_lgetfpregs): Update fill_fpregset call. (ps_lsetfpregs): Update supply_fpregset call. * sol-thread.c (sol_thread_fetch_registers): Update supply_gregset, supply_fpregset calls. (sol_thread_store_registers): Update fill_gregset, fill_fpregset calls. (ps_lgetregs): Update fill_gregset call. (ps_lsetregs): Update supply_gregset call. (ps_lgetfpregs): Update fill_fpregset call. (ps_lsetfpregs): Update supply_fpregset call. * linux-nat.c (linux_nat_do_thread_registers): Update fill_gregset, fill_fpregset, and fill_fpxregset calls. * i386-linux-nat.c (fetch_regs): Update supply_gregset call. (store_regs): Update fill_gregset call. (fetch_fpregs): Update supply_fpregset call. (store_fpregs): Update fill_fpregset call. (fetch_fpxregs): Update supply_fpxregset call. (store_fpxregs): Update fill_fpxregset call. * m32r-linux-nat.c (fetch_regs): Update supply_gregset call. (store_regs): Update fill_gregset call. * m68klinux-nat.c (fetch_regs): Update supply_gregset call. (store_regs): Update fill_gregset call. (fetch_fpregs): Update supply_fpregset call. (store_fpregs): Update fill_fpregset call. (fetch_core_registers): Update supply_gregset, supply_fpregset calls. * s390-nat.c (fetch_regs): Update supply_gregset call. (store_regs): Update fill_gregset call. (fetch_fpregs): Update supply_fpregset call. (store_fpregs): Update fill_fpregset call. * Makefile.in (core-regset.o, procfs.o, proc-service.o): Update dependencies. --- gdb/hppa-linux-nat.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) (limited to 'gdb/hppa-linux-nat.c') diff --git a/gdb/hppa-linux-nat.c b/gdb/hppa-linux-nat.c index ec6f5456437..274f14007bb 100644 --- a/gdb/hppa-linux-nat.c +++ b/gdb/hppa-linux-nat.c @@ -305,15 +305,15 @@ hppa_linux_store_inferior_registers (int regno) in *gregsetp. */ void -supply_gregset (gdb_gregset_t *gregsetp) +supply_gregset (struct regcache *regcache, const gdb_gregset_t *gregsetp) { int i; - greg_t *regp = (elf_greg_t *) gregsetp; + const greg_t *regp = (const elf_greg_t *) gregsetp; for (i = 0; i < sizeof (greg_map) / sizeof (greg_map[0]); i++, regp++) { int regno = greg_map[i]; - regcache_raw_supply (current_regcache, regno, regp); + regcache_raw_supply (regcache, regno, regp); } } @@ -322,7 +322,8 @@ supply_gregset (gdb_gregset_t *gregsetp) If regno is -1, do this for all registers. */ void -fill_gregset (gdb_gregset_t *gregsetp, int regno) +fill_gregset (const struct regcache *regcache, + gdb_gregset_t *gregsetp, int regno) { int i; @@ -332,7 +333,7 @@ fill_gregset (gdb_gregset_t *gregsetp, int regno) if (regno == -1 || regno == mregno) { - regcache_raw_collect(current_regcache, mregno, &(*gregsetp)[i]); + regcache_raw_collect(regcache, mregno, &(*gregsetp)[i]); } } } @@ -342,17 +343,16 @@ fill_gregset (gdb_gregset_t *gregsetp, int regno) idea of the current floating point register values. */ void -supply_fpregset (gdb_fpregset_t *fpregsetp) +supply_fpregset (struct regcache *regcache, const gdb_fpregset_t *fpregsetp) { int regi; - char *from; + const char *from; for (regi = 0; regi <= 31; regi++) { - from = (char *) &((*fpregsetp)[regi]); - regcache_raw_supply (current_regcache, 2*regi + HPPA_FP0_REGNUM, from); - regcache_raw_supply (current_regcache, 2*regi + HPPA_FP0_REGNUM + 1, - from + 4); + from = (const char *) &((*fpregsetp)[regi]); + regcache_raw_supply (regcache, 2*regi + HPPA_FP0_REGNUM, from); + regcache_raw_supply (regcache, 2*regi + HPPA_FP0_REGNUM + 1, from + 4); } } @@ -362,7 +362,8 @@ supply_fpregset (gdb_fpregset_t *fpregsetp) them all. */ void -fill_fpregset (gdb_fpregset_t *fpregsetp, int regno) +fill_fpregset (const struct regcache *regcache, + gdb_fpregset_t *fpregsetp, int regno) { int i; @@ -373,7 +374,7 @@ fill_fpregset (gdb_fpregset_t *fpregsetp, int regno) char *to = (char *) &((*fpregsetp)[(i - HPPA_FP0_REGNUM) / 2]); if ((i - HPPA_FP0_REGNUM) & 1) to += 4; - regcache_raw_collect (current_regcache, i, to); + regcache_raw_collect (regcache, i, to); } } -- cgit v1.2.1