diff options
| author | Yao Qi <yao@codesourcery.com> | 2011-03-08 01:04:35 +0000 |
|---|---|---|
| committer | Yao Qi <yao@codesourcery.com> | 2011-03-08 01:04:35 +0000 |
| commit | 36073a929d8567b50ef5ed93b34cd8c6151a3d08 (patch) | |
| tree | c8c3bfa3dd799324766f5006523039dc78ba07c5 /gdb/arm-linux-tdep.c | |
| parent | 72b9089ad6c70d10ee690f1ca852a73c24f54ae0 (diff) | |
| download | gdb-36073a929d8567b50ef5ed93b34cd8c6151a3d08.zip gdb-36073a929d8567b50ef5ed93b34cd8c6151a3d08.tar.gz gdb-36073a929d8567b50ef5ed93b34cd8c6151a3d08.tar.bz2 | |
2011-03-08 Yao Qi <yao@codesourcery.com>
* arm-tdep.c: Remove prototype declaration displaced_in_arm_mode.
(displaced_read_reg): Add `dsc' parameter, remove `from' parameter.
Use cached result instead of calling displaced_in_arm_mode again.
(branch_write_pc, alu_write_pc, load_write_pc): Add `dsc' parameter.
(displaced_write_reg, copy_preload, copy_preload_reg): Callers update.
(cleanup_copro_load_store, copy_copro_load_store): Likewise.
(cleanup_branch, copy_bx_blx_reg, copy_alu_imm): Likewise.
(cleanup_alu_reg, copy_alu_reg, cleanup_alu_shifted_reg): Likewise.
(copy_alu_shifted_reg, cleanup_load, cleanup_store): Likewise.
(copy_extra_ld_st, copy_ldr_str_ldrb_strb): Likewise.
(cleanup_block_load_all, cleanup_block_store_pc): Likewise.
(cleanup_block_load_pc, copy_block_xfer): Likewise.
* arm-linux-tdep.c (arm_linux_copy_svc): Callers update.
(arm_catch_kernel_helper_return): Likewise.
* gdb/arm-tdep.h : Update function declarations.
Diffstat (limited to 'gdb/arm-linux-tdep.c')
| -rw-r--r-- | gdb/arm-linux-tdep.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/gdb/arm-linux-tdep.c b/gdb/arm-linux-tdep.c index f60ecc3..2f3109c 100644 --- a/gdb/arm-linux-tdep.c +++ b/gdb/arm-linux-tdep.c @@ -801,11 +801,10 @@ static int arm_linux_copy_svc (struct gdbarch *gdbarch, uint32_t insn, CORE_ADDR to, struct regcache *regs, struct displaced_step_closure *dsc) { - CORE_ADDR from = dsc->insn_addr; CORE_ADDR return_to = 0; struct frame_info *frame; - unsigned int svc_number = displaced_read_reg (regs, from, 7); + unsigned int svc_number = displaced_read_reg (regs, dsc, 7); int is_sigreturn = 0; if (debug_displaced) @@ -918,7 +917,7 @@ arm_catch_kernel_helper_return (struct gdbarch *gdbarch, CORE_ADDR from, Insn: ldr pc, [r14, #4] Cleanup: r14 <- tmp[0], pc <- tmp[0]. */ - dsc->tmp[0] = displaced_read_reg (regs, from, ARM_LR_REGNUM); + dsc->tmp[0] = displaced_read_reg (regs, dsc, ARM_LR_REGNUM); displaced_write_reg (regs, dsc, ARM_LR_REGNUM, (ULONGEST) to + 4, CANNOT_WRITE_PC); write_memory_unsigned_integer (to + 8, 4, byte_order, from); |