2011-05-26 Pedro Alves <pedro@codesourcery.com>

[deliverable/binutils-gdb.git] / gdb / microblaze-linux-tdep.c

diff --git a/gdb/microblaze-linux-tdep.c b/gdb/microblaze-linux-tdep.c
index 2b07d95f7df658790fc6a3732e5b4f7d6adbd0e1..c14e01b43feea52636fa31780bdc4a537510f2ac 100644 (file)
--- a/gdb/microblaze-linux-tdep.c
+++ b/gdb/microblaze-linux-tdep.c
@@ -1,6 +1,6 @@
 /* Target-dependent code for Xilinx MicroBlaze.
 
-   Copyright 2009 Free Software Foundation, Inc.
+   Copyright 2009, 2010, 2011 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -35,10 +35,11 @@
 #include "trad-frame.h"
 #include "frame-unwind.h"
 #include "tramp-frame.h"
-
+#include "linux-tdep.h"
 
 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;
@@ -122,6 +123,8 @@ microblaze_linux_init_abi (struct gdbarch_info info,
 {
   struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
 
+  linux_init_abi (info, gdbarch);
+
   set_gdbarch_memory_remove_breakpoint (gdbarch,
                                        microblaze_linux_memory_remove_breakpoint);