OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gdbarch software_single_step frame_info to regcache: nios2 

gdb:

2016-11-22  Yao Qi  <yao.qi@linaro.org>

	* nios2-tdep.c (nios2_get_next_pc): Replace parameter frame
	with regcache.  Call regcache_raw_get_signed instead of
	get_frame_register_unsigned.
	(nios2_software_single_step): Call get_regcache_arch
	instead of get_frame_arch.
This commit is contained in:
Yao Qi 2016-11-22 14:05:05 +00:00
parent a8f341826d
commit 3889f4909e
2 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gdb/ChangeLog
View File

@ -1,3 +1,11 @@
2016-11-22 Yao Qi <yao.qi@linaro.org>
* nios2-tdep.c (nios2_get_next_pc): Replace parameter frame
with regcache. Call regcache_raw_get_signed instead of
get_frame_register_unsigned.
(nios2_software_single_step): Call get_regcache_arch
instead of get_frame_arch.
2016-11-22 Yao Qi <yao.qi@linaro.org>
* moxie-tdep.c (moxie_software_single_step): Call

25
gdb/nios2-tdep.c
View File

@ -2126,9 +2126,9 @@ static const struct frame_unwind nios2_stub_frame_unwind =
branch prediction. */
static CORE_ADDR
nios2_get_next_pc (struct frame_info *frame, CORE_ADDR pc)
nios2_get_next_pc (struct regcache *regcache, CORE_ADDR pc)
{
struct gdbarch *gdbarch = get_frame_arch (frame);
struct gdbarch *gdbarch = get_regcache_arch (regcache);
struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
unsigned long mach = gdbarch_bfd_arch_info (gdbarch)->mach;
unsigned int insn;
@ -2146,10 +2146,10 @@ nios2_get_next_pc (struct frame_info *frame, CORE_ADDR pc)
if (nios2_match_branch (insn, op, mach, &ra, &rb, &imm, &cond))
{
int ras = get_frame_register_signed (frame, ra);
int rbs = get_frame_register_signed (frame, rb);
unsigned int rau = get_frame_register_unsigned (frame, ra);
unsigned int rbu = get_frame_register_unsigned (frame, rb);
int ras = regcache_raw_get_signed (regcache, ra);
int rbs = regcache_raw_get_signed (regcache, rb);
unsigned int rau = regcache_raw_get_unsigned (regcache, ra);
unsigned int rbu = regcache_raw_get_unsigned (regcache, rb);
pc += op->size;
switch (cond)
@ -2192,7 +2192,7 @@ nios2_get_next_pc (struct frame_info *frame, CORE_ADDR pc)
else if (nios2_match_jmpr (insn, op, mach, &ra)
|| nios2_match_callr (insn, op, mach, &ra))
pc = get_frame_register_unsigned (frame, ra);
pc = regcache_raw_get_unsigned (regcache, ra);
else if (nios2_match_ldwm (insn, op, mach, &uimm, &ra, &imm, &wb, &id, &ret)
&& ret)
@ -2200,15 +2200,15 @@ nios2_get_next_pc (struct frame_info *frame, CORE_ADDR pc)
/* If ra is in the reglist, we have to use the value saved in the
stack frame rather than the current value. */
if (uimm & (1 << NIOS2_RA_REGNUM))
pc = nios2_unwind_pc (gdbarch, frame);
pc = nios2_unwind_pc (gdbarch, get_current_frame ());
else
pc = get_frame_register_unsigned (frame, NIOS2_RA_REGNUM);
pc = regcache_raw_get_unsigned (regcache, NIOS2_RA_REGNUM);
}
else if (nios2_match_trap (insn, op, mach, &uimm) && uimm == 0)
{
if (tdep->syscall_next_pc != NULL)
return tdep->syscall_next_pc (frame, op);
return tdep->syscall_next_pc (get_current_frame (), op);
}
else
@ -2222,8 +2222,9 @@ nios2_get_next_pc (struct frame_info *frame, CORE_ADDR pc)
static VEC (CORE_ADDR) *
nios2_software_single_step (struct frame_info *frame)
{
struct gdbarch *gdbarch = get_frame_arch (frame);
CORE_ADDR next_pc = nios2_get_next_pc (frame, get_frame_pc (frame));
struct regcache *regcache = get_current_regcache ();
struct gdbarch *gdbarch = get_regcache_arch (regcache);
CORE_ADDR next_pc = nios2_get_next_pc (regcache, regcache_read_pc (regcache));
VEC (CORE_ADDR) *next_pcs = NULL;
VEC_safe_push (CORE_ADDR, next_pcs, next_pc);