Minor simplification in tui_default_win_viewport_height

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

diff --git a/gdb/moxie-tdep.c b/gdb/moxie-tdep.c
index 50cacfe..251c267 100644 (file)
--- a/gdb/moxie-tdep.c
+++ b/gdb/moxie-tdep.c
@@ -1,6 +1,6 @@
 /* Target-dependent code for Moxie.
 
-   Copyright (C) 2009-2018 Free Software Foundation, Inc.
+   Copyright (C) 2009-2019 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -433,8 +433,7 @@ moxie_software_single_step (struct regcache *regcache)
 
        case 0x19: /* jsr */
        case 0x25: /* jmp */
-         regcache_raw_read (regcache,
-                            (inst >> 4) & 0xf, (gdb_byte *) & tmpu32);
+         regcache->raw_read ((inst >> 4) & 0xf, (gdb_byte *) & tmpu32);
          next_pcs.push_back (tmpu32);
          break;
 
@@ -448,14 +447,6 @@ moxie_software_single_step (struct regcache *regcache)
   return next_pcs;
 }
 
-/* Implement the "unwind_sp" gdbarch method.  */
-
-static CORE_ADDR
-moxie_unwind_sp (struct gdbarch *gdbarch, struct frame_info *next_frame)
-{
-  return frame_unwind_register_unsigned (next_frame, MOXIE_SP_REGNUM);
-}
-
 /* Given a return value in `regbuf' with a type `valtype', 
    extract and copy its value into `valbuf'.  */
 
@@ -557,14 +548,6 @@ moxie_frame_cache (struct frame_info *this_frame, void **this_cache)
   return cache;
 }
 
-/* Implement the "unwind_pc" gdbarch method.  */
-
-static CORE_ADDR
-moxie_unwind_pc (struct gdbarch *gdbarch, struct frame_info *next_frame)
-{
-  return frame_unwind_register_unsigned (next_frame, MOXIE_PC_REGNUM);
-}
-
 /* Given a GDB frame, determine the address of the calling function's
    frame.  This will be used to create a new GDB frame struct.  */
 
@@ -630,14 +613,6 @@ static const struct frame_base moxie_frame_base = {
   moxie_frame_base_address
 };
 
-static struct frame_id
-moxie_dummy_id (struct gdbarch *gdbarch, struct frame_info *this_frame)
-{
-  CORE_ADDR sp = get_frame_register_unsigned (this_frame, MOXIE_SP_REGNUM);
-
-  return frame_id_build (sp, get_frame_pc (this_frame));
-}
-
 /* Parse the current instruction and record the values of the registers and
    memory that will be changed in current instruction to "record_arch_list".
    Return -1 if something wrong.  */
