* config/h8300/tm-h8300.h (FRAME_ARGS_ADDRESS): Changed to use

h8300_frame_args_address from frame_args_address.
(FRAME_LOCALS_ADDRESS): Changed to use h8300_frame_locals_address
from frame_locals_address.
(PRINT_REGISTER_HOOK): Changed to use h8300_print_register_hook
from print_register_hook.
(h8300_frame_args_address): Declare.
(h8300_frame_find_saved_regs): Declare.
(h8300_frame_locals_address): Declare.
(h8300_frame_saved_pc): Declare.
(h8300_pop_frame): Declare.
(h8300_print_register_hook): Declare.
* h8300-tdep.c (h8300_frame_find_saved_regs): Removed declaration.
(h8300_frame_args_address): Renamed from frame_args_address.
(h8300_frame_locals_address): Renamed from frame_locals_address.
(h8300_pop_frame): Renamed from pop_frame.
(h8300_print_register_hook): Renamed from print_register_hook.
-------------------------------------------------------------------

3 files changed, 34 insertions, 9 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 07191a5..ce8f513 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,23 @@
+2001-03-16  J.T. Conklin  <jtc@redback.com>
+
+	* config/h8300/tm-h8300.h (FRAME_ARGS_ADDRESS): Changed to use
+	h8300_frame_args_address from frame_args_address.
+	(FRAME_LOCALS_ADDRESS): Changed to use h8300_frame_locals_address
+	from frame_locals_address.
+	(PRINT_REGISTER_HOOK): Changed to use h8300_print_register_hook
+	from print_register_hook.
+	(h8300_frame_args_address): Declare.
+	(h8300_frame_find_saved_regs): Declare.
+	(h8300_frame_locals_address): Declare.
+	(h8300_frame_saved_pc): Declare.
+	(h8300_pop_frame): Declare.
+	(h8300_print_register_hook): Declare.
+	* h8300-tdep.c (h8300_frame_find_saved_regs): Removed declaration.
+	(h8300_frame_args_address): Renamed from frame_args_address.
+	(h8300_frame_locals_address): Renamed from frame_locals_address.
+	(h8300_pop_frame): Renamed from pop_frame.
+	(h8300_print_register_hook): Renamed from print_register_hook.
+
 2001-03-16  Kevin Buettner  <kevinb@redhat.com>
 
 	* solib-svr4.c (bfd_lookup_symbol):  Change type of
diff --git a/gdb/config/h8300/tm-h8300.h b/gdb/config/h8300/tm-h8300.h
index 21127eb..1f76ccb 100644
--- a/gdb/config/h8300/tm-h8300.h
+++ b/gdb/config/h8300/tm-h8300.h
@@ -235,10 +235,13 @@ CORE_ADDR h8300_frame_chain (struct frame_info *);
  */
 
 #define FRAME_SAVED_PC(FRAME) h8300_frame_saved_pc(FRAME)
+extern CORE_ADDR h8300_frame_saved_pc (struct frame_info *);
 
-#define FRAME_ARGS_ADDRESS(fi) frame_args_address(fi)
+#define FRAME_ARGS_ADDRESS(fi) h8300_frame_args_address(fi)
+extern CORE_ADDR h8300_frame_args_address (struct frame_info *);
 
-#define FRAME_LOCALS_ADDRESS(fi) frame_locals_address(fi);
+#define FRAME_LOCALS_ADDRESS(fi) h8300_frame_locals_address(fi)
+extern CORE_ADDR h8300_frame_locals_address (struct frame_info *);
 
 /* Set VAL to the number of args passed to frame described by FI.
    Can set VAL to -1, meaning no way to tell.  */
@@ -260,12 +263,15 @@ CORE_ADDR h8300_frame_chain (struct frame_info *);
 
 #define FRAME_FIND_SAVED_REGS(frame_info, frame_saved_regs)	    \
    h8300_frame_find_saved_regs(frame_info, &(frame_saved_regs))
+extern void h8300_frame_find_saved_regs (struct frame_info *,
+					 struct frame_saved_regs *);
 
 
 typedef unsigned short INSN_WORD;
 
 
-#define	PRINT_REGISTER_HOOK(regno) print_register_hook(regno)
+#define	PRINT_REGISTER_HOOK(regno) h8300_print_register_hook(regno)
+extern void h8300_print_register_hook (int);
 
 #define GDB_TARGET_IS_H8300
 
@@ -292,6 +298,7 @@ extern CORE_ADDR h8300_push_arguments (int nargs,
 				       unsigned char struct_return,
 				       CORE_ADDR struct_addr);
 extern CORE_ADDR h8300_push_return_address (CORE_ADDR, CORE_ADDR);
+extern void h8300_pop_frame (void);
 
 #define PC_IN_CALL_DUMMY(PC, SP, FP)	generic_pc_in_call_dummy (PC, SP, FP)
 #define FIX_CALL_DUMMY(DUMMY, START_SP, FUNADDR, NARGS, ARGS, TYPE, GCCP)
diff --git a/gdb/h8300-tdep.c b/gdb/h8300-tdep.c
index 8815b2c..e335fdb 100644
--- a/gdb/h8300-tdep.c
+++ b/gdb/h8300-tdep.c
@@ -71,8 +71,6 @@ char **h8300_register_names = original_register_names;
 static CORE_ADDR examine_prologue ();
 static void set_machine_hook (char *filename);
 
-void h8300_frame_find_saved_regs ();
-
 CORE_ADDR
 h8300_skip_prologue (CORE_ADDR start_pc)
 {
@@ -434,7 +432,7 @@ h8300_frame_saved_pc (struct frame_info *frame)
 }
 
 CORE_ADDR
-frame_locals_address (struct frame_info *fi)
+h8300_frame_locals_address (struct frame_info *fi)
 {
   if (PC_IN_CALL_DUMMY (fi->pc, fi->frame, fi->frame))
     return (CORE_ADDR) 0;	/* Not sure what else to do... */
@@ -452,7 +450,7 @@ frame_locals_address (struct frame_info *fi)
    described by FI.  Returns 0 if the address is unknown.  */
 
 CORE_ADDR
-frame_args_address (struct frame_info *fi)
+h8300_frame_args_address (struct frame_info *fi)
 {
   if (PC_IN_CALL_DUMMY (fi->pc, fi->frame, fi->frame))
     return (CORE_ADDR) 0;	/* Not sure what else to do... */
@@ -611,7 +609,7 @@ h8300_push_return_address (CORE_ADDR pc, CORE_ADDR sp)
   return sp;
 }
 
-/* Function: pop_frame
+/* Function: h8300_pop_frame
    Restore the machine to the state it had before the current frame 
    was created.  Usually used either by the "RETURN" command, or by
    call_function_by_hand after the dummy_frame is finished. */
@@ -828,7 +826,7 @@ _initialize_h8300m (void)
 
 
 void
-print_register_hook (int regno)
+h8300_print_register_hook (int regno)
 {
   if (regno == 8)
     {