* gdb/config/m88k/delta88.mh (NATDEPFILES): Added corelow.o and

	coredep.o to this list.
	* gdb/m88k-nat.c (m88k_register_u_addr):  Avoid error when passed
	the number for an M88110 extended register by just returning the
	address of r0.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 24dd9a395339389bfaec4494e737e56a01454765..82a6303b0ea9af39c403bd141541cc57dfcdbaac 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,12 @@
+Mon Nov 22 11:03:45 1993  Fred Fish  (fnf@cygnus.com)
+
+       Merged changes from kev@spuds.geg.mot.com (Kevin A. Buettner):
+       * gdb/config/m88k/delta88.mh (NATDEPFILES): Added corelow.o and
+       coredep.o to this list.
+       * gdb/m88k-nat.c (m88k_register_u_addr):  Avoid error when passed
+       the number for an M88110 extended register by just returning the
+       address of r0.
+
 Sat Nov 20 09:20:51 1993  Fred Fish  (fnf@rtl.cygnus.com)
 
        * go32-xdep.c (re_comp, re_exec):  Remove stubs now that gdb

diff --git a/gdb/config/m88k/delta88.mh b/gdb/config/m88k/delta88.mh
index 80716073b78db71cb9ed028d0c4e3de971033fb8..f9b5ab9d731e8fd249bb6d0bad48dd0f912d320b 100644 (file)
--- a/gdb/config/m88k/delta88.mh
+++ b/gdb/config/m88k/delta88.mh
@@ -2,7 +2,8 @@
 XDEPFILES= 
 XM_FILE= xm-delta88.h
 NAT_FILE= nm-m88k.h
-NATDEPFILES= exec.o infptrace.o inftarg.o fork-child.o m88k-nat.o
+NATDEPFILES= exec.o infptrace.o inftarg.o fork-child.o m88k-nat.o \
+       corelow.o coredep.o
 REGEX=regex.o
 REGEX1=regex.o
 # Have to use /bin/nm because a bfd nm won't do the right thing

diff --git a/gdb/m88k-nat.c b/gdb/m88k-nat.c
index 619d8652883eb1f3594e94ed6dab7f5b2c9b2c65..b574651ef49a7335698dd67bee77dccbb3102e1d 100644 (file)
--- a/gdb/m88k-nat.c
+++ b/gdb/m88k-nat.c
@@ -218,7 +218,13 @@ m88k_register_u_addr (blockend, regnum)
     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 + sizeof (REGISTER_TYPE) * regnum);
     }
 }