aboutsummaryrefslogtreecommitdiff
path: root/gdb
diff options
context:
space:
mode:
authorAndrew Cagney <cagney@redhat.com>2002-11-24 14:16:38 +0000
committerAndrew Cagney <cagney@redhat.com>2002-11-24 14:16:38 +0000
commit7d8547c9602def946b932d1416593b8c44456d65 (patch)
tree3cf93a2e0f86830aabbbf60a4d6b5faeb721d338 /gdb
parent40fb7a1f93246339ecf4dbb5d76d03c443c6ab06 (diff)
downloadgdb-7d8547c9602def946b932d1416593b8c44456d65.zip
gdb-7d8547c9602def946b932d1416593b8c44456d65.tar.gz
gdb-7d8547c9602def946b932d1416593b8c44456d65.tar.bz2
2002-11-23 Andrew Cagney <ac131313@redhat.com>
* blockframe.c (find_frame_addr_in_frame_chain): Move function from here ... * varobj.c (find_frame_addr_in_frame_chain): ... to here. (varobj_create): Note that frame ID should be used. * frame.h (find_frame_addr_in_frame_chain): Delete declaration.
Diffstat (limited to 'gdb')
-rw-r--r--gdb/ChangeLog8
-rw-r--r--gdb/blockframe.c21
-rw-r--r--gdb/frame.h2
-rw-r--r--gdb/varobj.c27
4 files changed, 35 insertions, 23 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 1104cf2..b3f71df 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,13 @@
2002-11-23 Andrew Cagney <ac131313@redhat.com>
+ * blockframe.c (find_frame_addr_in_frame_chain): Move function
+ from here ...
+ * varobj.c (find_frame_addr_in_frame_chain): ... to here.
+ (varobj_create): Note that frame ID should be used.
+ * frame.h (find_frame_addr_in_frame_chain): Delete declaration.
+
+2002-11-23 Andrew Cagney <ac131313@redhat.com>
+
* breakpoint.c: Include "gdb_assert.h".
(deprecated_frame_in_dummy): Assert that generic dummy frames are
not being used.
diff --git a/gdb/blockframe.c b/gdb/blockframe.c
index da88497..d21fc9b 100644
--- a/gdb/blockframe.c
+++ b/gdb/blockframe.c
@@ -643,27 +643,6 @@ block_innermost_frame (struct block *block)
}
}
-/* Return the full FRAME which corresponds to the given CORE_ADDR
- or NULL if no FRAME on the chain corresponds to CORE_ADDR. */
-
-struct frame_info *
-find_frame_addr_in_frame_chain (CORE_ADDR frame_addr)
-{
- struct frame_info *frame = NULL;
-
- if (frame_addr == (CORE_ADDR) 0)
- return NULL;
-
- while (1)
- {
- frame = get_prev_frame (frame);
- if (frame == NULL)
- return NULL;
- if (FRAME_FP (frame) == frame_addr)
- return frame;
- }
-}
-
/* Are we in a call dummy? The code below which allows DECR_PC_AFTER_BREAK
below is for infrun.c, which may give the macro a pc without that
subtracted out. */
diff --git a/gdb/frame.h b/gdb/frame.h
index 269f11e..86d1172 100644
--- a/gdb/frame.h
+++ b/gdb/frame.h
@@ -412,8 +412,6 @@ extern void show_frame_info (struct frame_info *, int, int, int);
extern struct frame_info *block_innermost_frame (struct block *);
-extern struct frame_info *find_frame_addr_in_frame_chain (CORE_ADDR);
-
/* NOTE: cagney/2002-09-13: There is no need for this function.
Instead either of frame_unwind_signed_register() or
frame_unwind_unsigned_register() can be used. */
diff --git a/gdb/varobj.c b/gdb/varobj.c
index cd15f7c..9b3e150 100644
--- a/gdb/varobj.c
+++ b/gdb/varobj.c
@@ -396,6 +396,27 @@ static struct vlist **varobj_table;
/* Creates a varobj (not its children) */
+/* Return the full FRAME which corresponds to the given CORE_ADDR
+ or NULL if no FRAME on the chain corresponds to CORE_ADDR. */
+
+static struct frame_info *
+find_frame_addr_in_frame_chain (CORE_ADDR frame_addr)
+{
+ struct frame_info *frame = NULL;
+
+ if (frame_addr == (CORE_ADDR) 0)
+ return NULL;
+
+ while (1)
+ {
+ frame = get_prev_frame (frame);
+ if (frame == NULL)
+ return NULL;
+ if (FRAME_FP (frame) == frame_addr)
+ return frame;
+ }
+}
+
struct varobj *
varobj_create (char *objname,
char *expression, CORE_ADDR frame, enum varobj_type type)
@@ -422,6 +443,12 @@ varobj_create (char *objname,
if ((type == USE_CURRENT_FRAME) || (type == USE_SELECTED_FRAME))
fi = selected_frame;
else
+ /* FIXME: cagney/2002-11-23: This code should be doing a
+ lookup using the frame ID and not just the frame's
+ ``address''. This, of course, means an interface change.
+ However, with out that interface change ISAs, such as the
+ ia64 with its two stacks, won't work. Similar goes for the
+ case where there is a frameless function. */
fi = find_frame_addr_in_frame_chain (frame);
/* frame = -2 means always use selected frame */