Disable displaced stepping if trying it fails

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

diff --git a/gdb/moxie-tdep.c b/gdb/moxie-tdep.c
index e1992f9343a3420e8fe318e200b85c05482746c9..949631475c87b55f8e36b3e8c6b8e68e901be509 100644 (file)
--- a/gdb/moxie-tdep.c
+++ b/gdb/moxie-tdep.c
@@ -1,6 +1,6 @@
 /* Target-dependent code for Moxie.
 
-   Copyright (C) 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2009-2015 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -25,7 +25,6 @@
 #include "gdbtypes.h"
 #include "gdbcmd.h"
 #include "gdbcore.h"
-#include <string.h>
 #include "value.h"
 #include "inferior.h"
 #include "symfile.h"
@@ -39,8 +38,6 @@
 #include "record.h"
 #include "record-full.h"
 
-#include "gdb_assert.h"
-
 #include "moxie-tdep.h"
 
 /* Local functions.  */
@@ -244,7 +241,7 @@ moxie_skip_prologue (struct gdbarch *gdbarch, CORE_ADDR pc)
          plg_end = moxie_analyze_prologue (func_addr, 
                                            func_end, &cache, gdbarch);
          /* Found a function.  */
-         sym = lookup_symbol (func_name, NULL, VAR_DOMAIN, NULL);
+         sym = lookup_symbol (func_name, NULL, VAR_DOMAIN, NULL).symbol;
          /* Don't use line number debug info for assembly source
             files.  */
          if (sym && SYMBOL_LANGUAGE (sym) != language_asm)
