diff options
| -rw-r--r-- | gdb/ChangeLog | 19 | ||||
| -rw-r--r-- | gdb/alpha-nat.c | 2 | ||||
| -rw-r--r-- | gdb/gdbarch.c | 12 | ||||
| -rw-r--r-- | gdb/gdbarch.h | 12 | ||||
| -rwxr-xr-x | gdb/gdbarch.sh | 4 | ||||
| -rw-r--r-- | gdb/hppa-linux-nat.c | 4 | ||||
| -rw-r--r-- | gdb/inf-ptrace.c | 6 | ||||
| -rw-r--r-- | gdb/m68klinux-nat.c | 8 | ||||
| -rw-r--r-- | gdb/mipsnbsd-tdep.c | 10 | ||||
| -rw-r--r-- | gdb/regcache.c | 2 |
10 files changed, 38 insertions, 41 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 978427c..df9bfcea 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,24 @@ 2007-05-31 Markus Deuling <deuling@de.ibm.com> + * gdbarch.sh (CANNOT_FETCH_REGISTER): Replace by + gdbarch_cannot_fetch_register. + * alpha-nat.c (fetch_osf_core_registers): Likewise. + * hppa-linux-nat.c (fetch_register): Likewise. + * inf-ptrace.c (inf_ptrace_fetch_register): Likewise. + * m68klinux-nat.c (fetch_register): Likewise. + * mipsnbsd-tdep.c (mipsnbsd_supply_reg, mipsnbsd_supply_fpreg): + Likewise. + * gdbarch.sh (CANNOT_STORE_REGISTER): Replace by + gdbarch_cannot_store_register. + * hppa-linux-nat.c (store_register): Likewise. + * inf-ptrace.c (inf_ptrace_store_register): Likewise. + * regcache.c (regcache_raw_write): Likewise. + * m68klinux-nat.c (store_register): Likewise. + * mipsnbsd-tdep.c (mipsnbsd_fill_reg, mipsnbsd_fill_fpreg): Likewise. + * gdbarch.c, gdbarch.h: Regenerate. + +2007-05-31 Markus Deuling <deuling@de.ibm.com> + * gdbarch.sh (TARGET_OSABI): Replace by gdbarch_osabi. * gdbarch.c, gdbarch.h: Regenerate. diff --git a/gdb/alpha-nat.c b/gdb/alpha-nat.c index b6e3e0e..d90f967 100644 --- a/gdb/alpha-nat.c +++ b/gdb/alpha-nat.c @@ -89,7 +89,7 @@ fetch_osf_core_registers (struct regcache *regcache, for (regno = 0; regno < ALPHA_NUM_REGS; regno++) { - if (CANNOT_FETCH_REGISTER (regno)) + if (gdbarch_cannot_fetch_register (current_gdbarch, regno)) { regcache_raw_supply (regcache, regno, NULL); continue; diff --git a/gdb/gdbarch.c b/gdb/gdbarch.c index cc143fc..58bb2a8 100644 --- a/gdb/gdbarch.c +++ b/gdb/gdbarch.c @@ -757,12 +757,6 @@ gdbarch_dump (struct gdbarch *current_gdbarch, struct ui_file *file) fprintf_unfiltered (file, "gdbarch_dump: call_dummy_location = %s\n", paddr_d (current_gdbarch->call_dummy_location)); -#ifdef CANNOT_FETCH_REGISTER - fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "CANNOT_FETCH_REGISTER(regnum)", - XSTRING (CANNOT_FETCH_REGISTER (regnum))); -#endif fprintf_unfiltered (file, "gdbarch_dump: cannot_fetch_register = <0x%lx>\n", (long) current_gdbarch->cannot_fetch_register); @@ -774,12 +768,6 @@ gdbarch_dump (struct gdbarch *current_gdbarch, struct ui_file *file) fprintf_unfiltered (file, "gdbarch_dump: cannot_step_breakpoint = %s\n", paddr_d (current_gdbarch->cannot_step_breakpoint)); -#ifdef CANNOT_STORE_REGISTER - fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "CANNOT_STORE_REGISTER(regnum)", - XSTRING (CANNOT_STORE_REGISTER (regnum))); -#endif fprintf_unfiltered (file, "gdbarch_dump: cannot_store_register = <0x%lx>\n", (long) current_gdbarch->cannot_store_register); diff --git a/gdb/gdbarch.h b/gdb/gdbarch.h index 6642123..a30b69a 100644 --- a/gdb/gdbarch.h +++ b/gdb/gdbarch.h @@ -542,22 +542,10 @@ extern void set_gdbarch_register_bytes_ok (struct gdbarch *gdbarch, gdbarch_regi typedef int (gdbarch_cannot_fetch_register_ftype) (int regnum); extern int gdbarch_cannot_fetch_register (struct gdbarch *gdbarch, int regnum); extern void set_gdbarch_cannot_fetch_register (struct gdbarch *gdbarch, gdbarch_cannot_fetch_register_ftype *cannot_fetch_register); -#if !defined (GDB_TM_FILE) && defined (CANNOT_FETCH_REGISTER) -#error "Non multi-arch definition of CANNOT_FETCH_REGISTER" -#endif -#if !defined (CANNOT_FETCH_REGISTER) -#define CANNOT_FETCH_REGISTER(regnum) (gdbarch_cannot_fetch_register (current_gdbarch, regnum)) -#endif typedef int (gdbarch_cannot_store_register_ftype) (int regnum); extern int gdbarch_cannot_store_register (struct gdbarch *gdbarch, int regnum); extern void set_gdbarch_cannot_store_register (struct gdbarch *gdbarch, gdbarch_cannot_store_register_ftype *cannot_store_register); -#if !defined (GDB_TM_FILE) && defined (CANNOT_STORE_REGISTER) -#error "Non multi-arch definition of CANNOT_STORE_REGISTER" -#endif -#if !defined (CANNOT_STORE_REGISTER) -#define CANNOT_STORE_REGISTER(regnum) (gdbarch_cannot_store_register (current_gdbarch, regnum)) -#endif /* setjmp/longjmp support. */ diff --git a/gdb/gdbarch.sh b/gdb/gdbarch.sh index 2905f94..8f2f075 100755 --- a/gdb/gdbarch.sh +++ b/gdb/gdbarch.sh @@ -480,8 +480,8 @@ M::void:print_vector_info:struct ui_file *file, struct frame_info *frame, const # also include/...-sim.h. f:=:int:register_sim_regno:int reg_nr:reg_nr::legacy_register_sim_regno::0 F:=:int:register_bytes_ok:long nr_bytes:nr_bytes -f:=:int:cannot_fetch_register:int regnum:regnum::cannot_register_not::0 -f:=:int:cannot_store_register:int regnum:regnum::cannot_register_not::0 +f::int:cannot_fetch_register:int regnum:regnum::cannot_register_not::0 +f::int:cannot_store_register:int regnum:regnum::cannot_register_not::0 # setjmp/longjmp support. F:=:int:get_longjmp_target:CORE_ADDR *pc:pc # diff --git a/gdb/hppa-linux-nat.c b/gdb/hppa-linux-nat.c index ee24856..daabe3d 100644 --- a/gdb/hppa-linux-nat.c +++ b/gdb/hppa-linux-nat.c @@ -221,7 +221,7 @@ fetch_register (struct regcache *regcache, int regno) int tid; int val; - if (CANNOT_FETCH_REGISTER (regno)) + if (gdbarch_cannot_fetch_register (current_gdbarch, regno)) { regcache_raw_supply (regcache, regno, NULL); return; @@ -249,7 +249,7 @@ store_register (const struct regcache *regcache, int regno) int tid; int val; - if (CANNOT_STORE_REGISTER (regno)) + if (gdbarch_cannot_store_register (current_gdbarch, regno)) return; /* GNU/Linux LWP ID's are process ID's. */ diff --git a/gdb/inf-ptrace.c b/gdb/inf-ptrace.c index 19826bd..dfdfe50 100644 --- a/gdb/inf-ptrace.c +++ b/gdb/inf-ptrace.c @@ -626,7 +626,8 @@ inf_ptrace_fetch_register (struct regcache *regcache, int regnum) /* This isn't really an address, but ptrace thinks of it as one. */ addr = inf_ptrace_register_u_offset (current_gdbarch, regnum, 0); - if (addr == (CORE_ADDR)-1 || CANNOT_FETCH_REGISTER (regnum)) + if (addr == (CORE_ADDR)-1 + || gdbarch_cannot_fetch_register (current_gdbarch, regnum)) { regcache_raw_supply (regcache, regnum, NULL); return; @@ -681,7 +682,8 @@ inf_ptrace_store_register (const struct regcache *regcache, int regnum) /* This isn't really an address, but ptrace thinks of it as one. */ addr = inf_ptrace_register_u_offset (current_gdbarch, regnum, 1); - if (addr == (CORE_ADDR)-1 || CANNOT_STORE_REGISTER (regnum)) + if (addr == (CORE_ADDR)-1 + || gdbarch_cannot_store_register (current_gdbarch, regnum)) return; /* Cater for systems like GNU/Linux, that implement threads as diff --git a/gdb/m68klinux-nat.c b/gdb/m68klinux-nat.c index 96bf524..8f5b7c2 100644 --- a/gdb/m68klinux-nat.c +++ b/gdb/m68klinux-nat.c @@ -123,7 +123,7 @@ fetch_register (struct regcache *regcache, int regno) char buf[MAX_REGISTER_SIZE]; int tid; - if (CANNOT_FETCH_REGISTER (regno)) + if (gdbarch_cannot_fetch_register (current_gdbarch, regno)) { memset (buf, '\0', register_size (current_gdbarch, regno)); /* Supply zeroes */ regcache_raw_supply (regcache, regno, buf); @@ -185,10 +185,8 @@ store_register (const struct regcache *regcache, int regno) int tid; char buf[MAX_REGISTER_SIZE]; - if (CANNOT_STORE_REGISTER (regno)) - { - return; - } + if (gdbarch_cannot_store_register (current_gdbarch, regno)) + return; /* Overload thread id onto process id */ tid = TIDGET (inferior_ptid); diff --git a/gdb/mipsnbsd-tdep.c b/gdb/mipsnbsd-tdep.c index 1b7aa77..bd82af1 100644 --- a/gdb/mipsnbsd-tdep.c +++ b/gdb/mipsnbsd-tdep.c @@ -150,7 +150,7 @@ mipsnbsd_supply_reg (struct regcache *regcache, const char *regs, int regno) { if (regno == i || regno == -1) { - if (CANNOT_FETCH_REGISTER (i)) + if (gdbarch_cannot_fetch_register (current_gdbarch, i)) regcache_raw_supply (regcache, i, NULL); else regcache_raw_supply (regcache, i, @@ -165,7 +165,8 @@ mipsnbsd_fill_reg (const struct regcache *regcache, char *regs, int regno) int i; for (i = 0; i <= PC_REGNUM; i++) - if ((regno == i || regno == -1) && ! CANNOT_STORE_REGISTER (i)) + if ((regno == i || regno == -1) + && ! gdbarch_cannot_store_register (current_gdbarch, i)) regcache_raw_collect (regcache, i, regs + (i * mips_isa_regsize (current_gdbarch))); } @@ -181,7 +182,7 @@ mipsnbsd_supply_fpreg (struct regcache *regcache, const char *fpregs, int regno) { if (regno == i || regno == -1) { - if (CANNOT_FETCH_REGISTER (i)) + if (gdbarch_cannot_fetch_register (current_gdbarch, i)) regcache_raw_supply (regcache, i, NULL); else regcache_raw_supply (regcache, i, @@ -197,7 +198,8 @@ mipsnbsd_fill_fpreg (const struct regcache *regcache, char *fpregs, int regno) for (i = FP0_REGNUM; i <= mips_regnum (current_gdbarch)->fp_control_status; i++) - if ((regno == i || regno == -1) && ! CANNOT_STORE_REGISTER (i)) + if ((regno == i || regno == -1) + && ! gdbarch_cannot_store_register (current_gdbarch, i)) regcache_raw_collect (regcache, i, fpregs + ((i - FP0_REGNUM) * mips_isa_regsize (current_gdbarch))); } diff --git a/gdb/regcache.c b/gdb/regcache.c index e48725a..bf313df 100644 --- a/gdb/regcache.c +++ b/gdb/regcache.c @@ -616,7 +616,7 @@ regcache_raw_write (struct regcache *regcache, int regnum, /* On the sparc, writing %g0 is a no-op, so we don't even want to change the registers array if something writes to this register. */ - if (CANNOT_STORE_REGISTER (regnum)) + if (gdbarch_cannot_store_register (current_gdbarch, regnum)) return; /* Make certain that the correct cache is selected. */ |