diff options
| author | Andrew Cagney <cagney@redhat.com> | 2004-02-23 16:27:40 +0000 |
|---|---|---|
| committer | Andrew Cagney <cagney@redhat.com> | 2004-02-23 16:27:40 +0000 |
| commit | 6dd1b3d6993332afa7f2e4701bbb1d6da3990316 (patch) | |
| tree | c39bc0aa15da4b6d2f2fa0057ae407e3af023158 /gdb/infcall.c | |
| parent | 74882195c3af1845020ae6f76f650e36be18e5c0 (diff) | |
| download | gdb-6dd1b3d6993332afa7f2e4701bbb1d6da3990316.tar.gz | |
2004-02-23 Andrew Cagney <cagney@redhat.com>
* infcall.c (legacy_push_dummy_code): Don't call deprecated
FIX_CALL_DUMMY when push_dummy_call is available.
(call_function_by_hand, push_dummy_code): Ditto.
Diffstat (limited to 'gdb/infcall.c')
| -rw-r--r-- | gdb/infcall.c | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/gdb/infcall.c b/gdb/infcall.c index 860d9cfafd0..11ce018087c 100644 --- a/gdb/infcall.c +++ b/gdb/infcall.c @@ -275,18 +275,21 @@ legacy_push_dummy_code (struct gdbarch *gdbarch, DUMMY_ADDR is pretty messed up. It comes from constant tinkering with the values. Instead a DEPRECATED_FIX_CALL_DUMMY replacement (PUSH_DUMMY_BREAKPOINT?) should just do everything. */ + if (!gdbarch_push_dummy_call_p (current_gdbarch)) + { #ifdef GDB_TARGET_IS_HPPA - (*real_pc) = DEPRECATED_FIX_CALL_DUMMY (dummy1, start_sp, funaddr, nargs, - args, value_type, using_gcc); + (*real_pc) = DEPRECATED_FIX_CALL_DUMMY (dummy1, start_sp, funaddr, nargs, + args, value_type, using_gcc); #else - if (DEPRECATED_FIX_CALL_DUMMY_P ()) - { - /* gdb_assert (CALL_DUMMY_LOCATION == ON_STACK) true? */ - DEPRECATED_FIX_CALL_DUMMY (dummy1, start_sp, funaddr, nargs, args, - value_type, using_gcc); - } - (*real_pc) = start_sp; + if (DEPRECATED_FIX_CALL_DUMMY_P ()) + { + /* gdb_assert (CALL_DUMMY_LOCATION == ON_STACK) true? */ + DEPRECATED_FIX_CALL_DUMMY (dummy1, start_sp, funaddr, nargs, args, + value_type, using_gcc); + } + (*real_pc) = start_sp; #endif + } /* Yes, the offset is applied to the real_pc and not the dummy addr. Ulgh! Blame the HP/UX target. */ (*bp_addr) = (*real_pc) + DEPRECATED_CALL_DUMMY_BREAKPOINT_OFFSET; @@ -348,7 +351,8 @@ push_dummy_code (struct gdbarch *gdbarch, if (gdbarch_push_dummy_code_p (gdbarch)) return gdbarch_push_dummy_code (gdbarch, sp, funaddr, using_gcc, args, nargs, value_type, real_pc, bp_addr); - else if (DEPRECATED_FIX_CALL_DUMMY_P ()) + else if (DEPRECATED_FIX_CALL_DUMMY_P () + && !gdbarch_push_dummy_call_p (gdbarch)) return legacy_push_dummy_code (gdbarch, sp, funaddr, using_gcc, args, nargs, value_type, real_pc, bp_addr); else @@ -546,7 +550,8 @@ call_function_by_hand (struct value *function, int nargs, struct value **args) } break; case AT_ENTRY_POINT: - if (DEPRECATED_FIX_CALL_DUMMY_P ()) + if (DEPRECATED_FIX_CALL_DUMMY_P () + && !gdbarch_push_dummy_call_p (current_gdbarch)) { /* Sigh. Some targets use DEPRECATED_FIX_CALL_DUMMY to shove extra stuff onto the stack or into registers. That |