gdb-3.1

1 files changed, 57 insertions, 12 deletions

diff --git a/gdb/frame.h b/gdb/frame.h
index acaea8ff2..bd5ce5d 100644
--- a/gdb/frame.h
+++ b/gdb/frame.h
@@ -20,22 +20,62 @@ anyone else from sharing it farther.  Help stamp out software hoarding!
 
 /* Note that frame.h requires param.h! */
 
-#define FRAME CORE_ADDR
-
+/*
+ * FRAME is the type of the identifier of a specific stack frame.  It
+ * is a pointer to the frame cache item corresponding to this frame.
+ * Please note that frame id's are *not* constant over calls to the
+ * inferior.  Use frame addresses, which are.
+ *
+ * FRAME_ADDR is the type of the address of a specific frame.  I
+ * cannot imagine a case in which this would not be CORE_ADDR, so
+ * maybe it's silly to give it it's own type.  Life's rough.
+ *
+ * FRAME_FP is a macro which converts from a frame identifier into a
+ * frame_address.
+ *
+ * FRAME_INFO_ID is a macro which "converts" from a frame info pointer
+ * to a frame id.  This is here in case I or someone else decides to
+ * change the FRAME type again.
+ *
+ * This file and blockframe.c are the only places which are allowed to
+ * use the equivalence between FRAME and struct frame_info *.  EXCEPTION:
+ * value.h uses CORE_ADDR instead of FRAME_ADDR because the compiler
+ * will accept that in the absense of this file.
+ */
+typedef struct frame_info *FRAME;
+typedef CORE_ADDR	FRAME_ADDR;
+#define FRAME_FP(fr)	((fr)->frame)
+#define FRAME_INFO_ID(f)	(f)
+
+/*
+ * Caching structure for stack frames.  This is also the structure
+ * used for extended info about stack frames.  May add more to this
+ * structure as it becomes necessary.
+ *
+ * Note that the first entry in the cache will always refer to the
+ * innermost executing frame.  This value should be set (is it?
+ * Check) in something like normal_stop.
+ */
 struct frame_info
   {
     /* Nominal address of the frame described.  */
-    FRAME frame;
+    FRAME_ADDR frame;
     /* Address at which execution is occurring in this frame.
        For the innermost frame, it's the current pc.
        For other frames, it is a pc saved in the next frame.  */
     CORE_ADDR pc;
-    /* The frame called by the frame we are describing, or 0.  */
-    FRAME next_frame;
-
-    /* The frame called by `next_frame', or 0 if there is none
-       (or `next_frame' is 0).  */
-    FRAME next_next_frame;
+    /* The frame called by the frame we are describing, or 0.
+       This may be set even if there isn't a frame called by the one
+       we are describing (.->next == 0); in that case it is simply the
+       bottom of this frame */
+    FRAME_ADDR next_frame;
+    /* Anything extra for this structure that may have been defined
+       in the machine depedent files. */
+#ifdef EXTRA_FRAME_INFO
+    EXTRA_FRAME_INFO
+#endif
+    /* Pointers to the next and previous frame_info's in this stack.  */
+    FRAME next, prev;
   };
 
 /* Describe the saved registers of a frame.  */
@@ -52,13 +92,14 @@ struct frame_saved_regs
 
 extern FRAME selected_frame;
 
-extern struct frame_info get_frame_info ();
-extern struct frame_info get_prev_frame_info ();
+extern struct frame_info *get_frame_info ();
+extern struct frame_info *get_prev_frame_info ();
+
+extern FRAME create_new_frame ();
 
 extern void get_frame_saved_regs ();
 
 extern FRAME get_prev_frame ();
-
 extern FRAME get_current_frame ();
 
 extern struct block *get_frame_block ();
@@ -66,3 +107,7 @@ extern struct block *get_current_block ();
 extern struct block *get_selected_block ();
 extern struct symbol *get_frame_function ();
 extern struct symbol *get_pc_function ();
+
+/* In stack.c */
+extern FRAME find_relative_frame ();
+