Automatic date update in version.in

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

diff --git a/gdb/moxie-tdep.c b/gdb/moxie-tdep.c
index aadb2701859ae7f13fa6453c89790bef2ee9288c..50cacfef972e0d70fe65f601af384f0c013350b8 100644 (file)
--- a/gdb/moxie-tdep.c
+++ b/gdb/moxie-tdep.c
@@ -1,6 +1,6 @@
 /* Target-dependent code for Moxie.
 
-   Copyright (C) 2009-2016 Free Software Foundation, Inc.
+   Copyright (C) 2009-2018 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -41,10 +41,6 @@
 #include "moxie-tdep.h"
 #include <algorithm>
 
-/* Local functions.  */
-
-extern void _initialize_moxie_tdep (void);
-
 /* Use an invalid address value as 'not available' marker.  */
 enum { REG_UNAVAIL = (CORE_ADDR) -1 };
 
@@ -74,7 +70,7 @@ typedef BP_MANIPULATION (moxie_break_insn) moxie_breakpoint;
 
 /* Moxie register names.  */
 
-char *moxie_register_names[] = {
+static const char *moxie_register_names[] = {
   "$fp",  "$sp",  "$r0",  "$r1",  "$r2",
   "$r3",  "$r4",  "$r5", "$r6", "$r7",
   "$r8", "$r9", "$r10", "$r11", "$r12",
@@ -112,7 +108,7 @@ static void
 moxie_store_return_value (struct type *type, struct regcache *regcache,
                         const gdb_byte *valbuf)
 {
-  struct gdbarch *gdbarch = get_regcache_arch (regcache);
+  struct gdbarch *gdbarch = regcache->arch ();
   enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
   CORE_ADDR regval;
   int len = TYPE_LENGTH (type);
@@ -299,20 +295,19 @@ moxie_process_readu (CORE_ADDR addr, gdb_byte *buf,
 
 /* Insert a single step breakpoint.  */
 
-static int
-moxie_software_single_step (struct frame_info *frame)
+static std::vector<CORE_ADDR>
+moxie_software_single_step (struct regcache *regcache)
 {
-  struct gdbarch *gdbarch = get_frame_arch (frame);
-  struct address_space *aspace = get_frame_address_space (frame);
+  struct gdbarch *gdbarch = regcache->arch ();
   CORE_ADDR addr;
   gdb_byte buf[4];
   uint16_t inst;
   uint32_t tmpu32;
   ULONGEST fp;
   enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
-  struct regcache *regcache = get_current_regcache ();
+  std::vector<CORE_ADDR> next_pcs;
 
-  addr = get_frame_pc (frame);
+  addr = regcache_read_pc (regcache);
 
   inst = (uint16_t) moxie_process_readu (addr, buf, 2, byte_order);
 
@@ -338,8 +333,8 @@ moxie_software_single_step (struct frame_info *frame)
            case 0x09: /* bleu */
              /* Insert breaks on both branches, because we can't currently tell
                 which way things will go.  */
-             insert_single_step_breakpoint (gdbarch, aspace, addr + 2);
-             insert_single_step_breakpoint (gdbarch, aspace, addr + 2 + INST2OFFSET(inst));
+             next_pcs.push_back (addr + 2);
+             next_pcs.push_back (addr + 2 + INST2OFFSET(inst));
              break;
            default:
              {
@@ -351,7 +346,7 @@ moxie_software_single_step (struct frame_info *frame)
       else
        {
          /* This is a Form 2 instruction.  They are all 16 bits.  */
-         insert_single_step_breakpoint (gdbarch, aspace, addr + 2);
+         next_pcs.push_back (addr + 2);
        }
     }
   else
@@ -398,7 +393,7 @@ moxie_software_single_step (struct frame_info *frame)
        case 0x32: /* udiv.l */
        case 0x33: /* mod.l */
        case 0x34: /* umod.l */
-         insert_single_step_breakpoint (gdbarch, aspace, addr + 2);
+         next_pcs.push_back (addr + 2);
          break;
 
          /* 32-bit instructions.  */
@@ -408,7 +403,7 @@ moxie_software_single_step (struct frame_info *frame)
        case 0x37: /* sto.b */
        case 0x38: /* ldo.s */
        case 0x39: /* sto.s */
-         insert_single_step_breakpoint (gdbarch, aspace, addr + 4);
+         next_pcs.push_back (addr + 4);
          break;
 
          /* 48-bit instructions.  */
@@ -421,32 +416,26 @@ moxie_software_single_step (struct frame_info *frame)
        case 0x20: /* ldi.s (immediate) */
        case 0x22: /* lda.s */
        case 0x24: /* sta.s */
-         insert_single_step_breakpoint (gdbarch, aspace, addr + 6);
+         next_pcs.push_back (addr + 6);
          break;
 
          /* Control flow instructions.  */
        case 0x03: /* jsra */
        case 0x1a: /* jmpa */
-         insert_single_step_breakpoint (gdbarch, aspace,
-                                        moxie_process_readu (addr + 2,
-                                                             buf, 4,
-                                                             byte_order));
+         next_pcs.push_back (moxie_process_readu (addr + 2, buf, 4,
+                                                  byte_order));
          break;
 
        case 0x04: /* ret */
          regcache_cooked_read_unsigned (regcache, MOXIE_FP_REGNUM, &fp);
-         insert_single_step_breakpoint (gdbarch, aspace,
-                                        moxie_process_readu (fp + 4,
-                                                             buf, 4,
-                                                             byte_order));
+         next_pcs.push_back (moxie_process_readu (fp + 4, buf, 4, byte_order));
          break;
 
        case 0x19: /* jsr */
        case 0x25: /* jmp */
          regcache_raw_read (regcache,
                             (inst >> 4) & 0xf, (gdb_byte *) & tmpu32);
-         insert_single_step_breakpoint (gdbarch, aspace,
-                                        tmpu32);
+         next_pcs.push_back (tmpu32);
          break;
 
        case 0x30: /* swi */
@@ -456,26 +445,7 @@ moxie_software_single_step (struct frame_info *frame)
        }
     }
 
-  return 1;
-}
-
-/* Implement the "read_pc" gdbarch method.  */
-
-static CORE_ADDR
-moxie_read_pc (struct regcache *regcache)
-{
-  ULONGEST pc;
-
-  regcache_cooked_read_unsigned (regcache, MOXIE_PC_REGNUM, &pc);
-  return pc;
-}
-
-/* Implement the "write_pc" gdbarch method.  */
-
-static void
-moxie_write_pc (struct regcache *regcache, CORE_ADDR val)
-{
-  regcache_cooked_write_unsigned (regcache, MOXIE_PC_REGNUM, val);
+  return next_pcs;
 }
 
 /* Implement the "unwind_sp" gdbarch method.  */
@@ -493,7 +463,7 @@ static void
 moxie_extract_return_value (struct type *type, struct regcache *regcache,
                            gdb_byte *dst)
 {
-  struct gdbarch *gdbarch = get_regcache_arch (regcache);
+  struct gdbarch *gdbarch = regcache->arch ();
   enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
   int len = TYPE_LENGTH (type);
   ULONGEST tmp;
@@ -1114,11 +1084,12 @@ moxie_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
     return arches->gdbarch;
 
   /* Allocate space for the new architecture.  */
-  tdep = XNEW (struct gdbarch_tdep);
+  tdep = XCNEW (struct gdbarch_tdep);
   gdbarch = gdbarch_alloc (&info, tdep);
 
-  set_gdbarch_read_pc (gdbarch, moxie_read_pc);
-  set_gdbarch_write_pc (gdbarch, moxie_write_pc);
+  set_gdbarch_wchar_bit (gdbarch, 32);
+  set_gdbarch_wchar_signed (gdbarch, 0);
+
   set_gdbarch_unwind_sp (gdbarch, moxie_unwind_sp);
 
   set_gdbarch_num_regs (gdbarch, MOXIE_NUM_REGS);
@@ -1146,8 +1117,6 @@ moxie_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
 
   set_gdbarch_unwind_pc (gdbarch, moxie_unwind_pc);
 
-  set_gdbarch_print_insn (gdbarch, print_insn_moxie);
-
   /* Hook in ABI-specific overrides, if they have been registered.  */
   gdbarch_init_osabi (info, gdbarch);