* sparc-tdep.c (sparc32_frame_cache): Use

frame_unwind_address_in_block to obtain the current PC for use in
call to sparc32_analyze_prologue.
* sparc64-tdep.c (sparc64_frame_cache): Likewise.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 6b97f5dc26f8ea28473881a30d23e671aae24644..9f93c8546a6857a719fa880589ad26ee83618dfc 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,10 @@
 2003-12-15  Mark Kettenis  <kettenis@gnu.org>
 
+       * sparc-tdep.c (sparc32_frame_cache): Use
+       frame_unwind_address_in_block to obtain the current PC for use in
+       call to sparc32_analyze_prologue.
+       * sparc64-tdep.c (sparc64_frame_cache): Likewise.
+
        * sparc-sol2-nat.c: Add 64-bit support.
        (supply_gregset): Call sparc_supply_gregset
        instead of sparc32_supply_gregset.

diff --git a/gdb/sparc-tdep.c b/gdb/sparc-tdep.c
index dd8d1f85e10e43036f51b98c37cd3b822b475e9b..adbc8ef8528d94d7168d0ce7837cd5e989f998c9 100644 (file)
--- a/gdb/sparc-tdep.c
+++ b/gdb/sparc-tdep.c
@@ -567,7 +567,10 @@ sparc32_frame_cache (struct frame_info *next_frame, void **this_cache)
 
   cache->pc = frame_func_unwind (next_frame);
   if (cache->pc != 0)
-    sparc32_analyze_prologue (cache->pc, frame_pc_unwind (next_frame), cache);
+    {
+      CORE_ADDR addr_in_block = frame_unwind_address_in_block (next_frame);
+      sparc32_analyze_prologue (cache->pc, addr_in_block, cache);
+    }
 
   if (cache->frameless_p)
     {

diff --git a/gdb/sparc64-tdep.c b/gdb/sparc64-tdep.c
index 6054f0c80c72a0151c6825867fa0eef054b1d758..483a63a827ee32316960ae76d857ae2826f38fc6 100644 (file)
--- a/gdb/sparc64-tdep.c
+++ b/gdb/sparc64-tdep.c
@@ -627,7 +627,10 @@ sparc64_frame_cache (struct frame_info *next_frame, void **this_cache)
 
   cache->pc = frame_func_unwind (next_frame);
   if (cache->pc != 0)
-    sparc64_analyze_prologue (cache->pc, frame_pc_unwind (next_frame), cache);
+    {
+      CORE_ADDR addr_in_block = frame_unwind_address_in_block (next_frame);
+      sparc64_analyze_prologue (cache->pc, addr_in_block, cache);
+    }
 
   if (cache->frameless_p)
     {