Fix prologue analysis for moxie.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 5128dc6e8794d8011c22dc658e907ab0eedcb620..882330bd3bf241065667e2d227b80e23fa42ee19 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2009-07-18  Anthony Green  <green@moxielogic.com>
+
+       * moxie-tdep.c (moxie_analyze_prologue): Take gdbarch as last
+       parameter instead of frame_info.
+       (moxie_frame_cache): Call moxie_analyze_prologue with different
+       args.
+
 2009-07-17  Ulrich Weigand  <uweigand@de.ibm.com>
 
        * solib.c (solib_bfd_open): Do not call ops->bfd_open.

diff --git a/gdb/moxie-tdep.c b/gdb/moxie-tdep.c
index 3ce9b406ee2df35cc267964f76c8b4374704cdea..7faa378b5a7ee2ceb04e3e58f74aace963d839b7 100644 (file)
--- a/gdb/moxie-tdep.c
+++ b/gdb/moxie-tdep.c
@@ -145,10 +145,9 @@ moxie_store_return_value (struct type *type, struct regcache *regcache,
 
 static CORE_ADDR
 moxie_analyze_prologue (CORE_ADDR start_addr, CORE_ADDR end_addr,
-                     struct moxie_frame_cache *cache,
-                     struct frame_info *this_frame)
+                       struct moxie_frame_cache *cache,
+                       struct gdbarch *gdbarch)
 {
-  struct gdbarch *gdbarch = get_frame_arch (this_frame);
   enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
   CORE_ADDR next_addr;
   ULONGEST inst, inst2;
@@ -226,7 +225,7 @@ moxie_skip_prologue (struct gdbarch *gdbarch, CORE_ADDR pc)
          memset (&cache, 0, sizeof cache);
          
          plg_end = moxie_analyze_prologue (func_addr, 
-                                           func_end, &cache, NULL);
+                                           func_end, &cache, gdbarch);
          /* Found a function.  */
          sym = lookup_symbol (func_name, NULL, VAR_DOMAIN, NULL);
          /* Don't use line number debug info for assembly source
@@ -384,7 +383,10 @@ moxie_frame_cache (struct frame_info *this_frame, void **this_cache)
   cache->pc = get_frame_func (this_frame);
   current_pc = get_frame_pc (this_frame);
   if (cache->pc)
-    moxie_analyze_prologue (cache->pc, current_pc, cache, this_frame);
+    {
+      struct gdbarch *gdbarch = get_frame_arch (this_frame);
+      moxie_analyze_prologue (cache->pc, current_pc, cache, gdbarch);
+    }
 
   cache->saved_sp = cache->base - cache->framesize;