int level;
/* The frame's type. */
- /* FIXME: cagney/2003-04-02: Should instead be returning
- ->unwind->type. Unfortunately, legacy code is still explicitly
- setting the type using the method deprecated_set_frame_type.
- Eliminate that method and this field can be eliminated. */
+ /* FIXME: cagney/2004-05-01: Should instead just use ->unwind->type.
+ Unfortunately, legacy_get_prev_frame is still explicitly setting
+ the type. Eliminate that method and this field can be
+ eliminated. */
enum frame_type type;
/* For each register, address of where it was saved on entry to the
{
fi->unwind = frame_unwind_find_by_frame (fi->next,
&fi->prologue_cache);
- /* FIXME: cagney/2003-04-02: Rather than storing the frame's
- type in the frame, the unwinder's type should be returned
- directly. Unfortunately legacy code, called by
- legacy_get_prev_frame(), explicitly sets the frame's type
- using the method deprecated_set_frame_type(). */
+ /* FIXME: cagney/2004-05-01: Should instead just use
+ ->unwind->type. Unfortunately, legacy_get_prev_frame is
+ still explicitly setting the type. Eliminate that method
+ and this field can be eliminated. */
fi->type = fi->unwind->type;
}
/* Find THIS frame's ID. */
{
frame->unwind = frame_unwind_find_by_frame (frame->next,
&frame->prologue_cache);
- /* FIXME: cagney/2003-04-02: Rather than storing the frame's
- type in the frame, the unwinder's type should be returned
- directly. Unfortunately, legacy code, called by
- legacy_get_prev_frame(), explicitly set the frames type using
- the method deprecated_set_frame_type(). */
+ /* FIXME: cagney/2004-05-01: Should instead just use ->unwind->type.
+ Unfortunately, legacy_get_prev_frame is still explicitly setting
+ the type. Eliminate that method and this field can be
+ eliminated. */
frame->type = frame->unwind->type;
}
create_sentinel_frame (struct regcache *regcache)
{
struct frame_info *frame = FRAME_OBSTACK_ZALLOC (struct frame_info);
- frame->type = NORMAL_FRAME;
+ frame->type = SENTINEL_FRAME;
frame->level = -1;
/* Explicitly initialize the sentinel frame's cache. Provide it
with the underlying regcache. In the future additional
};
const struct frame_unwind *legacy_saved_regs_unwind = &legacy_saved_regs_unwinder;
-
-/* Function: deprecated_generic_get_saved_register
- Find register number REGNUM relative to FRAME and put its (raw,
- target format) contents in *RAW_BUFFER.
-
- Set *OPTIMIZED if the variable was optimized out (and thus can't be
- fetched). Note that this is never set to anything other than zero
- in this implementation.
-
- Set *LVAL to lval_memory, lval_register, or not_lval, depending on
- whether the value was fetched from memory, from a register, or in a
- strange and non-modifiable way (e.g. a frame pointer which was
- calculated rather than fetched). We will use not_lval for values
- fetched from generic dummy frames.
-
- Set *ADDRP to the address, either in memory or as a
- DEPRECATED_REGISTER_BYTE offset into the registers array. If the
- value is stored in a dummy frame, set *ADDRP to zero.
-
- The argument RAW_BUFFER must point to aligned memory. */
-
-void
-deprecated_generic_get_saved_register (char *raw_buffer, int *optimized,
- CORE_ADDR *addrp,
- struct frame_info *frame, int regnum,
- enum lval_type *lval)
-{
- if (!target_has_registers)
- error ("No registers.");
-
- /* Normal systems don't optimize out things with register numbers. */
- if (optimized != NULL)
- *optimized = 0;
-
- if (addrp) /* default assumption: not found in memory */
- *addrp = 0;
-
- /* Note: since the current frame's registers could only have been
- saved by frames INTERIOR TO the current frame, we skip examining
- the current frame itself: otherwise, we would be getting the
- previous frame's registers which were saved by the current frame. */
-
- if (frame != NULL)
- {
- for (frame = get_next_frame (frame);
- frame_relative_level (frame) >= 0;
- frame = get_next_frame (frame))
- {
- if (get_frame_type (frame) == DUMMY_FRAME)
- {
- if (lval) /* found it in a CALL_DUMMY frame */
- *lval = not_lval;
- if (raw_buffer)
- /* FIXME: cagney/2002-06-26: This should be via the
- gdbarch_register_read() method so that it, on the
- fly, constructs either a raw or pseudo register
- from the raw register cache. */
- regcache_raw_read
- (deprecated_find_dummy_frame_regcache (get_frame_pc (frame),
- get_frame_base (frame)),
- regnum, raw_buffer);
- return;
- }
-
- DEPRECATED_FRAME_INIT_SAVED_REGS (frame);
- if (deprecated_get_frame_saved_regs (frame) != NULL
- && deprecated_get_frame_saved_regs (frame)[regnum] != 0)
- {
- if (lval) /* found it saved on the stack */
- *lval = lval_memory;
- if (regnum == SP_REGNUM)
- {
- if (raw_buffer) /* SP register treated specially */
- /* NOTE: cagney/2003-05-09: In-line store_address()
- with it's body - store_unsigned_integer(). */
- store_unsigned_integer (raw_buffer,
- DEPRECATED_REGISTER_RAW_SIZE (regnum),
- deprecated_get_frame_saved_regs (frame)[regnum]);
- }
- else
- {
- if (addrp) /* any other register */
- *addrp = deprecated_get_frame_saved_regs (frame)[regnum];
- if (raw_buffer)
- read_memory (deprecated_get_frame_saved_regs (frame)[regnum], raw_buffer,
- DEPRECATED_REGISTER_RAW_SIZE (regnum));
- }
- return;
- }
- }
- }
-
- /* If we get thru the loop to this point, it means the register was
- not saved in any frame. Return the actual live-register value. */
-
- if (lval) /* found it in a live register */
- *lval = lval_register;
- if (addrp)
- *addrp = DEPRECATED_REGISTER_BYTE (regnum);
- if (raw_buffer)
- deprecated_read_register_gen (regnum, raw_buffer);
-}
-
/* Determine the frame's type based on its PC. */
static enum frame_type
frame_type_from_pc (CORE_ADDR pc)
{
- if (DEPRECATED_USE_GENERIC_DUMMY_FRAMES
- && deprecated_pc_in_call_dummy (pc, 0, 0))
+ /* NOTE: cagney/2004-05-08: Eliminating this function depends on all
+ architectures being forced to use the frame-unwind code. */
+ if (deprecated_pc_in_call_dummy (pc, 0, 0))
return DUMMY_FRAME;
else
return NORMAL_FRAME;
/* Find PREV frame's unwinder. */
prev->unwind = frame_unwind_find_by_frame (this_frame,
&prev->prologue_cache);
- /* FIXME: cagney/2003-04-02: Rather than storing the frame's
- type in the frame, the unwinder's type should be returned
- directly. Unfortunately, legacy code, called by
- legacy_get_prev_frame(), explicitly set the frames type
- using the method deprecated_set_frame_type(). */
+ /* FIXME: cagney/2004-05-01: Should instead just use
+ ->unwind->type. Unfortunately, legacy_get_prev_frame is
+ still explicitly setting the type. Eliminate that method
+ and this field can be eliminated. */
prev->type = prev->unwind->type;
/* Find PREV frame's ID. */
prev->unwind->this_id (this_frame,
has previously set it. This is really somewhat bogus. The
initialization, as seen in create_new_frame(), should occur
before the INIT function has been called. */
- if (DEPRECATED_USE_GENERIC_DUMMY_FRAMES
- && deprecated_pc_in_call_dummy (get_frame_pc (prev), 0, 0))
+ if (deprecated_pc_in_call_dummy (get_frame_pc (prev), 0, 0))
prev->type = DUMMY_FRAME;
if (prev->type == NORMAL_FRAME)
get_prev_frame_1 (struct frame_info *this_frame)
{
struct frame_info *prev_frame;
+ struct frame_id this_id;
gdb_assert (this_frame != NULL);
/* Check that this frame's ID was valid. If it wasn't, don't try to
unwind to the prev frame. Be careful to not apply this test to
the sentinel frame. */
- if (this_frame->level >= 0 && !frame_id_p (get_frame_id (this_frame)))
+ this_id = get_frame_id (this_frame);
+ if (this_frame->level >= 0 && !frame_id_p (this_id))
{
if (frame_debug)
{
go backwards) and sentinel frames (the test is meaningless). */
if (this_frame->next->level >= 0
&& this_frame->next->type != SIGTRAMP_FRAME
- && frame_id_inner (get_frame_id (this_frame),
- get_frame_id (this_frame->next)))
+ && frame_id_inner (this_id, get_frame_id (this_frame->next)))
error ("Previous frame inner to this frame (corrupt stack?)");
/* Check that this and the next frame are not identical. If they
are, there is most likely a stack cycle. As with the inner-than
test above, avoid comparing the inner-most and sentinel frames. */
if (this_frame->level > 0
- && frame_id_eq (get_frame_id (this_frame),
- get_frame_id (this_frame->next)))
+ && frame_id_eq (this_id, get_frame_id (this_frame->next)))
error ("Previous frame identical to this frame (corrupt stack?)");
/* Allocate the new frame but do not wire it in to the frame chain.
enum frame_type
get_frame_type (struct frame_info *frame)
{
- /* Some targets still don't use [generic] dummy frames. Catch them
- here. */
- if (!DEPRECATED_USE_GENERIC_DUMMY_FRAMES
- && deprecated_frame_in_dummy (frame))
- return DUMMY_FRAME;
-
/* Some legacy code, e.g, mips_init_extra_frame_info() wants
to determine the frame's type prior to it being completely
initialized. Don't attempt to lazily initialize ->unwind for
provides the frame's type. */
frame->unwind = frame_unwind_find_by_frame (frame->next,
&frame->prologue_cache);
- /* FIXME: cagney/2003-04-02: Rather than storing the frame's
- type in the frame, the unwinder's type should be returned
- directly. Unfortunately, legacy code, called by
- legacy_get_prev_frame(), explicitly set the frames type using
- the method deprecated_set_frame_type(). */
+ /* FIXME: cagney/2004-05-01: Should instead just use
+ ->unwind->type. Unfortunately, legacy_get_prev_frame is
+ still explicitly setting the type. Eliminate that method and
+ this field can be eliminated. */
frame->type = frame->unwind->type;
}
if (frame->type == UNKNOWN_FRAME)
return frame->type;
}
-void
-deprecated_set_frame_type (struct frame_info *frame, enum frame_type type)
-{
- /* Arrrg! See comment in "frame.h". */
- frame->type = type;
-}
-
struct frame_extra_info *
get_frame_extra_info (struct frame_info *fi)
{
projects / deliverable / binutils-gdb.git / blobdiff