diff options
| -rw-r--r-- | gdb/ChangeLog | 8 | ||||
| -rw-r--r-- | gdb/microblaze-linux-tdep.c | 7 | ||||
| -rw-r--r-- | gdb/microblaze-tdep.c | 3 | ||||
| -rw-r--r-- | gdb/microblaze-tdep.h | 3 |
4 files changed, 15 insertions, 6 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index f11c3c6..3c1eacb 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,11 @@ +2009-10-16 Michael Eager <eager@eagercon.com> + + * microblaze-linux-tdep.c: + microblaze_linux_memory_remove_breakpoint(): Add gdbarch to param, + replace frame_pc_unwind with get_frame_address_in_block. + * microblaze-tdep.c: Remove MICROBLAZE_REGISTER_SIZE. + * microblaze-tdep.h: Add MICROBLAZE_REGISTER_SIZE. + 2008-10-15 Steven G. Kargl <kargl@gcc.gnu.org> * amd64fbsd-nat.c (amd64fbsd_supply_pcb): Conditionally compile in diff --git a/gdb/microblaze-linux-tdep.c b/gdb/microblaze-linux-tdep.c index 2b07d95..e482f72 100644 --- a/gdb/microblaze-linux-tdep.c +++ b/gdb/microblaze-linux-tdep.c @@ -38,7 +38,8 @@ static int -microblaze_linux_memory_remove_breakpoint (struct bp_target_info *bp_tgt) +microblaze_linux_memory_remove_breakpoint (struct gdbarch *gdbarch, + struct bp_target_info *bp_tgt) { CORE_ADDR addr = bp_tgt->placed_address; const gdb_byte *bp; @@ -74,8 +75,8 @@ microblaze_linux_sigtramp_cache (struct frame_info *next_frame, struct gdbarch *gdbarch = get_frame_arch (next_frame); struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); - base = frame_unwind_register_unsigned (next_frame, SP_REGNUM); - if (bias > 0 && frame_pc_unwind (next_frame) != func) + base = frame_unwind_register_unsigned (next_frame, MICROBLAZE_SP_REGNUM); + if (bias > 0 && get_frame_address_in_block (next_frame) != func) /* See below, some signal trampolines increment the stack as their first instruction, need to compensate for that. */ base -= bias; diff --git a/gdb/microblaze-tdep.c b/gdb/microblaze-tdep.c index b008448..6f62357 100644 --- a/gdb/microblaze-tdep.c +++ b/gdb/microblaze-tdep.c @@ -63,9 +63,6 @@ #define IS_SAVE_HIDDEN_PTR(op, rd, ra, rb) \ ((op == add || op == addik) && ra == MICROBLAZE_FIRST_ARGREG && rb == 0) -/* All registers are 32 bits. */ -#define MICROBLAZE_REGISTER_SIZE 4 - /* The registers of the Xilinx microblaze processor. */ static const char *microblaze_register_names[] = diff --git a/gdb/microblaze-tdep.h b/gdb/microblaze-tdep.h index 5a6c6a1..8a10c3c 100644 --- a/gdb/microblaze-tdep.h +++ b/gdb/microblaze-tdep.h @@ -110,6 +110,9 @@ enum microblaze_regnum MICROBLAZE_RTLBHI_REGNUM }; +/* All registers are 32 bits. */ +#define MICROBLAZE_REGISTER_SIZE 4 + /* MICROBLAZE_BREAKPOINT defines the breakpoint that should be used. Only used for native debugging. */ #define MICROBLAZE_BREAKPOINT {0xb9, 0xcc, 0x00, 0x60} |