diff options
| author | Ulrich Weigand <uweigand@de.ibm.com> | 2007-06-09 13:49:20 +0000 |
|---|---|---|
| committer | Ulrich Weigand <uweigand@de.ibm.com> | 2007-06-09 13:49:20 +0000 |
| commit | bf6ae4641c04121071734f45fd22b2ee2533d3b1 (patch) | |
| tree | f6862b215882e0410306eb5e626c366836ea1c2f /gdb/arm-tdep.c | |
| parent | c9f4d5725ddd4daae3866469aaa6293f1b58a404 (diff) | |
| download | gdb-bf6ae4641c04121071734f45fd22b2ee2533d3b1.zip gdb-bf6ae4641c04121071734f45fd22b2ee2533d3b1.tar.gz gdb-bf6ae4641c04121071734f45fd22b2ee2533d3b1.tar.bz2 | |
2007-06-09 Markus Deuling <deuling@de.ibm.com>
* gdbarch.sh (ADDR_BITS_REMOVE): Replace by gdbarch_addr_bits_remove.
* value.c (value_as_address): Likewise (comment).
* remote-mips.c (common_breakpoint): Likewise.
* regcache.c (read_pc_pid): Likewise.
* printcmd.c (do_one_display): Likewise.
* monitor.c (monitor_write_memory, monitor_read_memory)
(monitor_insert_breakpoint): Likewise.
* mips-tdep.c (heuristic_proc_start): Likewise.
* infrun.c (insert_step_resume_breakpoint_at_frame)
(insert_step_resume_breakpoint_at_caller): Likewise.
* buildsym.c (record_line): Likewise.
* arm-tdep.c (arm_scan_prologue, thumb_get_next_pc)
(arm_get_next_pc): Likewise.
* armnbsd-nat.c (arm_supply_gregset, fetch_register, store_register)
(store_regs): Likewise.
* arm-linux-tdep.c (arm_linux_supply_gregset): Likewise.
* arm-linux-nat.c (fetch_register, fetch_regs): Likewise.
* gdbarch.c, gdbarch.h: Regenerate.
Diffstat (limited to 'gdb/arm-tdep.c')
| -rw-r--r-- | gdb/arm-tdep.c | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c index 7205471..45240f1 100644 --- a/gdb/arm-tdep.c +++ b/gdb/arm-tdep.c @@ -724,7 +724,8 @@ arm_scan_prologue (struct frame_info *next_frame, struct arm_prologue_cache *cac return; else { - prologue_start = ADDR_BITS_REMOVE (return_value) - 8; + prologue_start = gdbarch_addr_bits_remove + (current_gdbarch, return_value) - 8; prologue_end = prologue_start + 64; /* See above. */ } } @@ -1623,7 +1624,7 @@ thumb_get_next_pc (CORE_ADDR pc) offset = bitcount (bits (inst1, 0, 7)) * DEPRECATED_REGISTER_SIZE; sp = read_register (ARM_SP_REGNUM); nextpc = (CORE_ADDR) read_memory_unsigned_integer (sp + offset, 4); - nextpc = ADDR_BITS_REMOVE (nextpc); + nextpc = gdbarch_addr_bits_remove (current_gdbarch, nextpc); if (nextpc == pc) error (_("Infinite loop detected")); } @@ -1654,7 +1655,7 @@ thumb_get_next_pc (CORE_ADDR pc) else nextpc = read_register (bits (inst1, 3, 6)); - nextpc = ADDR_BITS_REMOVE (nextpc); + nextpc = gdbarch_addr_bits_remove (current_gdbarch, nextpc); if (nextpc == pc) error (_("Infinite loop detected")); } @@ -1704,7 +1705,8 @@ arm_get_next_pc (CORE_ADDR pc) { rn = bits (this_instr, 0, 3); result = (rn == 15) ? pc_val + 8 : read_register (rn); - nextpc = (CORE_ADDR) ADDR_BITS_REMOVE (result); + nextpc = (CORE_ADDR) gdbarch_addr_bits_remove + (current_gdbarch, result); if (nextpc == pc) error (_("Infinite loop detected")); @@ -1785,7 +1787,8 @@ arm_get_next_pc (CORE_ADDR pc) result = ~operand2; break; } - nextpc = (CORE_ADDR) ADDR_BITS_REMOVE (result); + nextpc = (CORE_ADDR) gdbarch_addr_bits_remove + (current_gdbarch, result); if (nextpc == pc) error (_("Infinite loop detected")); @@ -1828,7 +1831,7 @@ arm_get_next_pc (CORE_ADDR pc) nextpc = (CORE_ADDR) read_memory_integer ((CORE_ADDR) base, 4); - nextpc = ADDR_BITS_REMOVE (nextpc); + nextpc = gdbarch_addr_bits_remove (current_gdbarch, nextpc); if (nextpc == pc) error (_("Infinite loop detected")); @@ -1865,7 +1868,8 @@ arm_get_next_pc (CORE_ADDR pc) + offset), 4); } - nextpc = ADDR_BITS_REMOVE (nextpc); + nextpc = gdbarch_addr_bits_remove + (current_gdbarch, nextpc); if (nextpc == pc) error (_("Infinite loop detected")); } @@ -1881,7 +1885,7 @@ arm_get_next_pc (CORE_ADDR pc) if (bits (this_instr, 28, 31) == INST_NV) nextpc |= bit (this_instr, 24) << 1; - nextpc = ADDR_BITS_REMOVE (nextpc); + nextpc = gdbarch_addr_bits_remove (current_gdbarch, nextpc); if (nextpc == pc) error (_("Infinite loop detected")); break; |