2002-09-18 Andrew Cagney <ac131313@redhat.com>

[deliverable/binutils-gdb.git] / gdb / arm-linux-nat.c

diff --git a/gdb/arm-linux-nat.c b/gdb/arm-linux-nat.c
index c8a1ddf7265cde289f00346191c59c96454b4dfc..8d7ee9de277b8c127413a8deb2ed1f623a843f87 100644 (file)
--- a/gdb/arm-linux-nat.c
+++ b/gdb/arm-linux-nat.c
@@ -63,9 +63,9 @@ typedef struct tagFPA11
 FPA11;
 
 /* The following variables are used to determine the version of the
-   underlying Linux operating system.  Examples:
+   underlying GNU/Linux operating system.  Examples:
 
-   Linux 2.0.35                 Linux 2.2.12
+   GNU/Linux 2.0.35             GNU/Linux 2.2.12
    os_version = 0x00020023      os_version = 0x0002020c
    os_major = 2                 os_major = 2
    os_minor = 0                 os_minor = 2
@@ -78,11 +78,11 @@ FPA11;
 
 static unsigned int os_version, os_major, os_minor, os_release;
 
-/* On Linux, threads are implemented as pseudo-processes, in which
+/* On GNU/Linux, threads are implemented as pseudo-processes, in which
    case we may be tracing more than one process at a time.  In that
    case, inferior_ptid will contain the main process ID and the
-   individual thread (process) ID.  get_thread_id () is used to
-   get the thread id if it's available, and the process id otherwise. */
+   individual thread (process) ID.  get_thread_id () is used to get
+   the thread id if it's available, and the process id otherwise.  */
 
 int
 get_thread_id (ptid_t ptid)
@@ -161,32 +161,32 @@ fetch_nwfpe_register (int regno, FPA11 * fpa11)
 }
 
 static void
-store_nwfpe_single (unsigned int fn, FPA11 * fpa11)
+store_nwfpe_single (unsigned int fn, FPA11 *fpa11)
 {
   unsigned int mem[3];
 
-  read_register_gen (ARM_F0_REGNUM + fn, (char *) &mem[0]);
+  regcache_collect (ARM_F0_REGNUM + fn, (char *) &mem[0]);
   fpa11->fpreg[fn].fSingle = mem[0];
   fpa11->fType[fn] = typeSingle;
 }
 
 static void
-store_nwfpe_double (unsigned int fn, FPA11 * fpa11)
+store_nwfpe_double (unsigned int fn, FPA11 *fpa11)
 {
   unsigned int mem[3];
 
-  read_register_gen (ARM_F0_REGNUM + fn, (char *) &mem[0]);
+  regcache_collect (ARM_F0_REGNUM + fn, (char *) &mem[0]);
   fpa11->fpreg[fn].fDouble[1] = mem[0];
   fpa11->fpreg[fn].fDouble[0] = mem[1];
   fpa11->fType[fn] = typeDouble;
 }
 
 void
-store_nwfpe_extended (unsigned int fn, FPA11 * fpa11)
+store_nwfpe_extended (unsigned int fn, FPA11 *fpa11)
 {
   unsigned int mem[3];
 
-  read_register_gen (ARM_F0_REGNUM + fn, (char *) &mem[0]);
+  regcache_collect (ARM_F0_REGNUM + fn, (char *) &mem[0]);
   fpa11->fpreg[fn].fExtended[0] = mem[0];      /* sign & exponent */
   fpa11->fpreg[fn].fExtended[2] = mem[1];      /* ls bits */
   fpa11->fpreg[fn].fExtended[1] = mem[2];      /* ms bits */
@@ -336,7 +336,7 @@ store_fpregister (int regno)
 
   /* Store fpsr.  */
   if (ARM_FPS_REGNUM == regno && register_cached (ARM_FPS_REGNUM))
-    read_register_gen (ARM_FPS_REGNUM, (char *) &fp.fpsr);
+    regcache_collect (ARM_FPS_REGNUM, (char *) &fp.fpsr);
 
   /* Store the floating point register.  */
   if (regno >= ARM_F0_REGNUM && regno <= ARM_F7_REGNUM)
@@ -374,7 +374,7 @@ store_fpregs (void)
 
   /* Store fpsr.  */
   if (register_cached (ARM_FPS_REGNUM))
-    read_register_gen (ARM_FPS_REGNUM, (char *) &fp.fpsr);
+    regcache_collect (ARM_FPS_REGNUM, (char *) &fp.fpsr);
 
   /* Store the floating point registers.  */
   for (regno = ARM_F0_REGNUM; regno <= ARM_F7_REGNUM; regno++)
@@ -482,7 +482,7 @@ store_register (int regno)
     }
 
   if (regno >= ARM_A1_REGNUM && regno <= ARM_PC_REGNUM)
-    read_register_gen (regno, (char *) &regs[regno]);
+    regcache_collect (regno, (char *) &regs[regno]);
 
   ret = ptrace (PTRACE_SETREGS, tid, 0, &regs);
   if (ret < 0)
@@ -512,7 +512,7 @@ store_regs (void)
   for (regno = ARM_A1_REGNUM; regno <= ARM_PC_REGNUM; regno++)
     {
       if (register_cached (regno))
-       read_register_gen (regno, (char *) &regs[regno]);
+       regcache_collect (regno, (char *) &regs[regno]);
     }
 
   ret = ptrace (PTRACE_SETREGS, tid, 0, &regs);
@@ -579,19 +579,19 @@ fill_gregset (gdb_gregset_t *gregsetp, int regno)
     {
       int regnum;
       for (regnum = ARM_A1_REGNUM; regnum <= ARM_PC_REGNUM; regnum++) 
-       read_register_gen (regnum, (char *) &(*gregsetp)[regnum]);
+       regcache_collect (regnum, (char *) &(*gregsetp)[regnum]);
     }
   else if (regno >= ARM_A1_REGNUM && regno <= ARM_PC_REGNUM)
-    read_register_gen (regno, (char *) &(*gregsetp)[regno]);
+    regcache_collect (regno, (char *) &(*gregsetp)[regno]);
 
   if (ARM_PS_REGNUM == regno || -1 == regno)
     {
       if (arm_apcs_32)
-       read_register_gen (ARM_PS_REGNUM,
-                          (char *) &(*gregsetp)[ARM_CPSR_REGNUM]);
+       regcache_collect (ARM_PS_REGNUM,
+                         (char *) &(*gregsetp)[ARM_CPSR_REGNUM]);
       else
-       read_register_gen (ARM_PC_REGNUM,
-                          (char *) &(*gregsetp)[ARM_PC_REGNUM]);
+       regcache_collect (ARM_PC_REGNUM,
+                         (char *) &(*gregsetp)[ARM_PC_REGNUM]);
     }
 }
 
@@ -638,7 +638,7 @@ fill_fpregset (gdb_fpregset_t *fpregsetp, int regno)
 
   /* Store fpsr.  */
   if (ARM_FPS_REGNUM == regno || -1 == regno)
-    read_register_gen (ARM_FPS_REGNUM, (char *) &fp->fpsr);
+    regcache_collect (ARM_FPS_REGNUM, (char *) &fp->fpsr);
 }
 
 /* Fill GDB's register array with the floating-point register values
@@ -676,7 +676,7 @@ get_linux_version (unsigned int *vmajor,
 
   if (-1 == uname (&info))
     {
-      warning ("Unable to determine Linux version.");
+      warning ("Unable to determine GNU/Linux version.");
       return -1;
     }