From 1ccda5e956ca3c3ba607fc33b11ec91030d46446 Mon Sep 17 00:00:00 2001 From: Kevin Buettner Date: Mon, 15 Mar 2004 18:49:02 +0000 Subject: [PATCH] * frv-tdep.c (frv_analyze_prologue): Terminate prologue scan, but not via a call to error(), when unable to read memory. --- gdb/ChangeLog | 5 +++++ gdb/frv-tdep.c | 8 +++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 3edbf902b99..4561d2fcd65 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2004-03-15 Kevin Buettner + + * 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 * frv-tdep.c (frv_call_dummy_words): Delete. diff --git a/gdb/frv-tdep.c b/gdb/frv-tdep.c index 5cb038fb3ea..ffd911e0997 100644 --- 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