2002-04-29 Elena Zannoni <ezannoni@redhat.com>

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

diff --git a/gdb/remote-rdp.c b/gdb/remote-rdp.c
index 22f5b3e4fd4cd06f88300110483cc2ff4a2875ac..2f9183a9bc7fbd03670afdb9cc071e429e293877 100644 (file)
--- a/gdb/remote-rdp.c
+++ b/gdb/remote-rdp.c
@@ -1,6 +1,7 @@
 /* Remote debugging for the ARM RDP interface.
-   Copyright 1994, 1995, 1998, 1999, 2000, 2001
-   Free Software Foundation, Inc.
+
+   Copyright 1994, 1995, 1998, 1999, 2000, 2001, 2002 Free Software
+   Foundation, Inc.
 
    This file is part of GDB.
 
@@ -51,6 +52,8 @@
 #include "regcache.h"
 #include "serial.h"
 
+#include "arm-tdep.h"
+
 #ifdef HAVE_TIME_H
 #include <time.h>
 #endif
@@ -349,11 +352,11 @@ rdp_init (int cold, int tty)
                  case SERIAL_TIMEOUT:
                    break;
                  case RDP_RES_VALUE_LITTLE_ENDIAN:
-                   target_byte_order = LITTLE_ENDIAN;
+                   target_byte_order = BFD_ENDIAN_LITTLE;
                    sync = 1;
                    break;
                  case RDP_RES_VALUE_BIG_ENDIAN:
-                   target_byte_order = BIG_ENDIAN;
+                   target_byte_order = BFD_ENDIAN_BIG;
                    sync = 1;
                    break;
                  default:
@@ -612,14 +615,14 @@ remote_rdp_fetch_register (int regno)
       char buf[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);
@@ -643,12 +646,12 @@ remote_rdp_store_register (int regno)
       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);
@@ -1091,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 ();
@@ -1246,9 +1249,8 @@ remote_rdp_prepare_to_store (void)
 
 static int
 remote_rdp_xfer_inferior_memory (CORE_ADDR memaddr, char *myaddr, int len,
-                                int write, 
-                                struct mem_attrib *attrib ATTRIBUTE_UNUSED,
-                                struct target_ops *target ATTRIBUTE_UNUSED)
+                                int write, struct mem_attrib *attrib,
+                                struct target_ops *target)
 {
   /* I infer from D Taylor's code that there's a limit on the amount
      we can transfer in one chunk.. */