* gdb.texinfo (Continuing and Stepping): When talking about "step"

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

diff --git a/gdb/mips-nat.c b/gdb/mips-nat.c
index d7c28b5487415d12e3098a0f752f20cc382ea444..5e34f920a11c1c8f32e5105247366a11d5ae21d1 100644 (file)
--- a/gdb/mips-nat.c
+++ b/gdb/mips-nat.c
@@ -125,7 +125,7 @@ store_inferior_registers (regno)
              || regno == FCRIR_REGNUM || regno == FP_REGNUM
              || (regno >= FIRST_EMBED_REGNUM && regno <= LAST_EMBED_REGNUM))
            continue;
-         regaddr = register_addr (regno, 1);
+         regaddr = REGISTER_PTRACE_ADDR (regno);
          errno = 0;
          ptrace (6, inferior_pid, (PTRACE_ARG3_TYPE) regaddr,
                  read_register (regno));
@@ -149,14 +149,15 @@ get_longjmp_target(pc)
      CORE_ADDR *pc;
 {
   CORE_ADDR jb_addr;
+  char buf[TARGET_PTR_BIT / TARGET_CHAR_BIT];
 
-  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;
 }
@@ -193,7 +194,11 @@ fetch_core_registers (core_reg_sect, core_reg_size, which, reg_addr)
      core file without a upage, reg_ptr will be zero and this is all a big
      NOP.  */
   if (reg_ptr > core_reg_size)
+#ifdef KERNEL_U_ADDR
     reg_ptr -= KERNEL_U_ADDR;
+#else
+    error ("Old mips core file can't be processed on this machine.");
+#endif
 
   for (regno = 0; regno < NUM_REGS; regno++)
     {