Add an optional "alias" attribute to syscall entries.

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

diff --git a/gdb/microblaze-tdep.c b/gdb/microblaze-tdep.c
index f5035904aec2c4da6ad8a05282218488a832b515..018b713a18ec8cd31ddd24af3d90ef5cf7d3b8d4 100644 (file)
--- a/gdb/microblaze-tdep.c
+++ b/gdb/microblaze-tdep.c
@@ -34,8 +34,8 @@
 #include "dwarf2-frame.h"
 #include "osabi.h"
 #include "target-descriptions.h"
-#include "opcodes/microblaze-opcm.h"
-#include "opcodes/microblaze-dis.h"
+#include "../opcodes/microblaze-opcm.h"
+#include "../opcodes/microblaze-dis.h"
 #include "microblaze-tdep.h"
 #include "remote.h"
 
@@ -353,12 +353,13 @@ microblaze_analyze_prologue (struct gdbarch *gdbarch, CORE_ADDR pc,
         instruction.  */
 
       {
-       unsigned op = (unsigned)insn >> 26;
+       unsigned ctrl_op = (unsigned)insn >> 26;
 
        /* continue if not control flow (branch, return).  */
-       if (op != 0x26 && op != 0x27 && op != 0x2d && op != 0x2e && op != 0x2f)
+       if (ctrl_op != 0x26 && ctrl_op != 0x27 && ctrl_op != 0x2d
+           && ctrl_op != 0x2e && ctrl_op != 0x2f)
          continue;
-       else if (op == 0x2c)
+       else if (ctrl_op == 0x2c)
          continue;    /* continue if imm.  */
       }
 
@@ -573,13 +574,13 @@ microblaze_store_return_value (struct type *type, struct regcache *regcache,
     {
        gdb_assert (len == 8);
        memcpy (buf, valbuf, 8);
-       regcache_cooked_write (regcache, MICROBLAZE_RETVAL_REGNUM+1, buf + 4);
+       regcache->cooked_write (MICROBLAZE_RETVAL_REGNUM+1, buf + 4);
     }
   else
     /* ??? Do we need to do any sign-extension here?  */
     memcpy (buf + 4 - len, valbuf, len);
 
-  regcache_cooked_write (regcache, MICROBLAZE_RETVAL_REGNUM, buf);
+  regcache->cooked_write (MICROBLAZE_RETVAL_REGNUM, buf);
 }
 
 static enum return_value_convention