2003-04-13 Michael Snyder <msnyder@redhat.com>

[binutils-gdb.git] / gdb / ns32k-tdep.c

diff --git a/gdb/ns32k-tdep.c b/gdb/ns32k-tdep.c
index c451ed929d13e7d8af219347825a9eff20b2c743..ef2752d0b77a7b81c7dd2ba7fffc1654e6b0e592 100644 (file)
--- a/gdb/ns32k-tdep.c
+++ b/gdb/ns32k-tdep.c
@@ -190,7 +190,7 @@ umax_frame_num_args (struct frame_info *fi)
   if (enter_addr > 0)
     {
       pc = ((enter_addr == 1)
-           ? SAVED_PC_AFTER_CALL (fi)
+           ? DEPRECATED_SAVED_PC_AFTER_CALL (fi)
            : DEPRECATED_FRAME_SAVED_PC (fi));
       insn = read_memory_integer (pc, 2);
       addr_mode = (insn >> 11) & 0x1f;
@@ -395,7 +395,7 @@ ns32k_frame_init_saved_regs (struct frame_info *frame)
 
       get_frame_saved_regs (frame)[SP_REGNUM] = get_frame_base (frame) + 4;
       get_frame_saved_regs (frame)[PC_REGNUM] = get_frame_base (frame) + 4;
-      get_frame_saved_regs (frame)[FP_REGNUM] = read_memory_integer (get_frame_base (frame), 4);
+      get_frame_saved_regs (frame)[DEPRECATED_FP_REGNUM] = read_memory_integer (get_frame_base (frame), 4);
     }
   else if (enter_addr == 1)
     {
@@ -412,8 +412,8 @@ ns32k_push_dummy_frame (void)
   int regnum;
 
   sp = push_word (sp, read_register (PC_REGNUM));
-  sp = push_word (sp, read_register (FP_REGNUM));
-  write_register (FP_REGNUM, sp);
+  sp = push_word (sp, read_register (DEPRECATED_FP_REGNUM));
+  write_register (DEPRECATED_FP_REGNUM, sp);
 
   for (regnum = 0; regnum < 8; regnum++)
     sp = push_word (sp, read_register (regnum));
@@ -436,7 +436,7 @@ ns32k_pop_frame (void)
       write_register (regnum,
                      read_memory_integer (get_frame_saved_regs (frame)[regnum], 4));
 
-  write_register (FP_REGNUM, read_memory_integer (fp, 4));
+  write_register (DEPRECATED_FP_REGNUM, read_memory_integer (fp, 4));
   write_register (PC_REGNUM, read_memory_integer (fp + 4, 4));
   write_register (SP_REGNUM, fp + 8);
   flush_cached_frames ();
@@ -556,7 +556,7 @@ ns32k_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
   set_gdbarch_num_regs (gdbarch, NS32K_PC_REGNUM);
   set_gdbarch_num_regs (gdbarch, NS32K_PS_REGNUM);
 
-  set_gdbarch_register_size (gdbarch, NS32K_REGISTER_SIZE);
+  set_gdbarch_deprecated_register_size (gdbarch, NS32K_REGISTER_SIZE);
   set_gdbarch_register_raw_size (gdbarch, ns32k_register_raw_size);
   set_gdbarch_deprecated_max_register_raw_size (gdbarch, NS32K_MAX_REGISTER_RAW_SIZE);
   set_gdbarch_register_virtual_size (gdbarch, ns32k_register_virtual_size);
@@ -566,7 +566,7 @@ ns32k_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
 
   /* Frame and stack info */
   set_gdbarch_skip_prologue (gdbarch, umax_skip_prologue);
-  set_gdbarch_saved_pc_after_call (gdbarch, ns32k_saved_pc_after_call);
+  set_gdbarch_deprecated_saved_pc_after_call (gdbarch, ns32k_saved_pc_after_call);
 
   set_gdbarch_frame_num_args (gdbarch, umax_frame_num_args);
   set_gdbarch_frameless_function_invocation (gdbarch,
@@ -595,11 +595,11 @@ ns32k_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
   set_gdbarch_deprecated_push_dummy_frame (gdbarch, ns32k_push_dummy_frame);
   set_gdbarch_deprecated_pop_frame (gdbarch, ns32k_pop_frame);
   set_gdbarch_call_dummy_location (gdbarch, ON_STACK);
-  set_gdbarch_call_dummy_words (gdbarch, ns32k_call_dummy_words);
-  set_gdbarch_sizeof_call_dummy_words (gdbarch, sizeof_ns32k_call_dummy_words);
-  set_gdbarch_fix_call_dummy (gdbarch, ns32k_fix_call_dummy);
-  set_gdbarch_call_dummy_start_offset (gdbarch, 3);
-  set_gdbarch_call_dummy_breakpoint_offset (gdbarch, 15);
+  set_gdbarch_deprecated_call_dummy_words (gdbarch, ns32k_call_dummy_words);
+  set_gdbarch_deprecated_sizeof_call_dummy_words (gdbarch, sizeof_ns32k_call_dummy_words);
+  set_gdbarch_deprecated_fix_call_dummy (gdbarch, ns32k_fix_call_dummy);
+  set_gdbarch_deprecated_call_dummy_start_offset (gdbarch, 3);
+  set_gdbarch_deprecated_call_dummy_breakpoint_offset (gdbarch, 15);
   set_gdbarch_deprecated_use_generic_dummy_frames (gdbarch, 0);
   set_gdbarch_deprecated_pc_in_call_dummy (gdbarch, deprecated_pc_in_call_dummy_on_stack);
 
@@ -624,5 +624,5 @@ _initialize_ns32k_tdep (void)
 {
   gdbarch_register (bfd_arch_ns32k, ns32k_gdbarch_init, NULL);
 
-  tm_print_insn = print_insn_ns32k;
+  deprecated_tm_print_insn = print_insn_ns32k;
 }