From 4926101936f9c2286daf6bb70155087ba5d135b2 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/m32r-linux-nat.c | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) (limited to 'gdb/m32r-linux-nat.c') diff --git a/gdb/m32r-linux-nat.c b/gdb/m32r-linux-nat.c index 2b17aadf2fe..32d3de91403 100644 --- a/gdb/m32r-linux-nat.c +++ b/gdb/m32r-linux-nat.c @@ -69,9 +69,9 @@ static int regmap[] = { in *GREGSETP. */ void -supply_gregset (elf_gregset_t * gregsetp) +supply_gregset (struct regcache *regcache, const elf_gregset_t * gregsetp) { - elf_greg_t *regp = (elf_greg_t *) gregsetp; + const elf_greg_t *regp = (const elf_greg_t *) gregsetp; int i; unsigned long psw, bbpsw; @@ -96,11 +96,11 @@ supply_gregset (elf_gregset_t * gregsetp) } if (i != M32R_SP_REGNUM) - regcache_raw_supply (current_regcache, i, ®val); + regcache_raw_supply (regcache, i, ®val); else if (psw & 0x8000) - regcache_raw_supply (current_regcache, i, regp + SPU_REGMAP); + regcache_raw_supply (regcache, i, regp + SPU_REGMAP); else - regcache_raw_supply (current_regcache, i, regp + SPI_REGMAP); + regcache_raw_supply (regcache, i, regp + SPI_REGMAP); } } @@ -115,7 +115,7 @@ fetch_regs (int tid) if (ptrace (PTRACE_GETREGS, tid, 0, (int) ®s) < 0) perror_with_name (_("Couldn't get registers")); - supply_gregset (®s); + supply_gregset (current_regcache, (const elf_gregset_t *) ®s); } /* Fill register REGNO (if it is a general-purpose register) in @@ -123,7 +123,8 @@ fetch_regs (int tid) do this for all registers. */ void -fill_gregset (elf_gregset_t * gregsetp, int regno) +fill_gregset (const struct regcache *regcache, + elf_gregset_t * gregsetp, int regno) { elf_greg_t *regp = (elf_greg_t *) gregsetp; int i; @@ -144,11 +145,11 @@ fill_gregset (elf_gregset_t * gregsetp, int regno) continue; if (i != M32R_SP_REGNUM) - regcache_raw_collect (current_regcache, i, regp + regmap[i]); + regcache_raw_collect (regcache, i, regp + regmap[i]); else if (psw & 0x8000) - regcache_raw_collect (current_regcache, i, regp + SPU_REGMAP); + regcache_raw_collect (regcache, i, regp + SPU_REGMAP); else - regcache_raw_collect (current_regcache, i, regp + SPI_REGMAP); + regcache_raw_collect (regcache, i, regp + SPI_REGMAP); } } @@ -163,7 +164,7 @@ store_regs (int tid, int regno) if (ptrace (PTRACE_GETREGS, tid, 0, (int) ®s) < 0) perror_with_name (_("Couldn't get registers")); - fill_gregset (®s, regno); + fill_gregset (current_regcache, ®s, regno); if (ptrace (PTRACE_SETREGS, tid, 0, (int) ®s) < 0) perror_with_name (_("Couldn't write registers")); @@ -175,12 +176,13 @@ store_regs (int tid, int regno) Since M32R has no floating-point registers, these functions do nothing. */ void -supply_fpregset (gdb_fpregset_t *fpregs) +supply_fpregset (struct regcache *regcache, const gdb_fpregset_t *fpregs) { } void -fill_fpregset (gdb_fpregset_t *fpregs, int regno) +fill_fpregset (const struct regcache *regcache, + gdb_fpregset_t *fpregs, int regno) { } -- cgit v1.2.1