2002-11-24 Andrew Cagney <ac131313@redhat.com>

	* gdbarch.sh (FRAME_ARGS_ADDRESS, FRAME_LOCALS_ADDRESS): Change
	default to get_frame_base.
	* gdbarch.h, gdbarch.c: Regenerate.
	* arch-utils.c (default_frame_address): Delete function.
	* arch-utils.h (default_frame_address): Delete declaration

6 files changed, 14 insertions, 17 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 01715a8bc59..4ac461c4b37 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,11 @@
+2002-11-24  Andrew Cagney  <ac131313@redhat.com>
+
+	* gdbarch.sh (FRAME_ARGS_ADDRESS, FRAME_LOCALS_ADDRESS): Change
+	default to get_frame_base.
+	* gdbarch.h, gdbarch.c: Regenerate.
+	* arch-utils.c (default_frame_address): Delete function.
+	* arch-utils.h (default_frame_address): Delete declaration
+
 2002-11-24  Pierre Muller  <muller@ics.u-strasbg.fr>
 
 	* varobj.c (find_frame_addr_in_frame_chain):
diff --git a/gdb/arch-utils.c b/gdb/arch-utils.c
index 732c40bda6a..a805dbc6b93 100644
--- a/gdb/arch-utils.c
+++ b/gdb/arch-utils.c
@@ -313,13 +313,6 @@ no_op_reg_to_regnum (int reg)
   return reg;
 }
 
-/* For use by frame_args_address and frame_locals_address.  */
-CORE_ADDR
-default_frame_address (struct frame_info *fi)
-{
-  return fi->frame;
-}
-
 /* Default prepare_to_procced().  */
 int
 default_prepare_to_proceed (int select_it)
diff --git a/gdb/arch-utils.h b/gdb/arch-utils.h
index 91aa2f89f5c..54f0d4c8210 100644
--- a/gdb/arch-utils.h
+++ b/gdb/arch-utils.h
@@ -109,10 +109,6 @@ extern CORE_ADDR core_addr_identity (CORE_ADDR addr);
 
 extern int no_op_reg_to_regnum (int reg);
 
-/* Default frame_args_address and frame_locals_address.  */
-
-extern CORE_ADDR default_frame_address (struct frame_info *);
-
 /* Default prepare_to_procced. */
 
 extern int default_prepare_to_proceed (int select_it);
diff --git a/gdb/gdbarch.c b/gdb/gdbarch.c
index 5b256788a81..71cf79815d3 100644
--- a/gdb/gdbarch.c
+++ b/gdb/gdbarch.c
@@ -556,8 +556,8 @@ gdbarch_alloc (const struct gdbarch_info *info,
   current_gdbarch->frame_args_skip = -1;
   current_gdbarch->frameless_function_invocation = generic_frameless_function_invocation_not;
   current_gdbarch->frame_chain_valid = generic_func_frame_chain_valid;
-  current_gdbarch->frame_args_address = default_frame_address;
-  current_gdbarch->frame_locals_address = default_frame_address;
+  current_gdbarch->frame_args_address = get_frame_base;
+  current_gdbarch->frame_locals_address = get_frame_base;
   current_gdbarch->extra_stack_alignment_needed = 1;
   current_gdbarch->convert_from_func_ptr_addr = core_addr_identity;
   current_gdbarch->addr_bits_remove = core_addr_identity;
diff --git a/gdb/gdbarch.h b/gdb/gdbarch.h
index 436293ffedb..b1e8fe7b8c6 100644
--- a/gdb/gdbarch.h
+++ b/gdb/gdbarch.h
@@ -1952,7 +1952,7 @@ extern void set_gdbarch_frame_saved_pc (struct gdbarch *gdbarch, gdbarch_frame_s
 
 /* Default (function) for non- multi-arch platforms. */
 #if (!GDB_MULTI_ARCH) && !defined (FRAME_ARGS_ADDRESS)
-#define FRAME_ARGS_ADDRESS(fi) (default_frame_address (fi))
+#define FRAME_ARGS_ADDRESS(fi) (get_frame_base (fi))
 #endif
 
 typedef CORE_ADDR (gdbarch_frame_args_address_ftype) (struct frame_info *fi);
@@ -1969,7 +1969,7 @@ extern void set_gdbarch_frame_args_address (struct gdbarch *gdbarch, gdbarch_fra
 
 /* Default (function) for non- multi-arch platforms. */
 #if (!GDB_MULTI_ARCH) && !defined (FRAME_LOCALS_ADDRESS)
-#define FRAME_LOCALS_ADDRESS(fi) (default_frame_address (fi))
+#define FRAME_LOCALS_ADDRESS(fi) (get_frame_base (fi))
 #endif
 
 typedef CORE_ADDR (gdbarch_frame_locals_address_ftype) (struct frame_info *fi);
diff --git a/gdb/gdbarch.sh b/gdb/gdbarch.sh
index 95fdd91cc97..bb6d400270a 100755
--- a/gdb/gdbarch.sh
+++ b/gdb/gdbarch.sh
@@ -566,8 +566,8 @@ f:2:FRAME_CHAIN:CORE_ADDR:frame_chain:struct frame_info *frame:frame::0:0
 # functions.
 f:2:FRAME_CHAIN_VALID:int:frame_chain_valid:CORE_ADDR chain, struct frame_info *thisframe:chain, thisframe:::generic_func_frame_chain_valid::0
 f:2:FRAME_SAVED_PC:CORE_ADDR:frame_saved_pc:struct frame_info *fi:fi::0:0
-f:2:FRAME_ARGS_ADDRESS:CORE_ADDR:frame_args_address:struct frame_info *fi:fi::0:default_frame_address::0
-f:2:FRAME_LOCALS_ADDRESS:CORE_ADDR:frame_locals_address:struct frame_info *fi:fi::0:default_frame_address::0
+f:2:FRAME_ARGS_ADDRESS:CORE_ADDR:frame_args_address:struct frame_info *fi:fi::0:get_frame_base::0
+f:2:FRAME_LOCALS_ADDRESS:CORE_ADDR:frame_locals_address:struct frame_info *fi:fi::0:get_frame_base::0
 f:2:SAVED_PC_AFTER_CALL:CORE_ADDR:saved_pc_after_call:struct frame_info *frame:frame::0:0
 f:2:FRAME_NUM_ARGS:int:frame_num_args:struct frame_info *frame:frame::0:0
 #