This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[rfc] [7/9] Remove macros FRAME_ARGS_SKIP, FRAME_NUM_ARGS and FRAME_NUM_ARGS_P
- From: Markus Deuling <deuling at de dot ibm dot com>
- To: GDB Patches <gdb-patches at sourceware dot org>
- Cc: Ulrich Weigand <uweigand at de dot ibm dot com>
- Date: Fri, 01 Jun 2007 13:39:57 +0200
- Subject: [rfc] [7/9] Remove macros FRAME_ARGS_SKIP, FRAME_NUM_ARGS and FRAME_NUM_ARGS_P
Hello,
this patch removes FRAME_ARGS_SKIP, FRAME_NUM_ARGS and FRAME_NUM_ARGS_P macro from gdbarch.sh
ChangeLog:
* 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.
Is this ok to commit?
Regards,
Markus
--
Markus Deuling
GNU Toolchain for Linux on Cell BE
deuling@de.ibm.com
diff -urN src/gdb/gdbarch.c dev/gdb/gdbarch.c
--- src/gdb/gdbarch.c 2007-05-14 17:16:57.000000000 +0200
+++ dev/gdb/gdbarch.c 2007-05-24 06:05:40.000000000 +0200
@@ -1047,29 +1047,12 @@
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 -urN src/gdb/gdbarch.h dev/gdb/gdbarch.h
--- src/gdb/gdbarch.h 2007-05-14 17:16:57.000000000 +0200
+++ dev/gdb/gdbarch.h 2007-05-24 06:05:31.000000000 +0200
@@ -893,12 +893,6 @@
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);
@@ -915,30 +909,11 @@
/* 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 -urN src/gdb/gdbarch.sh dev/gdb/gdbarch.sh
--- src/gdb/gdbarch.sh 2007-05-14 17:16:57.000000000 +0200
+++ dev/gdb/gdbarch.sh 2007-05-24 06:05:25.000000000 +0200
@@ -566,12 +566,12 @@
# 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 -urN src/gdb/stack.c dev/gdb/stack.c
--- src/gdb/stack.c 2007-03-29 09:35:39.000000000 +0200
+++ dev/gdb/stack.c 2007-05-24 06:10:06.000000000 +0200
@@ -339,7 +339,7 @@
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 @@
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 @@
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.");