This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[commit] Follow-on cleanup to alpha-nat.c and alpha-linux-nat.c
- From: "Ulrich Weigand" <uweigand at de dot ibm dot com>
- To: gdb-patches at sourceware dot org
- Date: Sat, 28 Apr 2007 20:16:49 +0200 (CEST)
- Subject: [commit] Follow-on cleanup to alpha-nat.c and alpha-linux-nat.c
Hello,
this is a small follow-on cleanup to my last alpha native patch: as we've now
got two versions of the supply_gregset etc. routines, the macro definitions
ALPHA_REGSET_BASE and ALPHA_REGSET_UNIQUE don't provide any benefit and can
just be inlined.
Tested by building alpha-linux and alpha-osf1 native debuggers.
Committed to mainline.
Bye,
Ulrich
ChangeLog:
* 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.
diff -urNp gdb-orig/gdb/alpha-linux-nat.c gdb-head/gdb/alpha-linux-nat.c
--- gdb-orig/gdb/alpha-linux-nat.c 2007-04-28 17:27:50.145110000 +0200
+++ gdb-head/gdb/alpha-linux-nat.c 2007-04-28 19:04:31.581696156 +0200
@@ -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, i
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 *fpregse
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 -urNp gdb-orig/gdb/alpha-nat.c gdb-head/gdb/alpha-nat.c
--- gdb-orig/gdb/alpha-nat.c 2007-04-28 17:27:50.150109000 +0200
+++ gdb-head/gdb/alpha-nat.c 2007-04-28 19:04:31.586695445 +0200
@@ -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, i
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 *fpregse
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);
--
Dr. Ulrich Weigand
GNU Toolchain for Linux on System z and Cell BE
Ulrich.Weigand@de.ibm.com