* h8500-tdep.c (target_read_sp, target_write_sp, target_read_pc,

	target_write_pc, target_read_fp, target_write_fp): Rename to
	h8500_read_sp, etc.
	(h8500_read_pc, h8500_write_pc): Add pid argument.
	* config/h8500/tm-h8500.h (TARGET_READ_SP, TARGET_WRITE_SP,
	TARGET_READ_PC, TARGET_WRITE_PC, TARGET_READ_FP, TARGET_WRITE_FP):
	Change to match functions above.

3 files changed, 30 insertions, 20 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 3d3756b..95cedc8 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,13 @@
+Fri Oct 14 14:54:37 1994  Stan Shebs  (shebs@andros.cygnus.com)
+
+	* h8500-tdep.c (target_read_sp, target_write_sp, target_read_pc,
+	target_write_pc, target_read_fp, target_write_fp): Rename to
+	h8500_read_sp, etc.
+	(h8500_read_pc, h8500_write_pc): Add pid argument.
+	* config/h8500/tm-h8500.h (TARGET_READ_SP, TARGET_WRITE_SP,
+	TARGET_READ_PC, TARGET_WRITE_PC, TARGET_READ_FP, TARGET_WRITE_FP):
+	Change to match functions above.
+
 Thu Oct 13 13:24:29 1994  Jim Kingdon  (kingdon@lioth.cygnus.com)
 
 	* NEWS: Add item about if and while.
diff --git a/gdb/config/h8500/tm-h8500.h b/gdb/config/h8500/tm-h8500.h
index f169ad8..250bdef 100644
--- a/gdb/config/h8500/tm-h8500.h
+++ b/gdb/config/h8500/tm-h8500.h
@@ -289,25 +289,23 @@ struct value * h8500_value_of_trapped_internalvar (/* struct internalvar *var */
 void h8500_set_trapped_internalvar (/* struct internalvar *var, value newval, int bitpos, int bitsize, int offset */);
 #define SET_TRAPPED_INTERNALVAR h8500_set_trapped_internalvar
 
-
-
 int regoff[NUM_REGS];
 
-CORE_ADDR target_read_sp();
-void target_write_sp PARAMS ((CORE_ADDR ));
+CORE_ADDR h8500_read_sp PARAMS ((void));
+void h8500_write_sp PARAMS ((CORE_ADDR));
 
-CORE_ADDR target_read_fp();
-void target_write_fp PARAMS ((CORE_ADDR ));
+CORE_ADDR h8500_read_fp PARAMS ((void));
+void h8500_write_fp PARAMS ((CORE_ADDR));
 
-CORE_ADDR target_read_pc();
-void target_write_pc PARAMS ((CORE_ADDR, INT ));
+CORE_ADDR h8500_read_pc PARAMS ((int));
+void h8500_write_pc PARAMS ((CORE_ADDR, int));
 
+#define TARGET_READ_SP() h8500_read_sp()
+#define TARGET_WRITE_SP(x) h8500_write_sp(x)
 
-#define TARGET_READ_SP() target_read_sp()
-#define TARGET_WRITE_SP(x) target_write_sp(x)
-#define TARGET_READ_PC() target_read_pc()
-#define TARGET_WRITE_PC(x,y) target_write_pc(x,y)
+#define TARGET_READ_PC(pid) h8500_read_pc(pid)
+#define TARGET_WRITE_PC(x,pid) h8500_write_pc(x,pid)
 
-#define TARGET_READ_FP() target_read_fp()
-#define TARGET_WRITE_FP(x) target_write_fp(x)
+#define TARGET_READ_FP() h8500_read_fp()
+#define TARGET_WRITE_FP(x) h8500_write_fp(x)
 #define GDB_TARGET_IS_H8500
diff --git a/gdb/h8500-tdep.c b/gdb/h8500-tdep.c
index 8a32d98..2f5fe6f 100644
--- a/gdb/h8500-tdep.c
+++ b/gdb/h8500-tdep.c
@@ -645,39 +645,41 @@ _initialize_h8500_tdep ()
 }
 
 CORE_ADDR
-target_read_sp ()
+h8500_read_sp ()
 {
   return read_register (PR7_REGNUM);
 }
 
 void
-target_write_sp (v)
+h8500_write_sp (v)
      CORE_ADDR v;
 {
   write_register (PR7_REGNUM, v);
 }
 
 CORE_ADDR
-target_read_pc ()
+h8500_read_pc (pid)
+     int pid;
 {
   return read_register (PC_REGNUM);
 }
 
 void
-target_write_pc (v)
+h8500_write_pc (v, pid)
      CORE_ADDR v;
+     int pid;
 {
   write_register (PC_REGNUM, v);
 }
 
 CORE_ADDR
-target_read_fp ()
+h8500_read_fp ()
 {
   return read_register (PR6_REGNUM);
 }
 
 void
-target_write_fp (v)
+h8500_write_fp (v)
      CORE_ADDR v;
 {
   write_register (PR6_REGNUM, v);