diff options
| -rw-r--r-- | gdb/ChangeLog | 6 | ||||
| -rw-r--r-- | gdb/alpha-linux-nat.c | 25 | ||||
| -rw-r--r-- | gdb/alpha-nat.c | 21 |
3 files changed, 20 insertions, 32 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index d30267b..5948a5b 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,11 @@ 2007-04-28 Ulrich Weigand <uweigand@de.ibm.com> + * alpha-nat.c (ALPHA_REGSET_BASE, ALPHA_REGSET_UNIQUE): Do not define, + inline definition at the places the macros are used. + * alpha-linux-nat.c (ALPHA_REGSET_BASE, ALPHA_REGSET_UNIQUE): Likewise. + +2007-04-28 Ulrich Weigand <uweigand@de.ibm.com> + * rs6000-aix-tdep.c: Include "regcache.h", "regset.h", and "gdb_string.h". (rs6000_aix32_reg_offsets, rs6000_aix64_reg_offsets): New variables. diff --git a/gdb/alpha-linux-nat.c b/gdb/alpha-linux-nat.c index 8307a69..b2a1fc7 100644 --- a/gdb/alpha-linux-nat.c +++ b/gdb/alpha-linux-nat.c @@ -30,13 +30,6 @@ #include <sys/procfs.h> #include "gregset.h" -/* Given a pointer to either a gregset_t or fpregset_t, return a - pointer to the first register. */ -#define ALPHA_REGSET_BASE(regsetp) ((long *) (regsetp)) - -/* Given a pointer to a gregset_t, locate the UNIQUE value. */ -#define ALPHA_REGSET_UNIQUE(regsetp) ((long *)(regsetp) + 32) - /* The address of UNIQUE for ptrace. */ #define ALPHA_UNIQUE_PTRACE_ADDR 65 @@ -48,21 +41,19 @@ void supply_gregset (gdb_gregset_t *gregsetp) { - long *regp = ALPHA_REGSET_BASE (gregsetp); - void *unique = ALPHA_REGSET_UNIQUE (gregsetp); + long *regp = (long *)gregsetp; - /* PC is in slot 32. */ - alpha_supply_int_regs (-1, regp, regp + 31, unique); + /* PC is in slot 32, UNIQUE is in slot 33. */ + alpha_supply_int_regs (-1, regp, regp + 31, regp + 32); } void fill_gregset (gdb_gregset_t *gregsetp, int regno) { - long *regp = ALPHA_REGSET_BASE (gregsetp); - void *unique = ALPHA_REGSET_UNIQUE (gregsetp); + long *regp = (long *)gregsetp; - /* PC is in slot 32. */ - alpha_fill_int_regs (regno, regp, regp + 31, unique); + /* PC is in slot 32, UNIQUE is in slot 33. */ + alpha_fill_int_regs (regno, regp, regp + 31, regp + 32); } /* @@ -73,7 +64,7 @@ fill_gregset (gdb_gregset_t *gregsetp, int regno) void supply_fpregset (gdb_fpregset_t *fpregsetp) { - long *regp = ALPHA_REGSET_BASE (fpregsetp); + long *regp = (long *)fpregsetp; /* FPCR is in slot 32. */ alpha_supply_fp_regs (-1, regp, regp + 31); @@ -82,7 +73,7 @@ supply_fpregset (gdb_fpregset_t *fpregsetp) void fill_fpregset (gdb_fpregset_t *fpregsetp, int regno) { - long *regp = ALPHA_REGSET_BASE (fpregsetp); + long *regp = (long *)fpregsetp; /* FPCR is in slot 32. */ alpha_fill_fp_regs (regno, regp, regp + 31); diff --git a/gdb/alpha-nat.c b/gdb/alpha-nat.c index 542f335..b30f661 100644 --- a/gdb/alpha-nat.c +++ b/gdb/alpha-nat.c @@ -148,13 +148,6 @@ kernel_u_size (void) /* Prototypes for supply_gregset etc. */ #include "gregset.h" -/* Given a pointer to either a gregset_t or fpregset_t, return a - pointer to the first register. */ -#define ALPHA_REGSET_BASE(regsetp) ((regsetp)->regs) - -/* Locate the UNIQUE value within the gregset_t. */ -#define ALPHA_REGSET_UNIQUE(ptr) NULL - /* * See the comment in m68k-tdep.c regarding the utility of these functions. */ @@ -162,21 +155,19 @@ kernel_u_size (void) void supply_gregset (gdb_gregset_t *gregsetp) { - long *regp = ALPHA_REGSET_BASE (gregsetp); - void *unique = ALPHA_REGSET_UNIQUE (gregsetp); + long *regp = gregsetp->regs; /* PC is in slot 32. */ - alpha_supply_int_regs (-1, regp, regp + 31, unique); + alpha_supply_int_regs (-1, regp, regp + 31, NULL); } void fill_gregset (gdb_gregset_t *gregsetp, int regno) { - long *regp = ALPHA_REGSET_BASE (gregsetp); - void *unique = ALPHA_REGSET_UNIQUE (gregsetp); + long *regp = gregsetp->regs; /* PC is in slot 32. */ - alpha_fill_int_regs (regno, regp, regp + 31, unique); + alpha_fill_int_regs (regno, regp, regp + 31, NULL); } /* @@ -187,7 +178,7 @@ fill_gregset (gdb_gregset_t *gregsetp, int regno) void supply_fpregset (gdb_fpregset_t *fpregsetp) { - long *regp = ALPHA_REGSET_BASE (fpregsetp); + long *regp = fpregsetp->regs; /* FPCR is in slot 32. */ alpha_supply_fp_regs (-1, regp, regp + 31); @@ -196,7 +187,7 @@ supply_fpregset (gdb_fpregset_t *fpregsetp) void fill_fpregset (gdb_fpregset_t *fpregsetp, int regno) { - long *regp = ALPHA_REGSET_BASE (fpregsetp); + long *regp = fpregsetp->regs; /* FPCR is in slot 32. */ alpha_fill_fp_regs (regno, regp, regp + 31); |