* config/m68k/monitor.mt (TDEPFILE): Add remote-es.o.

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

diff --git a/gdb/m88k-nat.c b/gdb/m88k-nat.c
index 619d8652883eb1f3594e94ed6dab7f5b2c9b2c65..b16c52313de4977a885fa225f0df55c4716910bf 100644 (file)
--- a/gdb/m88k-nat.c
+++ b/gdb/m88k-nat.c
@@ -211,14 +211,21 @@ m88k_register_u_addr (blockend, regnum)
     case 28:
     case 29:
     case 30:
-    case 31:          return (ustart + ((int) &u.pt_r0 - (int) &u) + sizeof(REGISTER_TYPE) * regnum);
+    case 31:
+      return (ustart + ((int) &u.pt_r0 - (int) &u) + REGISTER_SIZE * regnum);
     case PSR_REGNUM:  return (ustart + ((int) &u.pt_psr - (int) &u));
     case FPSR_REGNUM: return (ustart + ((int) &u.pt_fpsr - (int) &u));
     case FPCR_REGNUM: return (ustart + ((int) &u.pt_fpcr - (int) &u));
     case SXIP_REGNUM: return (ustart + SXIP_OFFSET); 
     case SNIP_REGNUM: return (ustart + SNIP_OFFSET);
     case SFIP_REGNUM: return (ustart + SFIP_OFFSET); 
-    default: return (blockend + sizeof (REGISTER_TYPE) * regnum);
+    default: 
+       if (regnum < NUM_REGS)
+           /* The register is one of those which is not defined...
+              give it zero */
+           return (ustart + ((int) &u.pt_r0 - (int) &u));
+       else
+           return (blockend + REGISTER_SIZE * regnum);
     }
 }