use remote-utils facilities for baud_rate

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

diff --git a/gdb/irix4-nat.c b/gdb/irix4-nat.c
index b13e288b8181203e00c50dbb9773be464137c160..e2a1ff29e61636ad653a245e7ea1b35dedc3de25 100644 (file)
--- a/gdb/irix4-nat.c
+++ b/gdb/irix4-nat.c
@@ -117,8 +117,8 @@ fill_fpregset (fpregsetp, regno)
       if ((regno == -1) || (regno == regi))
        {
          from = (char *) &registers[REGISTER_BYTE (regi)];
-         to = (char *) &(fpregsetp->fp_r.fp_regs[regi]);
-         bcopy(from, to, REGISTER_RAW_SIZE (regi));
+         to = (char *) &(fpregsetp->fp_r.fp_regs[regi - FP0_REGNUM]);
+         memcpy(to, from, REGISTER_RAW_SIZE (regi));
        }
     }
 
@@ -133,18 +133,19 @@ fill_fpregset (fpregsetp, regno)
    This routine returns true on success. */
 
 int
-get_longjmp_target(pc)
+get_longjmp_target (pc)
      CORE_ADDR *pc;
 {
+  char buf[TARGET_PTR_BIT / TARGET_CHAR_BIT];
   CORE_ADDR jb_addr;
 
-  jb_addr = read_register(A0_REGNUM);
+  jb_addr = read_register (A0_REGNUM);
 
-  if (target_read_memory(jb_addr + JB_PC * JB_ELEMENT_SIZE, pc,
-                        sizeof(CORE_ADDR)))
+  if (target_read_memory (jb_addr + JB_PC * JB_ELEMENT_SIZE, buf,
+                         TARGET_PTR_BIT / TARGET_CHAR_BIT))
     return 0;
 
-  SWAP_TARGET_AND_HOST(pc, sizeof(CORE_ADDR));
+  *pc = extract_address (buf, TARGET_PTR_BIT / TARGET_CHAR_BIT);
 
   return 1;
 }