Fix build failure for microblaze-xilinx-linux.

	* 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.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index f11c3c68ce38eb5b5911199da4b7ecb91c5988f8..3c1eacb04f9b03050808378a58b44ee43d08b8be 100644 (file)
--- 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 2b07d95f7df658790fc6a3732e5b4f7d6adbd0e1..e482f7264364e6cdc7feabf1f4c4f348365a1036 100644 (file)
--- 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 b008448a4a4059b616b154cc771d011c472def30..6f623579e235da7287657b71dcd50c885cf945e7 100644 (file)
--- 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 5a6c6a1057ab9a12cd8d7d0d6e49da746f525a1c..8a10c3cee9b7e9dcc7eb315412b643ba0f4bb391 100644 (file)
--- 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}