This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
Re: s/regcache_valid_p/regcache_register_status; add enum register_status
- From: Yao Qi <yao at codesourcery dot com>
- To: Pedro Alves <pedro at codesourcery dot com>
- Cc: gdb-patches at sourceware dot org
- Date: Sun, 30 Jan 2011 11:21:03 +0800
- Subject: Re: s/regcache_valid_p/regcache_register_status; add enum register_status
- References: <201101251249.04269.pedro@codesourcery.com>
On 01/25/2011 08:49 PM, Pedro Alves wrote:
> 2011-01-25 Pedro Alves <pedro@codesourcery.com>
>
> * regcache.c (struct regcache_descr): Rename
[....]
> (regcache_valid_p): Rename to ...
> (regcache_register_status): ... this. Adjust.
All the references to regcache_valid_p should be updated as well.
GDB native build on ARM is broken.
cc1: warnings being treated as errors
../../src/gdb/arm-linux-nat.c: In function store_fpregister:
../../src/gdb/arm-linux-nat.c:193: error: implicit declaration of
function regcache_valid_p
This patch is to s/regcache_valid_p/regcache_register_status in the rest
of gdb source files, and fix ARM native build failure.
OK to apply?
--
Yao (éå)
gdb/
2011-01-30 Yao Qi <yao@codesourcery.com>
* arm-linux-nat.c: Update calls to regcache_register_status
instead of regcache_valid_p.
* aix-thread.c: Likewise.
* i386gnu-nat.c: Likewise.
Index: gdb/aix-thread.c
===================================================================
RCS file: /cvs/src/src/gdb/aix-thread.c,v
retrieving revision 1.74
diff -u -r1.74 aix-thread.c
--- gdb/aix-thread.c 7 Jan 2011 19:36:15 -0000 1.74
+++ gdb/aix-thread.c 30 Jan 2011 02:12:39 -0000
@@ -1321,7 +1321,7 @@
int regno;
for (regno = 0; regno < ppc_num_gprs; regno++)
- if (regcache_valid_p (regcache, tdep->ppc_gp0_regnum + regno))
+ if (regcache_register_status (regcache, tdep->ppc_gp0_regnum + regno))
regcache_raw_collect (regcache, tdep->ppc_gp0_regnum + regno,
vals + regno);
}
@@ -1333,7 +1333,7 @@
int regno;
for (regno = 0; regno < ppc_num_gprs; regno++)
- if (regcache_valid_p (regcache, tdep->ppc_gp0_regnum + regno))
+ if (regcache_register_status (regcache, tdep->ppc_gp0_regnum + regno))
regcache_raw_collect (regcache, tdep->ppc_gp0_regnum + regno,
vals + regno);
}
@@ -1353,7 +1353,7 @@
for (regno = tdep->ppc_fp0_regnum;
regno < tdep->ppc_fp0_regnum + ppc_num_fprs;
regno++)
- if (regcache_valid_p (regcache, regno))
+ if (regcache_register_status (regcache, regno))
regcache_raw_collect (regcache, regno, vals + regno);
}
@@ -1377,20 +1377,20 @@
gdb_assert (sizeof (*iar) == register_size
(gdbarch, gdbarch_pc_regnum (gdbarch)));
- if (regcache_valid_p (regcache, gdbarch_pc_regnum (gdbarch)))
+ if (regcache_register_status (regcache, gdbarch_pc_regnum (gdbarch)))
regcache_raw_collect (regcache, gdbarch_pc_regnum (gdbarch), iar);
- if (regcache_valid_p (regcache, tdep->ppc_ps_regnum))
+ if (regcache_register_status (regcache, tdep->ppc_ps_regnum))
regcache_raw_collect (regcache, tdep->ppc_ps_regnum, msr);
- if (regcache_valid_p (regcache, tdep->ppc_cr_regnum))
+ if (regcache_register_status (regcache, tdep->ppc_cr_regnum))
regcache_raw_collect (regcache, tdep->ppc_cr_regnum, cr);
- if (regcache_valid_p (regcache, tdep->ppc_lr_regnum))
+ if (regcache_register_status (regcache, tdep->ppc_lr_regnum))
regcache_raw_collect (regcache, tdep->ppc_lr_regnum, lr);
- if (regcache_valid_p (regcache, tdep->ppc_ctr_regnum))
+ if (regcache_register_status (regcache, tdep->ppc_ctr_regnum))
regcache_raw_collect (regcache, tdep->ppc_ctr_regnum, ctr);
- if (regcache_valid_p (regcache, tdep->ppc_xer_regnum))
+ if (regcache_register_status (regcache, tdep->ppc_xer_regnum))
regcache_raw_collect (regcache, tdep->ppc_xer_regnum, xer);
if (tdep->ppc_fpscr_regnum >= 0
- && regcache_valid_p (regcache, tdep->ppc_fpscr_regnum))
+ && regcache_register_status (regcache, tdep->ppc_fpscr_regnum))
regcache_raw_collect (regcache, tdep->ppc_fpscr_regnum, fpscr);
}
@@ -1411,20 +1411,20 @@
gdb_assert (sizeof (*iar) == register_size (gdbarch,
gdbarch_pc_regnum (gdbarch)));
- if (regcache_valid_p (regcache, gdbarch_pc_regnum (gdbarch)))
+ if (regcache_register_status (regcache, gdbarch_pc_regnum (gdbarch)))
regcache_raw_collect (regcache, gdbarch_pc_regnum (gdbarch), iar);
- if (regcache_valid_p (regcache, tdep->ppc_ps_regnum))
+ if (regcache_register_status (regcache, tdep->ppc_ps_regnum))
regcache_raw_collect (regcache, tdep->ppc_ps_regnum, msr);
- if (regcache_valid_p (regcache, tdep->ppc_cr_regnum))
+ if (regcache_register_status (regcache, tdep->ppc_cr_regnum))
regcache_raw_collect (regcache, tdep->ppc_cr_regnum, cr);
- if (regcache_valid_p (regcache, tdep->ppc_lr_regnum))
+ if (regcache_register_status (regcache, tdep->ppc_lr_regnum))
regcache_raw_collect (regcache, tdep->ppc_lr_regnum, lr);
- if (regcache_valid_p (regcache, tdep->ppc_ctr_regnum))
+ if (regcache_register_status (regcache, tdep->ppc_ctr_regnum))
regcache_raw_collect (regcache, tdep->ppc_ctr_regnum, ctr);
- if (regcache_valid_p (regcache, tdep->ppc_xer_regnum))
+ if (regcache_register_status (regcache, tdep->ppc_xer_regnum))
regcache_raw_collect (regcache, tdep->ppc_xer_regnum, xer);
if (tdep->ppc_fpscr_regnum >= 0
- && regcache_valid_p (regcache, tdep->ppc_fpscr_regnum))
+ && regcache_register_status (regcache, tdep->ppc_fpscr_regnum))
regcache_raw_collect (regcache, tdep->ppc_fpscr_regnum, fpscr);
}
@@ -1459,7 +1459,7 @@
/* Collect general-purpose register values from the regcache. */
for (i = 0; i < ppc_num_gprs; i++)
- if (regcache_valid_p (regcache, tdep->ppc_gp0_regnum + i))
+ if (regcache_register_status (regcache, tdep->ppc_gp0_regnum + i))
{
if (arch64)
{
@@ -1494,19 +1494,19 @@
fill_sprs32 (regcache, &tmp_iar, &tmp_msr, &tmp_cr, &tmp_lr, &tmp_ctr,
&tmp_xer, &tmp_fpscr);
- if (regcache_valid_p (regcache, gdbarch_pc_regnum (gdbarch)))
+ if (regcache_register_status (regcache, gdbarch_pc_regnum (gdbarch)))
ctx.iar = tmp_iar;
- if (regcache_valid_p (regcache, tdep->ppc_ps_regnum))
+ if (regcache_register_status (regcache, tdep->ppc_ps_regnum))
ctx.msr = tmp_msr;
- if (regcache_valid_p (regcache, tdep->ppc_cr_regnum))
+ if (regcache_register_status (regcache, tdep->ppc_cr_regnum))
ctx.cr = tmp_cr;
- if (regcache_valid_p (regcache, tdep->ppc_lr_regnum))
+ if (regcache_register_status (regcache, tdep->ppc_lr_regnum))
ctx.lr = tmp_lr;
- if (regcache_valid_p (regcache, tdep->ppc_ctr_regnum))
+ if (regcache_register_status (regcache, tdep->ppc_ctr_regnum))
ctx.ctr = tmp_ctr;
- if (regcache_valid_p (regcache, tdep->ppc_xer_regnum))
+ if (regcache_register_status (regcache, tdep->ppc_xer_regnum))
ctx.xer = tmp_xer;
- if (regcache_valid_p (regcache, tdep->ppc_xer_regnum))
+ if (regcache_register_status (regcache, tdep->ppc_xer_regnum))
ctx.fpscr = tmp_fpscr;
}
@@ -1620,7 +1620,7 @@
sprs32.pt_fpscr = tmp_fpscr;
if (tdep->ppc_mq_regnum >= 0)
- if (regcache_valid_p (regcache, tdep->ppc_mq_regnum))
+ if (regcache_register_status (regcache, tdep->ppc_mq_regnum))
regcache_raw_collect (regcache, tdep->ppc_mq_regnum,
&sprs32.pt_mq);
Index: gdb/arm-linux-nat.c
===================================================================
RCS file: /cvs/src/src/gdb/arm-linux-nat.c,v
retrieving revision 1.45
diff -u -r1.45 arm-linux-nat.c
--- gdb/arm-linux-nat.c 7 Jan 2011 19:36:15 -0000 1.45
+++ gdb/arm-linux-nat.c 30 Jan 2011 02:12:39 -0000
@@ -190,7 +190,8 @@
}
/* Store fpsr. */
- if (ARM_FPS_REGNUM == regno && regcache_valid_p (regcache, ARM_FPS_REGNUM))
+ if (ARM_FPS_REGNUM == regno
+ && regcache_register_status (regcache, ARM_FPS_REGNUM))
regcache_raw_collect (regcache, ARM_FPS_REGNUM, fp + NWFPE_FPSR_OFFSET);
/* Store the floating point register. */
@@ -226,12 +227,12 @@
}
/* Store fpsr. */
- if (regcache_valid_p (regcache, ARM_FPS_REGNUM))
+ if (regcache_register_status (regcache, ARM_FPS_REGNUM))
regcache_raw_collect (regcache, ARM_FPS_REGNUM, fp + NWFPE_FPSR_OFFSET);
/* Store the floating point registers. */
for (regno = ARM_F0_REGNUM; regno <= ARM_F7_REGNUM; regno++)
- if (regcache_valid_p (regcache, regno))
+ if (regcache_register_status (regcache, regno))
collect_nwfpe_register (regcache, regno, fp);
ret = ptrace (PTRACE_SETFPREGS, tid, 0, fp);
@@ -328,7 +329,7 @@
int ret, tid;
elf_gregset_t regs;
- if (!regcache_valid_p (regcache, regno))
+ if (!regcache_register_status (regcache, regno))
return;
/* Get the thread id for the ptrace call. */
@@ -378,11 +379,11 @@
for (regno = ARM_A1_REGNUM; regno <= ARM_PC_REGNUM; regno++)
{
- if (regcache_valid_p (regcache, regno))
+ if (regcache_register_status (regcache, regno))
regcache_raw_collect (regcache, regno, (char *) ®s[regno]);
}
- if (arm_apcs_32 && regcache_valid_p (regcache, ARM_PS_REGNUM))
+ if (arm_apcs_32 && regcache_register_status (regcache, ARM_PS_REGNUM))
regcache_raw_collect (regcache, ARM_PS_REGNUM,
(char *) ®s[ARM_CPSR_GREGNUM]);
@@ -446,17 +447,17 @@
}
for (regno = 0; regno < 16; regno++)
- if (regcache_valid_p (regcache, regno + ARM_WR0_REGNUM))
+ if (regcache_register_status (regcache, regno + ARM_WR0_REGNUM))
regcache_raw_collect (regcache, regno + ARM_WR0_REGNUM,
®buf[regno * 8]);
for (regno = 0; regno < 2; regno++)
- if (regcache_valid_p (regcache, regno + ARM_WCSSF_REGNUM))
+ if (regcache_register_status (regcache, regno + ARM_WCSSF_REGNUM))
regcache_raw_collect (regcache, regno + ARM_WCSSF_REGNUM,
®buf[16 * 8 + regno * 4]);
for (regno = 0; regno < 4; regno++)
- if (regcache_valid_p (regcache, regno + ARM_WCGR0_REGNUM))
+ if (regcache_register_status (regcache, regno + ARM_WCGR0_REGNUM))
regcache_raw_collect (regcache, regno + ARM_WCGR0_REGNUM,
®buf[16 * 8 + 2 * 4 + regno * 4]);
Index: gdb/i386gnu-nat.c
===================================================================
RCS file: /cvs/src/src/gdb/i386gnu-nat.c,v
retrieving revision 1.41
diff -u -r1.41 i386gnu-nat.c
--- gdb/i386gnu-nat.c 9 Jan 2011 03:08:56 -0000 1.41
+++ gdb/i386gnu-nat.c 30 Jan 2011 02:12:40 -0000
@@ -272,7 +272,7 @@
proc_debug (thread, "storing all registers");
for (i = 0; i < I386_NUM_GREGS; i++)
- if (regcache_valid_p (regcache, i))
+ if (regcache_register_status (regcache, i))
regcache_raw_collect (regcache, i, REG_ADDR (state, i));
}
else
@@ -280,7 +280,7 @@
proc_debug (thread, "storing register %s",
gdbarch_register_name (gdbarch, regno));
- gdb_assert (regcache_valid_p (regcache, regno));
+ gdb_assert (regcache_register_status (regcache, regno));
regcache_raw_collect (regcache, regno, REG_ADDR (state, regno));
}