2002-11-15 David Carlton <carlton@math.stanford.edu>

	* Merge from mainline; tag is carlton_dictionary-20021115-merge.

1 files changed, 11 insertions, 10 deletions

diff --git a/gdb/m68k-tdep.c b/gdb/m68k-tdep.c
index 31e8e660dc8..d27d177d2df 100644
--- a/gdb/m68k-tdep.c
+++ b/gdb/m68k-tdep.c
@@ -252,7 +252,7 @@ m68k_deprecated_extract_struct_value_address (char *regbuf)
 static void
 m68k_store_return_value (struct type *type, char *valbuf)
 {
-  write_register_bytes (0, valbuf, TYPE_LENGTH (type));
+  deprecated_write_register_bytes (0, valbuf, TYPE_LENGTH (type));
 }
 
 /* Describe the pointer in each stack frame to the previous stack frame
@@ -463,7 +463,7 @@ m68k_push_dummy_frame (void)
      this target or not.  */
   for (regnum = FP0_REGNUM + 7; regnum >= FP0_REGNUM; regnum--)
     {
-      read_register_bytes (REGISTER_BYTE (regnum), raw_buffer, 12);
+      deprecated_read_register_bytes (REGISTER_BYTE (regnum), raw_buffer, 12);
       sp = push_bytes (sp, raw_buffer, 12);
     }
 
@@ -493,7 +493,8 @@ m68k_pop_frame (void)
       if (frame->saved_regs[regnum])
 	{
 	  read_memory (frame->saved_regs[regnum], raw_buffer, 12);
-	  write_register_bytes (REGISTER_BYTE (regnum), raw_buffer, 12);
+	  deprecated_write_register_bytes (REGISTER_BYTE (regnum), raw_buffer,
+					   12);
 	}
     }
   for (regnum = FP_REGNUM - 1; regnum >= 0; regnum--)
@@ -836,16 +837,16 @@ fill_gregset (gregset_t *gregsetp, int regno)
     {
       if ((regno == -1) || (regno == regi))
 	{
-	  *(regp + regi) = *(int *) &registers[REGISTER_BYTE (regi)];
+	  *(regp + regi) = *(int *) &deprecated_registers[REGISTER_BYTE (regi)];
 	}
     }
   if ((regno == -1) || (regno == PS_REGNUM))
     {
-      *(regp + R_PS) = *(int *) &registers[REGISTER_BYTE (PS_REGNUM)];
+      *(regp + R_PS) = *(int *) &deprecated_registers[REGISTER_BYTE (PS_REGNUM)];
     }
   if ((regno == -1) || (regno == PC_REGNUM))
     {
-      *(regp + R_PC) = *(int *) &registers[REGISTER_BYTE (PC_REGNUM)];
+      *(regp + R_PC) = *(int *) &deprecated_registers[REGISTER_BYTE (PC_REGNUM)];
     }
 }
 
@@ -887,22 +888,22 @@ fill_fpregset (fpregset_t *fpregsetp, int regno)
     {
       if ((regno == -1) || (regno == regi))
 	{
-	  from = (char *) &registers[REGISTER_BYTE (regi)];
+	  from = (char *) &deprecated_registers[REGISTER_BYTE (regi)];
 	  to = (char *) &(fpregsetp->f_fpregs[regi - FP0_REGNUM][0]);
 	  memcpy (to, from, REGISTER_RAW_SIZE (regi));
 	}
     }
   if ((regno == -1) || (regno == E_FPC_REGNUM))
     {
-      fpregsetp->f_pcr = *(int *) &registers[REGISTER_BYTE (E_FPC_REGNUM)];
+      fpregsetp->f_pcr = *(int *) &deprecated_registers[REGISTER_BYTE (E_FPC_REGNUM)];
     }
   if ((regno == -1) || (regno == E_FPS_REGNUM))
     {
-      fpregsetp->f_psr = *(int *) &registers[REGISTER_BYTE (E_FPS_REGNUM)];
+      fpregsetp->f_psr = *(int *) &deprecated_registers[REGISTER_BYTE (E_FPS_REGNUM)];
     }
   if ((regno == -1) || (regno == E_FPI_REGNUM))
     {
-      fpregsetp->f_fpiaddr = *(int *) &registers[REGISTER_BYTE (E_FPI_REGNUM)];
+      fpregsetp->f_fpiaddr = *(int *) &deprecated_registers[REGISTER_BYTE (E_FPI_REGNUM)];
     }
 }