@@ -734,7 +709,7 @@ moxie_process_record (struct gdbarch *gdbarch, struct regcache *regcache,
          break;
        case 0x03: /* jsra */
          {
-           regcache_raw_read (regcache, 
+           regcache->raw_read (
                               MOXIE_SP_REGNUM, (gdb_byte *) & tmpu32);
            tmpu32 = extract_unsigned_integer ((gdb_byte *) & tmpu32, 
                                               4, byte_order);
@@ -763,7 +738,7 @@ moxie_process_record (struct gdbarch *gdbarch, struct regcache *regcache,
        case 0x06: /* push */
          {
            int reg = (inst >> 4) & 0xf;
-           regcache_raw_read (regcache, reg, (gdb_byte *) & tmpu32);
+           regcache->raw_read (reg, (gdb_byte *) & tmpu32);
            tmpu32 = extract_unsigned_integer ((gdb_byte *) & tmpu32, 
                                               4, byte_order);
            if (record_full_arch_list_add_reg (regcache, reg)
@@ -805,7 +780,7 @@ moxie_process_record (struct gdbarch *gdbarch, struct regcache *regcache,
        case 0x0b: /* st.l */
          {
            int reg = (inst >> 4) & 0xf;
-           regcache_raw_read (regcache, reg, (gdb_byte *) & tmpu32);
+           regcache->raw_read (reg, (gdb_byte *) & tmpu32);
            tmpu32 = extract_unsigned_integer ((gdb_byte *) & tmpu32, 
                                               4, byte_order);
            if (record_full_arch_list_add_mem (tmpu32, 4))
@@ -824,7 +799,7 @@ moxie_process_record (struct gdbarch *gdbarch, struct regcache *regcache,
            int reg = (inst >> 4) & 0xf;
            uint32_t offset = (((int16_t) moxie_process_readu (addr+2, buf, 2,
                                                               byte_order)) << 16 ) >> 16;
-           regcache_raw_read (regcache, reg, (gdb_byte *) & tmpu32);
+           regcache->raw_read (reg, (gdb_byte *) & tmpu32);
            tmpu32 = extract_unsigned_integer ((gdb_byte *) & tmpu32, 
                                               4, byte_order);
            tmpu32 += offset;
@@ -864,7 +839,7 @@ moxie_process_record (struct gdbarch *gdbarch, struct regcache *regcache,
          }
        case 0x19: /* jsr */
          {
-           regcache_raw_read (regcache, 
+           regcache->raw_read (
                               MOXIE_SP_REGNUM, (gdb_byte *) & tmpu32);
            tmpu32 = extract_unsigned_integer ((gdb_byte *) & tmpu32, 
                                               4, byte_order);
@@ -892,7 +867,7 @@ moxie_process_record (struct gdbarch *gdbarch, struct regcache *regcache,
        case 0x1e: /* st.b */
          {
            int reg = (inst >> 4) & 0xf;
-           regcache_raw_read (regcache, reg, (gdb_byte *) & tmpu32);
+           regcache->raw_read (reg, (gdb_byte *) & tmpu32);
            tmpu32 = extract_unsigned_integer ((gdb_byte *) & tmpu32, 
                                               4, byte_order);
            if (record_full_arch_list_add_mem (tmpu32, 1))
@@ -918,7 +893,7 @@ moxie_process_record (struct gdbarch *gdbarch, struct regcache *regcache,
        case 0x23: /* st.s */
          {
            int reg = (inst >> 4) & 0xf;
-           regcache_raw_read (regcache, reg, (gdb_byte *) & tmpu32);
+           regcache->raw_read (reg, (gdb_byte *) & tmpu32);
            tmpu32 = extract_unsigned_integer ((gdb_byte *) & tmpu32, 
                                               4, byte_order);
            if (record_full_arch_list_add_mem (tmpu32, 2))
@@ -978,12 +953,12 @@ moxie_process_record (struct gdbarch *gdbarch, struct regcache *regcache,
                  uint32_t length, ptr;
 
                  /* Read buffer pointer is in $r1.  */
-                 regcache_raw_read (regcache, 3, (gdb_byte *) & ptr);
+                 regcache->raw_read (3, (gdb_byte *) & ptr);
                  ptr = extract_unsigned_integer ((gdb_byte *) & ptr, 
                                                  4, byte_order);
 
                  /* String length is at 0x12($fp).  */
-                 regcache_raw_read (regcache, 
+                 regcache->raw_read (
                                     MOXIE_FP_REGNUM, (gdb_byte *) & tmpu32);
                  tmpu32 = extract_unsigned_integer ((gdb_byte *) & tmpu32, 
                                                     4, byte_order);
@@ -1029,7 +1004,7 @@ moxie_process_record (struct gdbarch *gdbarch, struct regcache *regcache,
            int reg = (inst >> 4) & 0xf;
            uint32_t offset = (((int16_t) moxie_process_readu (addr+2, buf, 2,
                                                               byte_order)) << 16 ) >> 16;
-           regcache_raw_read (regcache, reg, (gdb_byte *) & tmpu32);
+           regcache->raw_read (reg, (gdb_byte *) & tmpu32);
            tmpu32 = extract_unsigned_integer ((gdb_byte *) & tmpu32, 
                                               4, byte_order);
            tmpu32 += offset;
@@ -1049,7 +1024,7 @@ moxie_process_record (struct gdbarch *gdbarch, struct regcache *regcache,
            int reg = (inst >> 4) & 0xf;
            uint32_t offset = (((int16_t) moxie_process_readu (addr+2, buf, 2,
                                                               byte_order)) << 16 ) >> 16;
-           regcache_raw_read (regcache, reg, (gdb_byte *) & tmpu32);
+           regcache->raw_read (reg, (gdb_byte *) & tmpu32);
            tmpu32 = extract_unsigned_integer ((gdb_byte *) & tmpu32, 
                                               4, byte_order);
            tmpu32 += offset;
@@ -1090,8 +1065,6 @@ moxie_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
   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);
   set_gdbarch_sp_regnum (gdbarch, MOXIE_SP_REGNUM);
   set_gdbarch_pc_regnum (gdbarch, MOXIE_PC_REGNUM);
@@ -1110,13 +1083,6 @@ moxie_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
 
   frame_base_set_default (gdbarch, &moxie_frame_base);
 
-  /* Methods for saving / extracting a dummy frame's ID.  The ID's
-     stack address must match the SP value returned by
-     PUSH_DUMMY_CALL, and saved by generic_save_dummy_frame_tos.  */
-  set_gdbarch_dummy_id (gdbarch, moxie_dummy_id);
-
-  set_gdbarch_unwind_pc (gdbarch, moxie_unwind_pc);
-
   /* Hook in ABI-specific overrides, if they have been registered.  */
   gdbarch_init_osabi (info, gdbarch);