* ld-cris/expdyn1.d, ld-cris/expdyn5.d, ld-cris/expdyn6.d,

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

diff --git a/gdb/mn10300-tdep.c b/gdb/mn10300-tdep.c
index dba52e283a58b8574d64cb3cb2deeab9109694ed..e9b720055576eaa8befd1c310391ec7ddeb66285 100644 (file)
--- a/gdb/mn10300-tdep.c
+++ b/gdb/mn10300-tdep.c
@@ -246,7 +246,7 @@ mn10300_type_align (struct type *type)
       return mn10300_type_align (check_typedef (type));
 
     default:
-      abort ();
+      internal_error (__FILE__, __LINE__, "bad switch");
     }
 }
 
@@ -557,7 +557,7 @@ mn10300_analyze_prologue (struct frame_info *fi, CORE_ADDR pc)
 
   /* Get the next two bytes into buf, we need two because rets is a two
      byte insn and the first isn't enough to uniquely identify it.  */
-  status = read_memory_nobpt (pc, buf, 2);
+  status = deprecated_read_memory_nobpt (pc, buf, 2);
   if (status != 0)
     return pc;
 
@@ -597,7 +597,7 @@ mn10300_analyze_prologue (struct frame_info *fi, CORE_ADDR pc)
 
   /* Suck in two bytes.  */
   if (addr + 2 >= stop
-      || (status = read_memory_nobpt (addr, buf, 2)) != 0)
+      || (status = deprecated_read_memory_nobpt (addr, buf, 2)) != 0)
     {
       fix_frame_pointer (fi, 0);
       return addr;
@@ -621,7 +621,7 @@ mn10300_analyze_prologue (struct frame_info *fi, CORE_ADDR pc)
   if (buf[0] == 0xcf)
     {
       /* Extract the register list for the movm instruction.  */
-      status = read_memory_nobpt (addr + 1, buf, 1);
+      status = deprecated_read_memory_nobpt (addr + 1, buf, 1);
       movm_args = *buf;
 
       addr += 2;
@@ -639,7 +639,7 @@ mn10300_analyze_prologue (struct frame_info *fi, CORE_ADDR pc)
        }
 
       /* Get the next two bytes so the prologue scan can continue.  */
-      status = read_memory_nobpt (addr, buf, 2);
+      status = deprecated_read_memory_nobpt (addr, buf, 2);
       if (status != 0)
        {
          /* Fix fi->frame since it's bogus at this point.  */
@@ -676,7 +676,7 @@ mn10300_analyze_prologue (struct frame_info *fi, CORE_ADDR pc)
        }
 
       /* Get two more bytes so scanning can continue.  */
-      status = read_memory_nobpt (addr, buf, 2);
+      status = deprecated_read_memory_nobpt (addr, buf, 2);
       if (status != 0)
        {
          /* Fix fi->frame if it's bogus at this point.  */
@@ -698,7 +698,7 @@ mn10300_analyze_prologue (struct frame_info *fi, CORE_ADDR pc)
      If none of the above was found, then this prologue has no 
      additional stack.  */
 
-  status = read_memory_nobpt (addr, buf, 2);
+  status = deprecated_read_memory_nobpt (addr, buf, 2);
   if (status != 0)
     {
       /* Fix fi->frame if it's bogus at this point.  */
@@ -721,7 +721,7 @@ mn10300_analyze_prologue (struct frame_info *fi, CORE_ADDR pc)
     {
       /* Suck in imm_size more bytes, they'll hold the size of the
          current frame.  */
-      status = read_memory_nobpt (addr + 2, buf, imm_size);
+      status = deprecated_read_memory_nobpt (addr + 2, buf, imm_size);
       if (status != 0)
        {
          /* Fix fi->frame if it's bogus at this point.  */
@@ -872,7 +872,7 @@ mn10300_pop_frame_regular (struct frame_info *frame)
         ULONGEST value;
 
         value = read_memory_unsigned_integer (deprecated_get_frame_saved_regs (frame)[regnum],
-                                              DEPRECATED_REGISTER_RAW_SIZE (regnum));
+                                              register_size (current_gdbarch, regnum));
         write_register (regnum, value);
       }
 
@@ -1164,8 +1164,8 @@ mn10300_print_register (const char *name, int regnum, int reg_width)
       int byte;
       if (TARGET_BYTE_ORDER == BFD_ENDIAN_BIG)
        {
-         for (byte = DEPRECATED_REGISTER_RAW_SIZE (regnum) - DEPRECATED_REGISTER_VIRTUAL_SIZE (regnum);
-              byte < DEPRECATED_REGISTER_RAW_SIZE (regnum);
+         for (byte = register_size (current_gdbarch, regnum) - DEPRECATED_REGISTER_VIRTUAL_SIZE (regnum);
+              byte < register_size (current_gdbarch, regnum);
               byte++)
            printf_filtered ("%02x", (unsigned char) raw_buffer[byte]);
        }
@@ -1290,11 +1290,8 @@ mn10300_gdbarch_init (struct gdbarch_info info,
   set_gdbarch_num_regs (gdbarch, num_regs);
   set_gdbarch_register_name (gdbarch, register_name);
   set_gdbarch_deprecated_register_size (gdbarch, 4);
-  set_gdbarch_deprecated_register_bytes (gdbarch, num_regs * gdbarch_deprecated_register_size (gdbarch));
-  set_gdbarch_deprecated_max_register_raw_size (gdbarch, 4);
   set_gdbarch_deprecated_register_raw_size (gdbarch, mn10300_register_raw_size);
   set_gdbarch_deprecated_register_byte (gdbarch, mn10300_register_byte);
-  set_gdbarch_deprecated_max_register_virtual_size (gdbarch, 4);
   set_gdbarch_deprecated_register_virtual_size (gdbarch, mn10300_register_virtual_size);
   set_gdbarch_deprecated_register_virtual_type (gdbarch, mn10300_register_virtual_type);
   set_gdbarch_dwarf2_reg_to_regnum (gdbarch, mn10300_dwarf2_reg_to_regnum);