X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fframe-base.c;h=a516c298c11af302ee9cbc5927613aefe04f28d7;hb=9f1b45b0da430a7a7abf9e54acbe6f2ef9d3a763;hp=ba2b3b948ffc531c5a763ff3d85f64977d519729;hpb=a9762ec78a53fbe9209fe1654db42df0cd328d50;p=deliverable%2Fbinutils-gdb.git

diff --git a/gdb/frame-base.c b/gdb/frame-base.c
index ba2b3b948f..a516c298c1 100644
--- a/gdb/frame-base.c
+++ b/gdb/frame-base.c
@@ -1,6 +1,6 @@
 /* Definitions for frame address handler, for GDB, the GNU debugger.
 
-   Copyright (C) 2003, 2004, 2007 Free Software Foundation, Inc.
+   Copyright (C) 2003-2014 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -28,22 +28,21 @@
    really need to override this.  */
 
 static CORE_ADDR
-default_frame_base_address (struct frame_info *next_frame, void **this_cache)
+default_frame_base_address (struct frame_info *this_frame, void **this_cache)
 {
-  struct frame_info *this_frame = get_prev_frame (next_frame);
   return get_frame_base (this_frame); /* sigh! */
 }
 
 static CORE_ADDR
-default_frame_locals_address (struct frame_info *next_frame, void **this_cache)
+default_frame_locals_address (struct frame_info *this_frame, void **this_cache)
 {
-  return default_frame_base_address (next_frame, this_cache);
+  return default_frame_base_address (this_frame, this_cache);
 }
 
 static CORE_ADDR
-default_frame_args_address (struct frame_info *next_frame, void **this_cache)
+default_frame_args_address (struct frame_info *this_frame, void **this_cache)
 {
-  return default_frame_base_address (next_frame, this_cache);
+  return default_frame_base_address (this_frame, this_cache);
 }
 
 const struct frame_base default_frame_base = {
@@ -73,6 +72,7 @@ frame_base_init (struct obstack *obstack)
 {
   struct frame_base_table *table
     = OBSTACK_ZALLOC (obstack, struct frame_base_table);
+
   table->tail = &table->head;
   table->default_base = &default_frame_base;
   return table;
@@ -83,7 +83,9 @@ frame_base_append_sniffer (struct gdbarch *gdbarch,
 			   frame_base_sniffer_ftype *sniffer)
 {
   struct frame_base_table *table = gdbarch_data (gdbarch, frame_base_data);
-  (*table->tail) = GDBARCH_OBSTACK_ZALLOC (gdbarch, struct frame_base_table_entry);
+
+  (*table->tail)
+    = GDBARCH_OBSTACK_ZALLOC (gdbarch, struct frame_base_table_entry);
   (*table->tail)->sniffer = sniffer;
   table->tail = &(*table->tail)->next;
 }
@@ -93,20 +95,22 @@ frame_base_set_default (struct gdbarch *gdbarch,
 			const struct frame_base *default_base)
 {
   struct frame_base_table *table = gdbarch_data (gdbarch, frame_base_data);
+
   table->default_base = default_base;
 }
 
 const struct frame_base *
-frame_base_find_by_frame (struct frame_info *next_frame)
+frame_base_find_by_frame (struct frame_info *this_frame)
 {
-  struct gdbarch *gdbarch = get_frame_arch (next_frame);
+  struct gdbarch *gdbarch = get_frame_arch (this_frame);
   struct frame_base_table *table = gdbarch_data (gdbarch, frame_base_data);
   struct frame_base_table_entry *entry;
 
   for (entry = table->head; entry != NULL; entry = entry->next)
     {
       const struct frame_base *desc = NULL;
-      desc = entry->sniffer (next_frame);
+
+      desc = entry->sniffer (this_frame);
       if (desc != NULL)
 	return desc;
     }