From f8dcfc0affda04681b337c807c15d3c59badc33c Mon Sep 17 00:00:00 2001 From: Ulrich Weigand Date: Thu, 11 Sep 2008 14:27:00 +0000 Subject: [PATCH] ChangeLog: * gdbarch.sh (name_of_malloc): Remove. * gdbarch.c, gdbarch.h: Re-generate. * valops.c (value_allocate_space_in_inferior): Do not call gdbarch_name_of_malloc. doc/ChangeLog: * gdbint.texinfo (Target Conditionals): Remove documentation for gdbarch_name_of_malloc. --- gdb/ChangeLog | 7 +++++++ gdb/doc/ChangeLog | 5 +++++ gdb/doc/gdbint.texinfo | 5 ----- gdb/gdbarch.c | 24 ------------------------ gdb/gdbarch.h | 3 --- gdb/gdbarch.sh | 1 - gdb/valops.c | 3 +-- 7 files changed, 13 insertions(+), 35 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 46c9d943cc8..189beabff97 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2008-09-11 Ulrich Weigand + + * gdbarch.sh (name_of_malloc): Remove. + * gdbarch.c, gdbarch.h: Re-generate. + * valops.c (value_allocate_space_in_inferior): Do not call + gdbarch_name_of_malloc. + 2008-09-11 Ulrich Weigand * valarith.c (value_x_unop): Use builtin_type_int8 as type for diff --git a/gdb/doc/ChangeLog b/gdb/doc/ChangeLog index 21605744af9..0ba64560d5e 100644 --- a/gdb/doc/ChangeLog +++ b/gdb/doc/ChangeLog @@ -1,3 +1,8 @@ +2008-09-11 Ulrich Weigand + + * gdbint.texinfo (Target Conditionals): Remove documentation + for gdbarch_name_of_malloc. + 2008-09-03 Angela Marie Thomas * gdb.texinfo (Interrupts): Mention TCP interface for diff --git a/gdb/doc/gdbint.texinfo b/gdb/doc/gdbint.texinfo index fc2f255c3d0..e4ae2b1ae7b 100644 --- a/gdb/doc/gdbint.texinfo +++ b/gdb/doc/gdbint.texinfo @@ -4114,11 +4114,6 @@ not defined, it will default to @code{0xf}. @item REMOTE_BPT_VECTOR Defaults to @code{1}. -@item const char *gdbarch_name_of_malloc (@var{gdbarch}) -@findex gdbarch_name_of_malloc -A string containing the name of the function to call in order to -allocate some memory in the inferior. The default value is "malloc". - @end ftable @node Adding a New Target diff --git a/gdb/gdbarch.c b/gdb/gdbarch.c index 1ec3a3378e2..aa9a455446d 100644 --- a/gdb/gdbarch.c +++ b/gdb/gdbarch.c @@ -215,7 +215,6 @@ struct gdbarch 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; - const char * name_of_malloc; int cannot_step_breakpoint; int have_nonsteppable_watchpoint; gdbarch_address_class_type_flags_ftype *address_class_type_flags; @@ -347,7 +346,6 @@ struct gdbarch startup_gdbarch = construct_inferior_arguments, /* construct_inferior_arguments */ 0, /* elf_make_msymbol_special */ 0, /* coff_make_msymbol_special */ - "malloc", /* name_of_malloc */ 0, /* cannot_step_breakpoint */ 0, /* have_nonsteppable_watchpoint */ 0, /* address_class_type_flags */ @@ -451,7 +449,6 @@ gdbarch_alloc (const struct gdbarch_info *info, 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->name_of_malloc = "malloc"; gdbarch->register_reggroup_p = default_register_reggroup_p; gdbarch->displaced_step_fixup = NULL; gdbarch->displaced_step_free_closure = NULL; @@ -600,7 +597,6 @@ verify_gdbarch (struct gdbarch *gdbarch) /* 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 name_of_malloc, invalid_p == 0 */ /* Skip verify of cannot_step_breakpoint, invalid_p == 0 */ /* Skip verify of have_nonsteppable_watchpoint, invalid_p == 0 */ /* Skip verify of address_class_type_flags, has predicate */ @@ -880,9 +876,6 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file) fprintf_unfiltered (file, "gdbarch_dump: memory_remove_breakpoint = <0x%lx>\n", (long) gdbarch->memory_remove_breakpoint); - fprintf_unfiltered (file, - "gdbarch_dump: name_of_malloc = %s\n", - gdbarch->name_of_malloc); fprintf_unfiltered (file, "gdbarch_dump: num_pseudo_regs = %s\n", plongest (gdbarch->num_pseudo_regs)); @@ -2720,23 +2713,6 @@ set_gdbarch_coff_make_msymbol_special (struct gdbarch *gdbarch, gdbarch->coff_make_msymbol_special = coff_make_msymbol_special; } -const char * -gdbarch_name_of_malloc (struct gdbarch *gdbarch) -{ - gdb_assert (gdbarch != NULL); - /* Skip verify of name_of_malloc, invalid_p == 0 */ - if (gdbarch_debug >= 2) - fprintf_unfiltered (gdb_stdlog, "gdbarch_name_of_malloc called\n"); - return gdbarch->name_of_malloc; -} - -void -set_gdbarch_name_of_malloc (struct gdbarch *gdbarch, - const char * name_of_malloc) -{ - gdbarch->name_of_malloc = name_of_malloc; -} - int gdbarch_cannot_step_breakpoint (struct gdbarch *gdbarch) { diff --git a/gdb/gdbarch.h b/gdb/gdbarch.h index aeafd4ab724..bc8298d8c42 100644 --- a/gdb/gdbarch.h +++ b/gdb/gdbarch.h @@ -591,9 +591,6 @@ typedef void (gdbarch_coff_make_msymbol_special_ftype) (int val, struct minimal_ extern void gdbarch_coff_make_msymbol_special (struct gdbarch *gdbarch, int val, struct minimal_symbol *msym); extern void set_gdbarch_coff_make_msymbol_special (struct gdbarch *gdbarch, gdbarch_coff_make_msymbol_special_ftype *coff_make_msymbol_special); -extern const char * gdbarch_name_of_malloc (struct gdbarch *gdbarch); -extern void set_gdbarch_name_of_malloc (struct gdbarch *gdbarch, const char * name_of_malloc); - extern int gdbarch_cannot_step_breakpoint (struct gdbarch *gdbarch); extern void set_gdbarch_cannot_step_breakpoint (struct gdbarch *gdbarch, int cannot_step_breakpoint); diff --git a/gdb/gdbarch.sh b/gdb/gdbarch.sh index 2856396d6d7..0c513a53e39 100755 --- a/gdb/gdbarch.sh +++ b/gdb/gdbarch.sh @@ -586,7 +586,6 @@ m:int:in_function_epilogue_p:CORE_ADDR addr:addr:0:generic_in_function_epilogue_ 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:const char *:name_of_malloc:::"malloc":"malloc"::0:gdbarch->name_of_malloc v:int:cannot_step_breakpoint:::0:0::0 v:int:have_nonsteppable_watchpoint:::0:0::0 F:int:address_class_type_flags:int byte_size, int dwarf2_addr_class:byte_size, dwarf2_addr_class diff --git a/gdb/valops.c b/gdb/valops.c index 1ab88ba57ad..1f5f00bc738 100644 --- a/gdb/valops.c +++ b/gdb/valops.c @@ -170,8 +170,7 @@ struct value * value_allocate_space_in_inferior (int len) { struct value *blocklen; - struct value *val = - find_function_in_inferior (gdbarch_name_of_malloc (current_gdbarch)); + struct value *val = find_function_in_inferior ("malloc"); blocklen = value_from_longest (builtin_type_int, (LONGEST) len); val = call_function_by_hand (val, 1, &blocklen); -- 2.30.2