darkkirb/old-cross-binutils
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

* infcall.c (generic_push_dummy_code): Remove.

Browse source 
(push_dummy_code): Unconditionally call gdbarch_push_dummy_code.
This commit is contained in:
Mark Kettenis 2008-09-15 20:14:04 +00:00
parent 9d25dd43e8
commit 50a834af8a
2 changed files with 10 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
gdb/ChangeLog
View file

@ -1,3 +1,8 @@
2008-09-15 Mark Kettenis <kettenis@gnu.org>
* infcall.c (generic_push_dummy_code): Remove.
(push_dummy_code): Unconditionally call gdbarch_push_dummy_code.
2008-09-15 Doug Evans <dje@google.com>
* dwarf2read.c (struct abbrev_info): Make members name, form 16 bits.

50
gdb/infcall.c
View file

@ -270,43 +270,6 @@ breakpoint_auto_delete_contents (void *arg)
breakpoint_auto_delete (inferior_thread ()->stop_bpstat);
}
static CORE_ADDR
generic_push_dummy_code (struct gdbarch *gdbarch,
CORE_ADDR sp, CORE_ADDR funaddr,
struct value **args, int nargs,
struct type *value_type,
CORE_ADDR *real_pc, CORE_ADDR *bp_addr,
struct regcache *regcache)
{
/* Something here to findout the size of a breakpoint and then
allocate space for it on the stack. */
int bplen;
/* This code assumes frame align. */
gdb_assert (gdbarch_frame_align_p (gdbarch));
/* Force the stack's alignment. The intent is to ensure that the SP
is aligned to at least a breakpoint instruction's boundary. */
sp = gdbarch_frame_align (gdbarch, sp);
/* Allocate space for, and then position the breakpoint on the
stack. */
if (gdbarch_inner_than (gdbarch, 1, 2))
{
CORE_ADDR bppc = sp;
gdbarch_breakpoint_from_pc (gdbarch, &bppc, &bplen);
sp = gdbarch_frame_align (gdbarch, sp - bplen);
(*bp_addr) = sp;
/* Should the breakpoint size/location be re-computed here? */
}
else
{
(*bp_addr) = sp;
gdbarch_breakpoint_from_pc (gdbarch, bp_addr, &bplen);
sp = gdbarch_frame_align (gdbarch, sp + bplen);
}
/* Inferior resumes at the function entry point. */
(*real_pc) = funaddr;
return sp;
}
/* For CALL_DUMMY_ON_STACK, push a breakpoint sequence that the called
function returns to. */
@ -318,14 +281,11 @@ push_dummy_code (struct gdbarch *gdbarch,
CORE_ADDR *real_pc, CORE_ADDR *bp_addr,
struct regcache *regcache)
{
if (gdbarch_push_dummy_code_p (gdbarch))
return gdbarch_push_dummy_code (gdbarch, sp, funaddr,
args, nargs, value_type, real_pc, bp_addr,
regcache);
else
return generic_push_dummy_code (gdbarch, sp, funaddr,
args, nargs, value_type, real_pc, bp_addr,
regcache);
gdb_assert (gdbarch_push_dummy_code_p (gdbarch));
return gdbarch_push_dummy_code (gdbarch, sp, funaddr,
args, nargs, value_type, real_pc, bp_addr,
regcache);
}
/* All this stuff with a dummy frame may seem unnecessarily complicated