2004-03-22 Andrew Cagney <cagney@redhat.com>
* frame.h (generic_pop_current_frame): Delete declaration. (deprecate_pop_dummy_frame): Deprecate generic_pop_dummy_frame. * dummy-frame.c (deprecated_pop_dummy_frame): Update. (generic_pop_current_frame): Delete function. * mn10300-tdep.c (mn10300_pop_frame): Eliminate call to generic_pop_current_frame. * v850-tdep.c (v850_pop_frame): Update. * mcore-tdep.c (mcore_pop_frame): Update. * sh64-tdep.c (sh64_pop_frame): Update. * h8300-tdep.c (h8300_pop_frame): Update.
This commit is contained in:
parent
90ba813f1f
commit
8adf9e781b
9 changed files with 28 additions and 27 deletions
|
@ -1,3 +1,17 @@
|
|||
2004-03-22 Andrew Cagney <cagney@redhat.com>
|
||||
|
||||
* frame.h (generic_pop_current_frame): Delete declaration.
|
||||
(deprecate_pop_dummy_frame): Deprecate
|
||||
generic_pop_dummy_frame.
|
||||
* dummy-frame.c (deprecated_pop_dummy_frame): Update.
|
||||
(generic_pop_current_frame): Delete function.
|
||||
* mn10300-tdep.c (mn10300_pop_frame): Eliminate call to
|
||||
generic_pop_current_frame.
|
||||
* v850-tdep.c (v850_pop_frame): Update.
|
||||
* mcore-tdep.c (mcore_pop_frame): Update.
|
||||
* sh64-tdep.c (sh64_pop_frame): Update.
|
||||
* h8300-tdep.c (h8300_pop_frame): Update.
|
||||
|
||||
2004-03-22 Andrew Cagney <cagney@redhat.com>
|
||||
|
||||
* frame.h (deprecated_pc_in_call_dummy): Rename
|
||||
|
|
|
@ -256,21 +256,6 @@ generic_save_call_dummy_addr (CORE_ADDR lo, CORE_ADDR hi)
|
|||
dummy_frame_stack->call_hi = hi;
|
||||
}
|
||||
|
||||
/* Restore the machine state from either the saved dummy stack or a
|
||||
real stack frame. */
|
||||
|
||||
void
|
||||
generic_pop_current_frame (void (*popper) (struct frame_info * frame))
|
||||
{
|
||||
struct frame_info *frame = get_current_frame ();
|
||||
if (get_frame_type (frame) == DUMMY_FRAME)
|
||||
/* NOTE: cagney/2002-22-23: Does this ever occure? Surely a dummy
|
||||
frame will have already been poped by the "infrun.c" code. */
|
||||
generic_pop_dummy_frame ();
|
||||
else
|
||||
(*popper) (frame);
|
||||
}
|
||||
|
||||
/* Discard the innermost dummy frame from the dummy frame stack
|
||||
(passed in as a parameter). */
|
||||
|
||||
|
@ -284,7 +269,7 @@ discard_innermost_dummy (struct dummy_frame **stack)
|
|||
}
|
||||
|
||||
void
|
||||
generic_pop_dummy_frame (void)
|
||||
deprecated_pop_dummy_frame (void)
|
||||
{
|
||||
struct dummy_frame *dummy_frame = dummy_frame_stack;
|
||||
|
||||
|
|
|
@ -565,8 +565,7 @@ extern struct frame_info *block_innermost_frame (struct block *);
|
|||
extern CORE_ADDR deprecated_read_register_dummy (CORE_ADDR pc,
|
||||
CORE_ADDR fp, int);
|
||||
extern void generic_push_dummy_frame (void);
|
||||
extern void generic_pop_current_frame (void (*)(struct frame_info *));
|
||||
extern void generic_pop_dummy_frame (void);
|
||||
extern void deprecated_pop_dummy_frame (void);
|
||||
|
||||
extern int deprecated_pc_in_call_dummy (CORE_ADDR pc, CORE_ADDR sp,
|
||||
CORE_ADDR fp);
|
||||
|
|
|
@ -743,7 +743,7 @@ h8300_pop_frame (void)
|
|||
get_frame_base (frame),
|
||||
get_frame_base (frame)))
|
||||
{
|
||||
generic_pop_dummy_frame ();
|
||||
deprecated_pop_dummy_frame ();
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
|
@ -752,7 +752,7 @@ mcore_pop_frame (void)
|
|||
|
||||
if (DEPRECATED_PC_IN_CALL_DUMMY (get_frame_pc (fi), get_frame_base (fi),
|
||||
get_frame_base (fi)))
|
||||
generic_pop_dummy_frame ();
|
||||
deprecated_pop_dummy_frame ();
|
||||
else
|
||||
{
|
||||
/* Write out the PC we saved. */
|
||||
|
|
|
@ -749,10 +749,13 @@ mn10300_pop_frame_regular (struct frame_info *frame)
|
|||
static void
|
||||
mn10300_pop_frame (void)
|
||||
{
|
||||
/* This function checks for and handles generic dummy frames, and
|
||||
calls back to our function for ordinary frames. */
|
||||
generic_pop_current_frame (mn10300_pop_frame_regular);
|
||||
|
||||
struct frame_info *frame = get_current_frame ();
|
||||
if (get_frame_type (frame) == DUMMY_FRAME)
|
||||
/* NOTE: cagney/2002-22-23: Does this ever occure? Surely a dummy
|
||||
frame will have already been poped by the "infrun.c" code. */
|
||||
deprecated_pop_dummy_frame ();
|
||||
else
|
||||
mn10300_pop_frame_regular (frame);
|
||||
/* Throw away any cached frame information. */
|
||||
flush_cached_frames ();
|
||||
}
|
||||
|
|
|
@ -1373,7 +1373,7 @@ sh64_pop_frame (void)
|
|||
if (DEPRECATED_PC_IN_CALL_DUMMY (get_frame_pc (frame),
|
||||
get_frame_base (frame),
|
||||
get_frame_base (frame)))
|
||||
generic_pop_dummy_frame ();
|
||||
deprecated_pop_dummy_frame ();
|
||||
else
|
||||
{
|
||||
fp = get_frame_base (frame);
|
||||
|
|
|
@ -885,7 +885,7 @@ v850_pop_frame (void)
|
|||
if (DEPRECATED_PC_IN_CALL_DUMMY (get_frame_pc (frame),
|
||||
get_frame_base (frame),
|
||||
get_frame_base (frame)))
|
||||
generic_pop_dummy_frame ();
|
||||
deprecated_pop_dummy_frame ();
|
||||
else
|
||||
{
|
||||
write_register (E_PC_REGNUM, DEPRECATED_FRAME_SAVED_PC (frame));
|
||||
|
|
|
@ -326,7 +326,7 @@ xstormy16_pop_frame (void)
|
|||
if (DEPRECATED_PC_IN_CALL_DUMMY (get_frame_pc (fi), get_frame_base (fi),
|
||||
get_frame_base (fi)))
|
||||
{
|
||||
generic_pop_dummy_frame ();
|
||||
deprecated_pop_dummy_frame ();
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue