* Makefile.in (i386nbsd-tdep.o): Add $(arch_utils_h),

[deliverable/binutils-gdb.git] / gdb / remote-rdp.c

diff --git a/gdb/remote-rdp.c b/gdb/remote-rdp.c
index bb602cd3493159ca9f6df111b0a6034f1b275c64..34a42abb1fa61a1109abaf51f774e4c61c5384f5 100644 (file)
--- a/gdb/remote-rdp.c
+++ b/gdb/remote-rdp.c
@@ -41,7 +41,7 @@
 #include "defs.h"
 #include "inferior.h"
 #include "value.h"
-#include "callback.h"
+#include "gdb/callback.h"
 #include "command.h"
 #include <ctype.h>
 #include <fcntl.h>
@@ -52,6 +52,8 @@
 #include "regcache.h"
 #include "serial.h"
 
+#include "arm-tdep.h"
+
 #ifdef HAVE_TIME_H
 #include <time.h>
 #endif
@@ -610,17 +612,17 @@ remote_rdp_fetch_register (int regno)
     }
   else
     {
-      char buf[MAX_REGISTER_RAW_SIZE];
+      char buf[ARM_MAX_REGISTER_RAW_SIZE];
       if (regno < 15)
        rdp_fetch_one_register (1 << regno, buf);
-      else if (regno == PC_REGNUM)
+      else if (regno == ARM_PC_REGNUM)
        rdp_fetch_one_register (RDP_CPU_READWRITE_MASK_PC, buf);
-      else if (regno == PS_REGNUM)
+      else if (regno == ARM_PS_REGNUM)
        rdp_fetch_one_register (RDP_CPU_READWRITE_MASK_CPSR, buf);
-      else if (regno == FPS_REGNUM)
+      else if (regno == ARM_FPS_REGNUM)
        rdp_fetch_one_fpu_register (RDP_FPU_READWRITE_MASK_FPS, buf);
-      else if (regno >= F0_REGNUM && regno <= F7_REGNUM)
-       rdp_fetch_one_fpu_register (1 << (regno - F0_REGNUM), buf);
+      else if (regno >= ARM_F0_REGNUM && regno <= ARM_F7_REGNUM)
+       rdp_fetch_one_fpu_register (1 << (regno - ARM_F0_REGNUM), buf);
       else
        {
          printf ("Help me with fetch reg %d\n", regno);
@@ -640,16 +642,16 @@ remote_rdp_store_register (int regno)
     }
   else
     {
-      char tmp[MAX_REGISTER_RAW_SIZE];
+      char tmp[ARM_MAX_REGISTER_RAW_SIZE];
       read_register_gen (regno, tmp);
       if (regno < 15)
        rdp_store_one_register (1 << regno, tmp);
-      else if (regno == PC_REGNUM)
+      else if (regno == ARM_PC_REGNUM)
        rdp_store_one_register (RDP_CPU_READWRITE_MASK_PC, tmp);
-      else if (regno == PS_REGNUM)
+      else if (regno == ARM_PS_REGNUM)
        rdp_store_one_register (RDP_CPU_READWRITE_MASK_CPSR, tmp);
-      else if (regno >= F0_REGNUM && regno <= F7_REGNUM)
-       rdp_store_one_fpu_register (1 << (regno - F0_REGNUM), tmp);
+      else if (regno >= ARM_F0_REGNUM && regno <= ARM_F7_REGNUM)
+       rdp_store_one_fpu_register (1 << (regno - ARM_F0_REGNUM), tmp);
       else
        {
          printf ("Help me with reg %d\n", regno);
@@ -1092,7 +1094,7 @@ rdp_step (void)
   else
     {
       char handle[4];
-      CORE_ADDR pc = read_register (PC_REGNUM);
+      CORE_ADDR pc = read_register (ARM_PC_REGNUM);
       pc = arm_get_next_pc (pc);
       remote_rdp_insert_breakpoint (pc, handle);
       rdp_execute ();
@@ -1162,7 +1164,7 @@ remote_rdp_open (char *args, int from_tty)
   registers_changed ();
   stop_pc = read_pc ();
   set_current_frame (create_new_frame (read_fp (), stop_pc));
-  select_frame (get_current_frame (), 0);
+  select_frame (get_current_frame ());
   print_stack_frame (selected_frame, -1, 1);
 }
 
@@ -1361,13 +1363,6 @@ remote_rdp_create_inferior (char *exec_file, char *allargs, char **env)
   proceed (entry_point, TARGET_SIGNAL_DEFAULT, 0);
 }
 
-/* Accept any stray run/attach commands */
-static int
-remote_rdp_can_run (void)
-{
-  return 1;
-}
-
 /* Attach doesn't need to do anything */
 static void
 remote_rdp_attach (char *args, int from_tty)
@@ -1429,7 +1424,7 @@ init_remote_rdp_ops (void)
   remote_rdp_ops.to_reported_exec_events_per_exec_call = NULL;
   remote_rdp_ops.to_has_exited = NULL;
   remote_rdp_ops.to_mourn_inferior = generic_mourn_inferior;
-  remote_rdp_ops.to_can_run = remote_rdp_can_run;
+  remote_rdp_ops.to_can_run = NULL;
   remote_rdp_ops.to_notice_signals = 0;
   remote_rdp_ops.to_thread_alive = 0;
   remote_rdp_ops.to_stop = 0;