* frv-tdep.c (frv_analyze_prologue): Terminate prologue scan,

	but not via a call to error(), when unable to read memory.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 3edbf902b99147a102b98b7bb7d387afd90253af..4561d2fcd65a6587be8fff2619f6dccab3135b32 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2004-03-15  Kevin Buettner  <kevinb@redhat.com>
+
+       * frv-tdep.c (frv_analyze_prologue): Terminate prologue scan,
+       but not via a call to error(), when unable to read memory.
+
 2004-03-15  Kevin Buettner  <kevinb@redhat.com>
 
        * frv-tdep.c (frv_call_dummy_words): Delete.

diff --git a/gdb/frv-tdep.c b/gdb/frv-tdep.c
index 5cb038fb3ea8bd5c3ab3bdc4da2a77f78ea1e4f9..ffd911e09971ac534bf101b71f9f5ad20759e032 100644 (file)
--- a/gdb/frv-tdep.c
+++ b/gdb/frv-tdep.c
@@ -511,7 +511,13 @@ frv_analyze_prologue (CORE_ADDR pc, struct frame_info *next_frame,
   /* Scan the prologue.  */
   while (pc < lim_pc)
     {
-      LONGEST op = read_memory_integer (pc, 4);
+      char buf[frv_instr_size];
+      LONGEST op;
+
+      if (target_read_memory (pc, buf, sizeof buf) != 0)
+       break;
+      op = extract_signed_integer (buf, sizeof buf);
+
       next_pc = pc + 4;
 
       /* The tests in this chain of ifs should be in order of