OpenE2K/binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* gdbarch.sh (construct_inferior_arguments): Remove.

Browse Source 
* gdbarch.c, gdbarch.h: Regenerate.
	* infcmd.c (get_inferior_args): Call construct_inferior_arguments
	directly instead of gdbarch_construct_inferior_arguments.
	(construct_inferior_arguments): Remove GDBARCH argument.
	* inferior.h (construct_inferior_arguments): Likewise.
This commit is contained in:
Ulrich Weigand 2009-06-17 18:35:33 +00:00
parent 9216df9506
commit bd57a74827
6 changed files with 12 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gdb/ChangeLog
View File

@ -1,3 +1,12 @@
2009-06-17 Ulrich Weigand <uweigand@de.ibm.com>
* gdbarch.sh (construct_inferior_arguments): Remove.
* gdbarch.c, gdbarch.h: Regenerate.
* infcmd.c (get_inferior_args): Call construct_inferior_arguments
directly instead of gdbarch_construct_inferior_arguments.
(construct_inferior_arguments): Remove GDBARCH argument.
* inferior.h (construct_inferior_arguments): Likewise.
2009-06-17 Ulrich Weigand <uweigand@de.ibm.com>
* symfile.c (section_is_mapped): Use objfile architecture instead

24
gdb/gdbarch.c
View File