@@ -373,7 +370,7 @@ moxie_software_single_step (struct frame_info *frame)
       switch (opcode)
        {
          /* 16-bit instructions.  */
-       case 0x00: /* nop */
+       case 0x00: /* bad */
        case 0x02: /* mov (register-to-register) */
        case 0x05: /* add.l */
        case 0x06: /* push */
@@ -381,13 +378,13 @@ moxie_software_single_step (struct frame_info *frame)
        case 0x0a: /* ld.l (register indirect) */
        case 0x0b: /* st.l */
        case 0x0e: /* cmp */
-       case 0x0f:
-       case 0x10:
-       case 0x11:
-       case 0x12:
-       case 0x13:
-       case 0x14:
-       case 0x15:
+       case 0x0f: /* nop */
+       case 0x10: /* sex.b */
+       case 0x11: /* sex.s */
+       case 0x12: /* zex.b */
+       case 0x13: /* zex.s */
+       case 0x14: /* umul.x */
+       case 0x15: /* mul.x */
        case 0x16:
        case 0x17:
        case 0x18:
@@ -412,22 +409,26 @@ moxie_software_single_step (struct frame_info *frame)
          insert_single_step_breakpoint (gdbarch, aspace, addr + 2);
          break;
 
+         /* 32-bit instructions.  */
+       case 0x0c: /* ldo.l */
+       case 0x0d: /* sto.l */
+       case 0x36: /* ldo.b */
+       case 0x37: /* sto.b */
+       case 0x38: /* ldo.s */
+       case 0x39: /* sto.s */
+         insert_single_step_breakpoint (gdbarch, aspace, addr + 4);
+         break;
+
          /* 48-bit instructions.  */
        case 0x01: /* ldi.l (immediate) */
        case 0x08: /* lda.l */
        case 0x09: /* sta.l */
-       case 0x0c: /* ldo.l */
-       case 0x0d: /* sto.l */
        case 0x1b: /* ldi.b (immediate) */
        case 0x1d: /* lda.b */
        case 0x1f: /* sta.b */
        case 0x20: /* ldi.s (immediate) */
        case 0x22: /* lda.s */
        case 0x24: /* sta.s */
-       case 0x36: /* ldo.b */
-       case 0x37: /* sto.b */
-       case 0x38: /* ldo.s */
-       case 0x39: /* sto.s */
          insert_single_step_breakpoint (gdbarch, aspace, addr + 6);
          break;
 
@@ -860,8 +861,8 @@ moxie_process_record (struct gdbarch *gdbarch, struct regcache *regcache,
        case 0x0d: /* sto.l */
          {
            int reg = (inst >> 4) & 0xf;
-           uint32_t offset = (uint32_t) moxie_process_readu (addr+2, buf, 4,
-                                                             byte_order);
+           uint32_t offset = (((int16_t) moxie_process_readu (addr+2, buf, 2,
+                                                              byte_order)) << 16 ) >> 16;
            regcache_raw_read (regcache, reg, (gdb_byte *) & tmpu32);
            tmpu32 = extract_unsigned_integer ((gdb_byte *) & tmpu32, 
                                               4, byte_order);
@@ -876,13 +877,23 @@ moxie_process_record (struct gdbarch *gdbarch, struct regcache *regcache,
              return -1;
          }
          break;
-       case 0x0f:
-       case 0x10:
-       case 0x11:
-       case 0x12:
-       case 0x13:
-       case 0x14:
-       case 0x15:
+       case 0x0f: /* nop */
+         {
+           /* Do nothing.  */
+           break;
+         }
+       case 0x10: /* sex.b */
+       case 0x11: /* sex.s */
+       case 0x12: /* zex.b */
+       case 0x13: /* zex.s */
+       case 0x14: /* umul.x */
+       case 0x15: /* mul.x */
+         {
+           int reg = (inst >> 4) & 0xf;
+           if (record_full_arch_list_add_reg (regcache, reg))
+             return -1;
+         }
+         break;
        case 0x16:
        case 0x17:
        case 0x18:
@@ -968,13 +979,13 @@ moxie_process_record (struct gdbarch *gdbarch, struct regcache *regcache,
        case 0x26: /* and */
        case 0x27: /* lshr */
        case 0x28: /* ashl */
-       case 0x29: /* sub.l */
+       case 0x29: /* sub */
        case 0x2a: /* neg */
        case 0x2b: /* or */
        case 0x2c: /* not */
        case 0x2d: /* ashr */
        case 0x2e: /* xor */
-       case 0x2f: /* mul.l */
+       case 0x2f: /* mul */
          {
            int reg = (inst >> 4) & 0xf;
            if (record_full_arch_list_add_reg (regcache, reg))
@@ -1055,8 +1066,8 @@ moxie_process_record (struct gdbarch *gdbarch, struct regcache *regcache,
        case 0x37: /* sto.b */
          {
            int reg = (inst >> 4) & 0xf;
-           uint32_t offset = (uint32_t) moxie_process_readu (addr+2, buf, 4,
-                                                             byte_order);
+           uint32_t offset = (((int16_t) moxie_process_readu (addr+2, buf, 2,
+                                                              byte_order)) << 16 ) >> 16;
            regcache_raw_read (regcache, reg, (gdb_byte *) & tmpu32);
            tmpu32 = extract_unsigned_integer ((gdb_byte *) & tmpu32, 
                                               4, byte_order);
@@ -1075,8 +1086,8 @@ moxie_process_record (struct gdbarch *gdbarch, struct regcache *regcache,
        case 0x39: /* sto.s */
          {
            int reg = (inst >> 4) & 0xf;
-           uint32_t offset = (uint32_t) moxie_process_readu (addr+2, buf, 4,
-                                                             byte_order);
+           uint32_t offset = (((int16_t) moxie_process_readu (addr+2, buf, 2,
+                                                              byte_order)) << 16 ) >> 16;
            regcache_raw_read (regcache, reg, (gdb_byte *) & tmpu32);
            tmpu32 = extract_unsigned_integer ((gdb_byte *) & tmpu32, 
                                               4, byte_order);
@@ -1112,7 +1123,7 @@ moxie_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
     return arches->gdbarch;
 
   /* Allocate space for the new architecture.  */
-  tdep = XMALLOC (struct gdbarch_tdep);
+  tdep = XNEW (struct gdbarch_tdep);
   gdbarch = gdbarch_alloc (&info, tdep);
 
   set_gdbarch_read_pc (gdbarch, moxie_read_pc);