aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--gdb/ChangeLog10
-rw-r--r--gdb/gdbarch.c17
-rw-r--r--gdb/gdbarch.h25
-rwxr-xr-xgdb/gdbarch.sh4
-rw-r--r--gdb/stack.c10
5 files changed, 17 insertions, 49 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 0e86666..ecc1789 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,15 @@
2007-06-06 Markus Deuling <deuling@de.ibm.com>
+ * gdbarch.sh (FRAME_ARGS_SKIP): Replace by gdbarch_frame_args_skip.
+ * stack.c (print_frame_args): Likewise.
+ * gdbarch.sh (FRAME_NUM_ARGS): Replace by gdbarch_frame_num_args.
+ * stack.c (print_args_stub, frame_info): Likewise.
+ * gdbarch.sh (FRAME_NUM_ARGS_P): Replace by gdbarch_frame_num_args_p.
+ * stack.c (print_args_stub, frame_info): Likewise.
+ * gdbarch.c, gdbarch.h: Regenerate.
+
+2007-06-06 Markus Deuling <deuling@de.ibm.com>
+
* gdbarch.sh (COFF_MAKE_MSYMBOL_SPECIAL): Replace by
gdbarch_coff_make_msymbol_special.
* coffread.c (coff_symtab_read): Likewise.
diff --git a/gdb/gdbarch.c b/gdb/gdbarch.c
index 8e8b8e2..91624f1 100644
--- a/gdb/gdbarch.c
+++ b/gdb/gdbarch.c
@@ -1002,29 +1002,12 @@ gdbarch_dump (struct gdbarch *current_gdbarch, struct ui_file *file)
fprintf_unfiltered (file,
"gdbarch_dump: frame_align = <0x%lx>\n",
(long) current_gdbarch->frame_align);
-#ifdef FRAME_ARGS_SKIP
- fprintf_unfiltered (file,
- "gdbarch_dump: FRAME_ARGS_SKIP # %s\n",
- XSTRING (FRAME_ARGS_SKIP));
-#endif
fprintf_unfiltered (file,
"gdbarch_dump: frame_args_skip = 0x%s\n",
paddr_nz (current_gdbarch->frame_args_skip));
-#ifdef FRAME_NUM_ARGS_P
- fprintf_unfiltered (file,
- "gdbarch_dump: %s # %s\n",
- "FRAME_NUM_ARGS_P()",
- XSTRING (FRAME_NUM_ARGS_P ()));
-#endif
fprintf_unfiltered (file,
"gdbarch_dump: gdbarch_frame_num_args_p() = %d\n",
gdbarch_frame_num_args_p (current_gdbarch));
-#ifdef FRAME_NUM_ARGS
- fprintf_unfiltered (file,
- "gdbarch_dump: %s # %s\n",
- "FRAME_NUM_ARGS(frame)",
- XSTRING (FRAME_NUM_ARGS (frame)));
-#endif
fprintf_unfiltered (file,
"gdbarch_dump: frame_num_args = <0x%lx>\n",
(long) current_gdbarch->frame_num_args);
diff --git a/gdb/gdbarch.h b/gdb/gdbarch.h
index c399475..64c48c7 100644
--- a/gdb/gdbarch.h
+++ b/gdb/gdbarch.h
@@ -809,12 +809,6 @@ extern void set_gdbarch_fetch_tls_load_module_address (struct gdbarch *gdbarch,
extern CORE_ADDR gdbarch_frame_args_skip (struct gdbarch *gdbarch);
extern void set_gdbarch_frame_args_skip (struct gdbarch *gdbarch, CORE_ADDR frame_args_skip);
-#if !defined (GDB_TM_FILE) && defined (FRAME_ARGS_SKIP)
-#error "Non multi-arch definition of FRAME_ARGS_SKIP"
-#endif
-#if !defined (FRAME_ARGS_SKIP)
-#define FRAME_ARGS_SKIP (gdbarch_frame_args_skip (current_gdbarch))
-#endif
extern int gdbarch_unwind_pc_p (struct gdbarch *gdbarch);
@@ -831,30 +825,11 @@ extern void set_gdbarch_unwind_sp (struct gdbarch *gdbarch, gdbarch_unwind_sp_ft
/* DEPRECATED_FRAME_LOCALS_ADDRESS as been replaced by the per-frame
frame-base. Enable frame-base before frame-unwind. */
-#if defined (FRAME_NUM_ARGS)
-/* Legacy for systems yet to multi-arch FRAME_NUM_ARGS */
-#if !defined (FRAME_NUM_ARGS_P)
-#define FRAME_NUM_ARGS_P() (1)
-#endif
-#endif
-
extern int gdbarch_frame_num_args_p (struct gdbarch *gdbarch);
-#if !defined (GDB_TM_FILE) && defined (FRAME_NUM_ARGS_P)
-#error "Non multi-arch definition of FRAME_NUM_ARGS"
-#endif
-#if !defined (FRAME_NUM_ARGS_P)
-#define FRAME_NUM_ARGS_P() (gdbarch_frame_num_args_p (current_gdbarch))
-#endif
typedef int (gdbarch_frame_num_args_ftype) (struct frame_info *frame);
extern int gdbarch_frame_num_args (struct gdbarch *gdbarch, struct frame_info *frame);
extern void set_gdbarch_frame_num_args (struct gdbarch *gdbarch, gdbarch_frame_num_args_ftype *frame_num_args);
-#if !defined (GDB_TM_FILE) && defined (FRAME_NUM_ARGS)
-#error "Non multi-arch definition of FRAME_NUM_ARGS"
-#endif
-#if !defined (FRAME_NUM_ARGS)
-#define FRAME_NUM_ARGS(frame) (gdbarch_frame_num_args (current_gdbarch, frame))
-#endif
/* DEPRECATED_STACK_ALIGN has been replaced by an initial aligning call
to frame_align and the requirement that methods such as
diff --git a/gdb/gdbarch.sh b/gdb/gdbarch.sh
index d8412e4..97a0bfb 100755
--- a/gdb/gdbarch.sh
+++ b/gdb/gdbarch.sh
@@ -567,12 +567,12 @@ m::int:remote_register_number:int regno:regno::default_remote_register_number::0
# Fetch the target specific address used to represent a load module.
F:=:CORE_ADDR:fetch_tls_load_module_address:struct objfile *objfile:objfile
#
-v:=:CORE_ADDR:frame_args_skip:::0:::0
+v::CORE_ADDR:frame_args_skip:::0:::0
M::CORE_ADDR:unwind_pc:struct frame_info *next_frame:next_frame
M::CORE_ADDR:unwind_sp:struct frame_info *next_frame:next_frame
# DEPRECATED_FRAME_LOCALS_ADDRESS as been replaced by the per-frame
# frame-base. Enable frame-base before frame-unwind.
-F:=:int:frame_num_args:struct frame_info *frame:frame
+F::int:frame_num_args:struct frame_info *frame:frame
#
# DEPRECATED_STACK_ALIGN has been replaced by an initial aligning call
# to frame_align and the requirement that methods such as
diff --git a/gdb/stack.c b/gdb/stack.c
index 9d1e8b8..dcc475c 100644
--- a/gdb/stack.c
+++ b/gdb/stack.c
@@ -339,7 +339,7 @@ print_frame_args (struct symbol *func, struct frame_info *frame,
long start;
if (highest_offset == -1)
- start = FRAME_ARGS_SKIP;
+ start = gdbarch_frame_args_skip (current_gdbarch);
else
start = highest_offset;
@@ -358,9 +358,9 @@ print_args_stub (void *args)
struct print_args_args *p = args;
int numargs;
- if (FRAME_NUM_ARGS_P ())
+ if (gdbarch_frame_num_args_p (current_gdbarch))
{
- numargs = FRAME_NUM_ARGS (p->frame);
+ numargs = gdbarch_frame_num_args (current_gdbarch, p->frame);
gdb_assert (numargs >= 0);
}
else
@@ -971,14 +971,14 @@ frame_info (char *addr_exp, int from_tty)
deprecated_print_address_numeric (arg_list, 1, gdb_stdout);
printf_filtered (",");
- if (!FRAME_NUM_ARGS_P ())
+ if (!gdbarch_frame_num_args_p (current_gdbarch))
{
numargs = -1;
puts_filtered (" args: ");
}
else
{
- numargs = FRAME_NUM_ARGS (fi);
+ numargs = gdbarch_frame_num_args (current_gdbarch, fi);
gdb_assert (numargs >= 0);
if (numargs == 0)
puts_filtered (" no args.");
generated by cgit v1.1 at 2024-12-21 02:13:27 +0000