diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index e5442b74b4..60f3854930 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2004-06-08  Alexandre Oliva  <aoliva@redhat.com>
+
+	* mn10300-tdep.c (mn10300_analyze_prologue): Don't compute saved
+	regs if PC is on movm.
+
 2004-06-07  Jim Blandy  <jimb@redhat.com>
 
 	Add native Linux support for the PowerPC E500.
diff --git a/gdb/mn10300-tdep.c b/gdb/mn10300-tdep.c
index a065e184f4..1ecf8cb80a 100644
--- a/gdb/mn10300-tdep.c
+++ b/gdb/mn10300-tdep.c
@@ -457,8 +457,8 @@ mn10300_analyze_prologue (struct frame_info *fi, CORE_ADDR pc)
   addr = func_addr;
 
   /* Suck in two bytes.  */
-  status = read_memory_nobpt (addr, buf, 2);
-  if (status != 0)
+  if (addr + 2 >= stop
+      || (status = read_memory_nobpt (addr, buf, 2)) != 0)
     {
       fix_frame_pointer (fi, 0);
       return addr;