@ -212,7 +212,6 @@ struct gdbarch
gdbarch_skip_solib_resolver_ftype *skip_solib_resolver;
gdbarch_in_solib_return_trampoline_ftype *in_solib_return_trampoline;
gdbarch_in_function_epilogue_p_ftype *in_function_epilogue_p;
gdbarch_construct_inferior_arguments_ftype *construct_inferior_arguments;
gdbarch_elf_make_msymbol_special_ftype *elf_make_msymbol_special;
gdbarch_coff_make_msymbol_special_ftype *coff_make_msymbol_special;
int cannot_step_breakpoint;
@ -349,7 +348,6 @@ struct gdbarch startup_gdbarch =
generic_skip_solib_resolver, /* skip_solib_resolver */
0, /* in_solib_return_trampoline */
generic_in_function_epilogue_p, /* in_function_epilogue_p */
construct_inferior_arguments, /* construct_inferior_arguments */
0, /* elf_make_msymbol_special */
0, /* coff_make_msymbol_special */
0, /* cannot_step_breakpoint */
@ -458,7 +456,6 @@ gdbarch_alloc (const struct gdbarch_info *info,
gdbarch->skip_solib_resolver = generic_skip_solib_resolver;
gdbarch->in_solib_return_trampoline = generic_in_solib_return_trampoline;
gdbarch->in_function_epilogue_p = generic_in_function_epilogue_p;
gdbarch->construct_inferior_arguments = construct_inferior_arguments;
gdbarch->elf_make_msymbol_special = default_elf_make_msymbol_special;
gdbarch->coff_make_msymbol_special = default_coff_make_msymbol_special;
gdbarch->register_reggroup_p = default_register_reggroup_p;
@ -606,7 +603,6 @@ verify_gdbarch (struct gdbarch *gdbarch)
/* Skip verify of skip_solib_resolver, invalid_p == 0 */
/* Skip verify of in_solib_return_trampoline, invalid_p == 0 */
/* Skip verify of in_function_epilogue_p, invalid_p == 0 */
/* Skip verify of construct_inferior_arguments, invalid_p == 0 */
/* Skip verify of elf_make_msymbol_special, invalid_p == 0 */
/* Skip verify of coff_make_msymbol_special, invalid_p == 0 */
/* Skip verify of cannot_step_breakpoint, invalid_p == 0 */
@ -732,9 +728,6 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file)
fprintf_unfiltered (file,
"gdbarch_dump: coff_make_msymbol_special = <%s>\n",
host_address_to_string (gdbarch->coff_make_msymbol_special));
fprintf_unfiltered (file,
"gdbarch_dump: construct_inferior_arguments = <%s>\n",
host_address_to_string (gdbarch->construct_inferior_arguments));
fprintf_unfiltered (file,
"gdbarch_dump: convert_from_func_ptr_addr = <%s>\n",
host_address_to_string (gdbarch->convert_from_func_ptr_addr));
@ -2707,23 +2700,6 @@ set_gdbarch_in_function_epilogue_p (struct gdbarch *gdbarch,
gdbarch->in_function_epilogue_p = in_function_epilogue_p;
}
char *
gdbarch_construct_inferior_arguments (struct gdbarch *gdbarch, int argc, char **argv)
{
gdb_assert (gdbarch != NULL);
gdb_assert (gdbarch->construct_inferior_arguments != NULL);
if (gdbarch_debug >= 2)
fprintf_unfiltered (gdb_stdlog, "gdbarch_construct_inferior_arguments called\n");
return gdbarch->construct_inferior_arguments (gdbarch, argc, argv);
}
void
set_gdbarch_construct_inferior_arguments (struct gdbarch *gdbarch,
gdbarch_construct_inferior_arguments_ftype construct_inferior_arguments)
{
gdbarch->construct_inferior_arguments = construct_inferior_arguments;
}
void
gdbarch_elf_make_msymbol_special (struct gdbarch *gdbarch, asymbol *sym, struct minimal_symbol *msym)
{

13
gdb/gdbarch.h
View File

@ -581,19 +581,6 @@ typedef int (gdbarch_in_function_epilogue_p_ftype) (struct gdbarch *gdbarch, COR
extern int gdbarch_in_function_epilogue_p (struct gdbarch *gdbarch, CORE_ADDR addr);
extern void set_gdbarch_in_function_epilogue_p (struct gdbarch *gdbarch, gdbarch_in_function_epilogue_p_ftype *in_function_epilogue_p);
/* Given a vector of command-line arguments, return a newly allocated
string which, when passed to the create_inferior function, will be
parsed (on Unix systems, by the shell) to yield the same vector.
This function should call error() if the argument vector is not
representable for this target or if this target does not support
command-line arguments.
ARGC is the number of elements in the vector.
ARGV is an array of strings, one per argument. */
typedef char * (gdbarch_construct_inferior_arguments_ftype) (struct gdbarch *gdbarch, int argc, char **argv);
extern char * gdbarch_construct_inferior_arguments (struct gdbarch *gdbarch, int argc, char **argv);
extern void set_gdbarch_construct_inferior_arguments (struct gdbarch *gdbarch, gdbarch_construct_inferior_arguments_ftype *construct_inferior_arguments);
typedef void (gdbarch_elf_make_msymbol_special_ftype) (asymbol *sym, struct minimal_symbol *msym);
extern void gdbarch_elf_make_msymbol_special (struct gdbarch *gdbarch, asymbol *sym, struct minimal_symbol *msym);
extern void set_gdbarch_elf_make_msymbol_special (struct gdbarch *gdbarch, gdbarch_elf_make_msymbol_special_ftype *elf_make_msymbol_special);

9
gdb/gdbarch.sh
View File

@ -575,15 +575,6 @@ f:int:in_solib_return_trampoline:CORE_ADDR pc, char *name:pc, name::generic_in_s
# which don't suffer from that problem could just let this functionality
# untouched.
m:int:in_function_epilogue_p:CORE_ADDR addr:addr:0:generic_in_function_epilogue_p::0
# Given a vector of command-line arguments, return a newly allocated
# string which, when passed to the create_inferior function, will be
# parsed (on Unix systems, by the shell) to yield the same vector.
# This function should call error() if the argument vector is not
# representable for this target or if this target does not support
# command-line arguments.
# ARGC is the number of elements in the vector.
# ARGV is an array of strings, one per argument.
m:char *:construct_inferior_arguments:int argc, char **argv:argc, argv::construct_inferior_arguments::0
f:void:elf_make_msymbol_special:asymbol *sym, struct minimal_symbol *msym:sym, msym::default_elf_make_msymbol_special::0
f:void:coff_make_msymbol_special:int val, struct minimal_symbol *msym:val, msym::default_coff_make_msymbol_special::0
v:int:cannot_step_breakpoint:::0:0::0

5
gdb/infcmd.c
View File

@ -194,8 +194,7 @@ get_inferior_args (void)
{
char *n, *old;
n = gdbarch_construct_inferior_arguments (current_gdbarch,
inferior_argc, inferior_argv);
n = construct_inferior_arguments (inferior_argc, inferior_argv);
old = set_inferior_args (n);
xfree (old);
}
@ -247,7 +246,7 @@ notice_args_read (struct ui_file *file, int from_tty,
/* Compute command-line string given argument vector. This does the
same shell processing as fork_inferior. */
char *
construct_inferior_arguments (struct gdbarch *gdbarch, int argc, char **argv)
construct_inferior_arguments (int argc, char **argv)
{
char *result;

2
gdb/inferior.h
View File

@ -207,7 +207,7 @@ extern int fork_inferior (char *, char *, char **,
extern void startup_inferior (int);
extern char *construct_inferior_arguments (struct gdbarch *, int, char **);
extern char *construct_inferior_arguments (int, char **);
/* From infrun.c */