diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index cf44111087..6a0b82238f 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+Mon Aug 21 11:49:17 1995  Kung Hsu  <kung@mexican.cygnus.com>
+
+	* remote-udi.c (udi_wait): Mask off high bits of stop reason.
+	* remote-udi.c (fetch_register): For unfetchable regs, pretend it's
+	done. Fix a bug.
+
 Mon Aug 21 00:45:17 1995  Jeff Law  (law@snake.cs.utah.edu)
 
 	* Makefile.in (install): Remove "brokensed" hack, unnecessary now
diff --git a/gdb/remote-udi.c b/gdb/remote-udi.c
index 914d220483..6ade3e4804 100644
--- a/gdb/remote-udi.c
+++ b/gdb/remote-udi.c
@@ -494,7 +494,7 @@ udi_wait (pid, status)
     case UDITrapped:
       printf_unfiltered("Am290*0 received vector number %d\n", StopReason >> 24);
 	  
-      switch (StopReason >> 8)
+      switch ((StopReason >> 8 ) & 0xff)
 	{
 	case 0:			/* Illegal opcode */
 	  printf_unfiltered("	(break point)\n");
@@ -1434,7 +1434,8 @@ fetch_register (regno)
   else if (regno>=FPE_REGNUM && regno<=EXO_REGNUM)  
     {
       int val = -1;
-      supply_register(160 + (regno - FPE_REGNUM),(char *) &val);
+      /*supply_register(160 + (regno - FPE_REGNUM),(char *) &val);*/
+      supply_register(regno, (char *) &val);
       return;		/* Pretend Success */
     }
   else