2007-10-30 Markus Deuling <deuling@de.ibm.com>

	* hppa-tdep.c (hppa_frame_cache): Use get_frame_arch to get at the
	current architecture by frame_info.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 14ead8bd7f8998e4116c9fd1f35dbcd0565a0e17..bbd0d08872680d97dcd600884629707c9c3efbd8 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2007-10-30  Markus Deuling  <deuling@de.ibm.com>
+
+       * hppa-tdep.c (hppa_frame_cache): Use get_frame_arch to get at the
+       current architecture by frame_info.
+
 2007-10-30  Markus Deuling  <deuling@de.ibm.com>
 
        * go32-nat.c (fetch_register, go32_fetch_registers, store_register)

diff --git a/gdb/hppa-tdep.c b/gdb/hppa-tdep.c
index 5c0da3463b3857498ba390ebae6dc5b4bf780887..a245198a3e27c2fea7b9540ac77be90650c4980c 100644 (file)
--- a/gdb/hppa-tdep.c
+++ b/gdb/hppa-tdep.c
@@ -1809,6 +1809,7 @@ struct hppa_frame_cache
 static struct hppa_frame_cache *
 hppa_frame_cache (struct frame_info *next_frame, void **this_cache)
 {
+  struct gdbarch *gdbarch = get_frame_arch (next_frame);
   struct hppa_frame_cache *cache;
   long saved_gr_mask;
   long saved_fr_mask;
@@ -2102,7 +2103,7 @@ hppa_frame_cache (struct frame_info *next_frame, void **this_cache)
               saved.  The entry SP value is saved at this frame's SP
               address.  */
             cache->base = read_memory_integer
-                           (this_sp, gdbarch_ptr_bit (current_gdbarch) / 8);
+                           (this_sp, gdbarch_ptr_bit (gdbarch) / 8);
 
            if (hppa_debug)
              fprintf_unfiltered (gdb_stdlog, " (base=0x%s) [saved]",
@@ -2181,7 +2182,7 @@ hppa_frame_cache (struct frame_info *next_frame, void **this_cache)
   {
     /* Convert all the offsets into addresses.  */
     int reg;
-    for (reg = 0; reg < gdbarch_num_regs (current_gdbarch); reg++)
+    for (reg = 0; reg < gdbarch_num_regs (gdbarch); reg++)
       {
        if (trad_frame_addr_p (cache->saved_regs, reg))
          cache->saved_regs[reg].addr += cache->base;
@@ -2189,10 +2190,8 @@ hppa_frame_cache (struct frame_info *next_frame, void **this_cache)
   }
 
   {
-    struct gdbarch *gdbarch;
     struct gdbarch_tdep *tdep;
 
-    gdbarch = get_frame_arch (next_frame);
     tdep = gdbarch_tdep (gdbarch);
 
     if (tdep->unwind_adjust_stub)