Replace useless FRAME, FRAME_ADDR types with struct frame_info *

	and CORE_ADDR, respectively.
	* frame.h (FRAME, FRAME_INFO_ID, FRAME_ADDR): Remove.
	* blockframe.c (get_frame_info): Remove.
	* a29k-tdep.c, alpha-tdep.c, blockframe.c, breakpoint.c,
	breakpoint.h, energize.c, findvar.c, gdbtk.c, gould-pinsn.c,
	h8300-tdep.c, h8500-tdep.c, hppa-tdep.c, i386-tdep.c, i960-tdep.c,
	infcmd.c, inferior.h, infrun.c, m68k-tdep.c, m88k-tdep.c,
	mips-tdep.c, nindy-tdep.c, printcmd.c, pyr-tdep.c, rs6000-tdep.c,
	sh-tdep.c, sparc-tdep.c, stack.c, valops.c, z8k-tdep.c,
	config/a29k/tm-a29k.h, config/alpha/tm-alpha.h,
	config/gould/tm-pn.h, config/h8300/tm-h8300.h,
	config/h8500/tm-h8500.h, config/mips/tm-mips.h,
	config/ns32k/tm-merlin.h, config/ns32k/tm-umax.h,
	config/pyr/tm-pyr.h, config/sparc/tm-sparc.h): Replace FRAME with
	struct frame_info * everywhere, replace FRAME_ADDR with CORE_ADDR,
	rename variables consistently (using `frame' or `fi'), remove
	calls to get_frame_info and FRAME_INFO_ID, remove comments about
	FRAME and FRAME_ADDR cruftiness.

diff --git a/gdb/energize.c b/gdb/energize.c
index 6c8fdc4f7a14576a6375062e895b84046f28e823..88b442eaf758ca0ac06ba505271f635330ca4ee5 100644 (file)
--- a/gdb/energize.c
+++ b/gdb/energize.c
@@ -260,7 +260,7 @@ send_stack_info()
 {
   struct pclist *pclist = 0, *pli, *opli;
   static struct pclist *old_pclist;
-  FRAME frame;
+  struct frame_info *frame;
   int height, similar;
 
   if (stack_info_valid)

diff --git a/gdb/gdbtk.c b/gdb/gdbtk.c
index 21b2be3d20b522057a48a0111696f766d3995ea8..291476d7d6b2fd95061677cc30bba19a48d61ed3 100644 (file)
--- a/gdb/gdbtk.c
+++ b/gdb/gdbtk.c
@@ -243,13 +243,7 @@ gdb_loc (clientData, interp, argc, argv)
 
   if (argc == 1)
     {
-      struct frame_info *frame;
-      struct symbol *func;
-
-      frame = get_frame_info (selected_frame);
-
-      pc = frame ? frame->pc : stop_pc;
-
+      pc = selected_frame ? selected_frame->pc : stop_pc;
       sal = find_pc_line (pc, 0);
     }
   else if (argc == 2)

diff --git a/gdb/gould-pinsn.c b/gdb/gould-pinsn.c
index 876b8758068a7a76a2522c3f821a8d78684cc52f..5c89f27fd79ee758237a20bb01d88d4fcd1de97f 100644 (file)
--- a/gdb/gould-pinsn.c
+++ b/gdb/gould-pinsn.c
@@ -220,12 +220,12 @@ findarg(frame)
  *    1.) stored in the code function header xA(Br1).
  *    2.) must be careful of recurssion.
  */
-FRAME_ADDR
+CORE_ADDR
 findframe(thisframe)
-    FRAME thisframe;
+    struct frame_info *thisframe;
 {
-    register FRAME_ADDR pointer;
-    FRAME_ADDR framechain();
+    register CORE_ADDR pointer;
+    CORE_ADDR framechain();
 #if 0    
     struct frame_info *frame;
 
@@ -258,7 +258,7 @@ findframe(thisframe)
  * Gdb front-end and internal framechain routine.
  * Go back up stack one level.  Tricky...
  */
-FRAME_ADDR
+CORE_ADDR
 framechain(frame)
     register struct frame_info *frame;
 {