1999-01-19 Fernando Nasser <fnasser@totem.to.cygnus.com>

[deliverable/binutils-gdb.git] / gdb / mipsm3-nat.c

diff --git a/gdb/mipsm3-nat.c b/gdb/mipsm3-nat.c
index fed0573d8e65ee29afb74b140d774795c37ee302..089ecd6556c98f8b4b7af81b522b57f20393f6aa 100644 (file)
--- a/gdb/mipsm3-nat.c
+++ b/gdb/mipsm3-nat.c
@@ -15,7 +15,7 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 /* Mach specific routines for little endian mips (e.g. pmax)
  * running Mach 3.0
@@ -120,15 +120,15 @@ static int reg_offset[] =
  * Caller knows that the regs handled in one transaction are of same size.
  */
 #define FETCH_REGS(state, regnum, count) \
-  bcopy ((char *)state+reg_offset[ regnum ], \
-        &registers[REGISTER_BYTE (regnum)], \
-        count*sizeof (REGISTER_TYPE))
+  memcpy (&registers[REGISTER_BYTE (regnum)], \
+         (char *)state+reg_offset[ regnum ], \
+         count*REGISTER_SIZE)
 
 /* Store COUNT contiguous registers to thread STATE starting from REGNUM */
 #define STORE_REGS(state, regnum, count) \
-  bcopy (&registers[REGISTER_BYTE (regnum)], \
-        (char *)state+reg_offset[ regnum ], \
-        count*sizeof (REGISTER_TYPE))
+  memcpy ((char *)state+reg_offset[ regnum ], \
+         &registers[REGISTER_BYTE (regnum)], \
+         count*REGISTER_SIZE)
 
 #define REGS_ALL    -1
 #define REGS_NORMAL  1
@@ -314,7 +314,7 @@ store_inferior_registers (regno)
       regno == FCRIR_REGNUM)
     {
       message ("You can not alter read-only register `%s'",
-              reg_names[ regno ]);
+              REGISTER_NAME ( regno ));
       fetch_inferior_registers (regno);
       return;
     }
@@ -342,9 +342,9 @@ store_inferior_registers (regno)
        *     should go to threads frame pointer. If not true, this
        *     fails badly!!!!!
        */
-      bcopy (&registers[REGISTER_BYTE (FP_REGNUM)],
-            &registers[REGISTER_BYTE (MACH_FP_REGNUM)],
-            REGISTER_RAW_SIZE (FP_REGNUM));
+      memcpy (&registers[REGISTER_BYTE (MACH_FP_REGNUM)],
+             &registers[REGISTER_BYTE (FP_REGNUM)],
+             REGISTER_RAW_SIZE (FP_REGNUM));
 #endif
       
       /* Save gdb's regs 1..31 to thread saved regs 1..31