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

gdb/

Browse Source 
* arm-tdep.c (install_ldr_str_ldrb_strb): Renamed to ...
        (install_load_store): ... this.  New.
        Change parameter BYTE to SIZE.
        (arm_copy_ldr_str_ldrb_strb): Update caller.
        (arm_decode_ld_st_word_ubyte): Update caller.
This commit is contained in:
Yao Qi 2011-09-17 14:37:59 +00:00
parent 9c317b7184
commit 0f6f04bad9
2 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gdb/ChangeLog
View File

@ -1,3 +1,11 @@
2011-09-17 Yao Qi <yao@codesourcery.com>
* arm-tdep.c (install_ldr_str_ldrb_strb): Renamed to ...
(install_load_store): ... this. New.
Change parameter BYTE to SIZE.
(arm_copy_ldr_str_ldrb_strb): Update caller.
(arm_decode_ld_st_word_ubyte): Update caller.
2011-09-17 Yao Qi <yao@codesourcery.com> 2011-09-17 Yao Qi <yao@codesourcery.com>
* infrun.c (displaced_step_fixup): Move some code ... * infrun.c (displaced_step_fixup): Move some code ...

30
gdb/arm-tdep.c
View File

@ -5982,13 +5982,13 @@ arm_copy_extra_ld_st (struct gdbarch *gdbarch, uint32_t insn, int unpriveleged,
return 0; return 0;
} }
/* Copy byte/word loads and stores. */ /* Copy byte/half word/word loads and stores. */
static void static void
install_ldr_str_ldrb_strb (struct gdbarch *gdbarch, struct regcache *regs, install_load_store (struct gdbarch *gdbarch, struct regcache *regs,
struct displaced_step_closure *dsc, int load, struct displaced_step_closure *dsc, int load,
int immed, int writeback, int byte, int usermode, int immed, int writeback, int size, int usermode,
int rt, int rm, int rn) int rt, int rm, int rn)
{ {
ULONGEST rt_val, rn_val, rm_val = 0; ULONGEST rt_val, rn_val, rm_val = 0;
@ -6009,7 +6009,7 @@ install_ldr_str_ldrb_strb (struct gdbarch *gdbarch, struct regcache *regs,
if (!immed) if (!immed)
displaced_write_reg (regs, dsc, 3, rm_val, CANNOT_WRITE_PC); displaced_write_reg (regs, dsc, 3, rm_val, CANNOT_WRITE_PC);
dsc->rd = rt; dsc->rd = rt;
dsc->u.ldst.xfersize = byte ? 1 : 4; dsc->u.ldst.xfersize = size;
dsc->u.ldst.rn = rn; dsc->u.ldst.rn = rn;
dsc->u.ldst.immed = immed; dsc->u.ldst.immed = immed;
dsc->u.ldst.writeback = writeback; dsc->u.ldst.writeback = writeback;
@ -6042,7 +6042,7 @@ static int
arm_copy_ldr_str_ldrb_strb (struct gdbarch *gdbarch, uint32_t insn, arm_copy_ldr_str_ldrb_strb (struct gdbarch *gdbarch, uint32_t insn,
struct regcache *regs, struct regcache *regs,
struct displaced_step_closure *dsc, struct displaced_step_closure *dsc,
int load, int byte, int usermode) int load, int size, int usermode)
{ {
int immed = !bit (insn, 25); int immed = !bit (insn, 25);
int writeback = (bit (insn, 24) == 0 || bit (insn, 21) != 0); int writeback = (bit (insn, 24) == 0 || bit (insn, 21) != 0);
@ -6056,13 +6056,13 @@ arm_copy_ldr_str_ldrb_strb (struct gdbarch *gdbarch, uint32_t insn,
if (debug_displaced) if (debug_displaced)
fprintf_unfiltered (gdb_stdlog, fprintf_unfiltered (gdb_stdlog,
"displaced: copying %s%s r%d [r%d] insn %.8lx\n", "displaced: copying %s%s r%d [r%d] insn %.8lx\n",
load ? (byte ? "ldrb" : "ldr") load ? (size == 1 ? "ldrb" : "ldr")
: (byte ? "strb" : "str"), usermode ? "t" : "", : (size == 1 ? "strb" : "str"), usermode ? "t" : "",
rt, rn, rt, rn,
(unsigned long) insn); (unsigned long) insn);
install_ldr_str_ldrb_strb (gdbarch, regs, dsc, load, immed, writeback, byte, install_load_store (gdbarch, regs, dsc, load, immed, writeback, size,
usermode, rt, rm, rn); usermode, rt, rm, rn);
if (load || rt != ARM_PC_REGNUM) if (load || rt != ARM_PC_REGNUM)
{ {
@ -6762,16 +6762,16 @@ arm_decode_ld_st_word_ubyte (struct gdbarch *gdbarch, uint32_t insn,
if ((!a && (op1 & 0x05) == 0x00 && (op1 & 0x17) != 0x02) if ((!a && (op1 & 0x05) == 0x00 && (op1 & 0x17) != 0x02)
|| (a && (op1 & 0x05) == 0x00 && (op1 & 0x17) != 0x02 && !b)) || (a && (op1 & 0x05) == 0x00 && (op1 & 0x17) != 0x02 && !b))
return arm_copy_ldr_str_ldrb_strb (gdbarch, insn, regs, dsc, 0, 0, 0); return arm_copy_ldr_str_ldrb_strb (gdbarch, insn, regs, dsc, 0, 4, 0);
else if ((!a && (op1 & 0x17) == 0x02) else if ((!a && (op1 & 0x17) == 0x02)
|| (a && (op1 & 0x17) == 0x02 && !b)) || (a && (op1 & 0x17) == 0x02 && !b))
return arm_copy_ldr_str_ldrb_strb (gdbarch, insn, regs, dsc, 0, 0, 1); return arm_copy_ldr_str_ldrb_strb (gdbarch, insn, regs, dsc, 0, 4, 1);
else if ((!a && (op1 & 0x05) == 0x01 && (op1 & 0x17) != 0x03) else if ((!a && (op1 & 0x05) == 0x01 && (op1 & 0x17) != 0x03)
|| (a && (op1 & 0x05) == 0x01 && (op1 & 0x17) != 0x03 && !b)) || (a && (op1 & 0x05) == 0x01 && (op1 & 0x17) != 0x03 && !b))
return arm_copy_ldr_str_ldrb_strb (gdbarch, insn, regs, dsc, 1, 0, 0); return arm_copy_ldr_str_ldrb_strb (gdbarch, insn, regs, dsc, 1, 4, 0);
else if ((!a && (op1 & 0x17) == 0x03) else if ((!a && (op1 & 0x17) == 0x03)
|| (a && (op1 & 0x17) == 0x03 && !b)) || (a && (op1 & 0x17) == 0x03 && !b))
return arm_copy_ldr_str_ldrb_strb (gdbarch, insn, regs, dsc, 1, 0, 1); return arm_copy_ldr_str_ldrb_strb (gdbarch, insn, regs, dsc, 1, 4, 1);
else if ((!a && (op1 & 0x05) == 0x04 && (op1 & 0x17) != 0x06) else if ((!a && (op1 & 0x05) == 0x04 && (op1 & 0x17) != 0x06)
|| (a && (op1 & 0x05) == 0x04 && (op1 & 0x17) != 0x06 && !b)) || (a && (op1 & 0x05) == 0x04 && (op1 & 0x17) != 0x06 && !b))
return arm_copy_ldr_str_ldrb_strb (gdbarch, insn, regs, dsc, 0, 1, 0); return arm_copy_ldr_str_ldrb_strb (gdbarch, insn, regs, dsc, 0, 1, 0);