From 7daf4f5bcc74c1e20fbeb2fc16c58e06c7ca4940 Mon Sep 17 00:00:00 2001 From: Joel Brobecker Date: Tue, 18 Mar 2003 18:57:48 +0000 Subject: [PATCH] Continuing work to convert the hppa targets to multiarch partial. * hppa-tdep.c (hppa_push_dummy_frame): Remove unused function parameter. Reformat comment. * config/pa/tm-hppa.h (hppa_push_dummy_frame): Update profile. (DEPRECATED_PUSH_DUMMY_FRAME): Update call to hppa_push_dummy_frame() to match new profile. --- gdb/ChangeLog | 9 +++++++++ gdb/config/pa/tm-hppa.h | 9 ++------- gdb/hppa-tdep.c | 13 ++++++------- 3 files changed, 17 insertions(+), 14 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 1413a38a35b..6a154e2e784 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,12 @@ +2003-03-18 J. Brobecker + + Continuing work to convert the hppa targets to multiarch partial. + * hppa-tdep.c (hppa_push_dummy_frame): Remove unused function + parameter. Reformat comment. + * config/pa/tm-hppa.h (hppa_push_dummy_frame): Update profile. + (DEPRECATED_PUSH_DUMMY_FRAME): Update call to hppa_push_dummy_frame() + to match new profile. + 2003-03-18 J. Brobecker * hppa-tdep.c (hppa_push_dummy_frame): Remove hack which does not diff --git a/gdb/config/pa/tm-hppa.h b/gdb/config/pa/tm-hppa.h index 4b196dcd19a..7ec3c8bdb35 100644 --- a/gdb/config/pa/tm-hppa.h +++ b/gdb/config/pa/tm-hppa.h @@ -452,13 +452,8 @@ extern void hppa_frame_find_saved_regs (struct frame_info *, /* Push an empty stack frame, to record the current PC, etc. */ -/* FIXME: brobecker 2002-12-26. This macro definition takes advantage - of the fact that DEPRECATED_PUSH_DUMMY_FRAME is called within a - function where a variable inf_status of type struct inferior_status - * is defined. Ugh! Until this is fixed, we will not be able to - move to multiarch partial. */ -#define DEPRECATED_PUSH_DUMMY_FRAME hppa_push_dummy_frame (inf_status) -extern void hppa_push_dummy_frame (struct inferior_status *); +#define DEPRECATED_PUSH_DUMMY_FRAME hppa_push_dummy_frame () +extern void hppa_push_dummy_frame (void); /* Discard from the stack the innermost frame, restoring all saved registers. */ diff --git a/gdb/hppa-tdep.c b/gdb/hppa-tdep.c index 35ae0a183b8..1cce60de3f6 100644 --- a/gdb/hppa-tdep.c +++ b/gdb/hppa-tdep.c @@ -165,7 +165,7 @@ CORE_ADDR hppa_frame_saved_pc (struct frame_info *frame); CORE_ADDR hppa_frame_args_address (struct frame_info *fi); CORE_ADDR hppa_frame_locals_address (struct frame_info *fi); int hppa_frame_num_args (struct frame_info *frame); -void hppa_push_dummy_frame (struct inferior_status *inf_status); +void hppa_push_dummy_frame (void); void hppa_pop_frame (void); CORE_ADDR hppa_fix_call_dummy (char *dummy, CORE_ADDR pc, CORE_ADDR fun, int nargs, struct value **args, @@ -1426,14 +1426,13 @@ hppa_frame_chain_valid (CORE_ADDR chain, struct frame_info *thisframe) return 0; } -/* - These functions deal with saving and restoring register state - around a function call in the inferior. They keep the stack - double-word aligned; eventually, on an hp700, the stack will have - to be aligned to a 64-byte boundary. */ +/* These functions deal with saving and restoring register state + around a function call in the inferior. They keep the stack + double-word aligned; eventually, on an hp700, the stack will have + to be aligned to a 64-byte boundary. */ void -hppa_push_dummy_frame (struct inferior_status *inf_status) +hppa_push_dummy_frame (void) { CORE_ADDR sp, pc, pcspace; register int regnum; -- 2.30.2