From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2126) id 9D2E43858D1E; Fri, 22 Mar 2024 19:18:03 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 9D2E43858D1E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1711135083; bh=k8hFPRr/IIOhRFJkXAIVBKXxCfobNyO2JbSd1aF3mGg=; h=From:To:Subject:Date:From; b=Tm9KefteypM5s+FDeLv235+qfchq/m9nRPAiqtZAFAY6JEo/1NDRTN08RfuFEr03s 5gOfe5qN2CYtAcdrq4NHQujkYBU57J7CAp7lsIzwh7trJQ6s5eBKHSEtOxL4HE9wOY aN0oMELF2Wu2/YJwhvHqTjAHTfbpZJiQmHw1cy4c= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Tom Tromey To: gdb-cvs@sourceware.org Subject: [binutils-gdb] Use std::string for disassembler options X-Act-Checkin: binutils-gdb X-Git-Author: Tom Tromey X-Git-Refname: refs/heads/master X-Git-Oldrev: af25053d5f9e1867bd0df1d5f168c803e1d7d015 X-Git-Newrev: c05dd51122c2d654031b04e02ad0ea5b53ffe5e2 Message-Id: <20240322191803.9D2E43858D1E@sourceware.org> Date: Fri, 22 Mar 2024 19:18:03 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3Dc05dd51122c2= d654031b04e02ad0ea5b53ffe5e2 commit c05dd51122c2d654031b04e02ad0ea5b53ffe5e2 Author: Tom Tromey Date: Thu Mar 21 11:15:56 2024 -0600 Use std::string for disassembler options =20 I noticed that the disassembler_options code uses manual memory management. It seemed simpler to replace this with std::string. =20 Approved-By: John Baldwin Diff: --- gdb/arc-tdep.c | 15 +++++++-------- gdb/arch-utils.c | 6 +++--- gdb/arm-tdep.c | 4 ++-- gdb/disasm.c | 20 ++++++++------------ gdb/gdbarch-gen.h | 4 ++-- gdb/gdbarch.c | 6 +++--- gdb/gdbarch_components.py | 2 +- gdb/mips-tdep.c | 2 +- gdb/riscv-tdep.c | 2 +- gdb/rs6000-tdep.c | 2 +- gdb/s390-tdep.c | 2 +- 11 files changed, 30 insertions(+), 35 deletions(-) diff --git a/gdb/arc-tdep.c b/gdb/arc-tdep.c index 7dd43cc239f..63a1fd918d1 100644 --- a/gdb/arc-tdep.c +++ b/gdb/arc-tdep.c @@ -299,7 +299,7 @@ static const struct arc_register_feature arc_common_aux= _reg_feature =3D } }; =20 -static char *arc_disassembler_options =3D NULL; +static std::string arc_disassembler_options; =20 /* Functions are sorted in the order as they are used in the _initialize_arc_tdep (), which uses the same order as gdbarch.h. Static @@ -2365,7 +2365,6 @@ arc_gdbarch_init (struct gdbarch_info info, struct gd= barch_list *arches) =3D tdesc_architecture (info.target_desc); if (tdesc_arch !=3D NULL) { - xfree (arc_disassembler_options); /* FIXME: It is not really good to change disassembler options behind the scene, because that might override options specified by the user. However as of now ARC doesn't support @@ -2386,24 +2385,24 @@ arc_gdbarch_init (struct gdbarch_info info, struct = gdbarch_list *arches) switch (tdesc_arch->mach) { case bfd_mach_arc_arc601: - arc_disassembler_options =3D xstrdup ("cpu=3Darc601"); + arc_disassembler_options =3D "cpu=3Darc601"; break; case bfd_mach_arc_arc600: - arc_disassembler_options =3D xstrdup ("cpu=3Darc600"); + arc_disassembler_options =3D "cpu=3Darc600"; break; case bfd_mach_arc_arc700: - arc_disassembler_options =3D xstrdup ("cpu=3Darc700"); + arc_disassembler_options =3D "cpu=3Darc700"; break; case bfd_mach_arc_arcv2: /* Machine arcv2 has three arches: ARCv2, EM and HS; where ARCv2 is treated as EM. */ if (arc_arch_is_hs (tdesc_arch)) - arc_disassembler_options =3D xstrdup ("cpu=3Dhs38_linux"); + arc_disassembler_options =3D "cpu=3Dhs38_linux"; else - arc_disassembler_options =3D xstrdup ("cpu=3Dem4_fpuda"); + arc_disassembler_options =3D "cpu=3Dem4_fpuda"; break; default: - arc_disassembler_options =3D NULL; + arc_disassembler_options =3D ""; break; } } diff --git a/gdb/arch-utils.c b/gdb/arch-utils.c index ae3354f6579..d404d1fc38a 100644 --- a/gdb/arch-utils.c +++ b/gdb/arch-utils.c @@ -1156,11 +1156,11 @@ pstring (const char *string) } =20 static const char * -pstring_ptr (char **string) +pstring_ptr (std::string *string) { - if (string =3D=3D NULL || *string =3D=3D NULL) + if (string =3D=3D nullptr) return "(null)"; - return *string; + return string->c_str (); } =20 /* Helper function to print a list of strings, represented as "const diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c index 82b06f63fcb..3a5fbe71b8b 100644 --- a/gdb/arm-tdep.c +++ b/gdb/arm-tdep.c @@ -232,7 +232,7 @@ static const char *const arm_register_names[] =3D "fps", "cpsr" }; /* 24 25 */ =20 /* Holds the current set of options to be passed to the disassembler. */ -static char *arm_disassembler_options; +static std::string arm_disassembler_options; =20 /* Valid register name styles. */ static const char **valid_disassembly_styles; @@ -11042,7 +11042,7 @@ _initialize_arm_tdep () &setarmcmdlist, &showarmcmdlist, &setlist, &showlist); =20 - arm_disassembler_options =3D xstrdup ("reg-names-std"); + arm_disassembler_options =3D "reg-names-std"; const disasm_options_t *disasm_options =3D &disassembler_options_arm ()->options; int num_disassembly_styles =3D 0; diff --git a/gdb/disasm.c b/gdb/disasm.c index 5bab5cf6199..cafbc078c60 100644 --- a/gdb/disasm.c +++ b/gdb/disasm.c @@ -1294,17 +1294,17 @@ gdb_buffered_insn_length (struct gdbarch *gdbarch, const char * get_disassembler_options (struct gdbarch *gdbarch) { - char **disassembler_options =3D gdbarch_disassembler_options (gdbarch); - if (disassembler_options =3D=3D NULL) - return NULL; - return *disassembler_options; + std::string *disassembler_options =3D gdbarch_disassembler_options (gdba= rch); + if (disassembler_options =3D=3D nullptr || disassembler_options->empty (= )) + return nullptr; + return disassembler_options->c_str (); } =20 void set_disassembler_options (const char *prospective_options) { struct gdbarch *gdbarch =3D get_current_arch (); - char **disassembler_options =3D gdbarch_disassembler_options (gdbarch); + std::string *disassembler_options =3D gdbarch_disassembler_options (gdba= rch); const disasm_options_and_args_t *valid_options_and_args; const disasm_options_t *valid_options; gdb::unique_xmalloc_ptr prospective_options_local @@ -1317,11 +1317,8 @@ set_disassembler_options (const char *prospective_op= tions) to reset their disassembler options to NULL. */ if (options =3D=3D NULL) { - if (disassembler_options !=3D NULL) - { - free (*disassembler_options); - *disassembler_options =3D NULL; - } + if (disassembler_options !=3D nullptr) + disassembler_options->clear (); return; } =20 @@ -1373,8 +1370,7 @@ set_disassembler_options (const char *prospective_opt= ions) } } =20 - free (*disassembler_options); - *disassembler_options =3D xstrdup (options); + *disassembler_options =3D options; } =20 static void diff --git a/gdb/gdbarch-gen.h b/gdb/gdbarch-gen.h index 13dd0ed5d5e..ebcff80bb9e 100644 --- a/gdb/gdbarch-gen.h +++ b/gdb/gdbarch-gen.h @@ -1715,8 +1715,8 @@ extern void set_gdbarch_addressable_memory_unit_size = (struct gdbarch *gdbarch, g extern const char * gdbarch_disassembler_options_implicit (struct gdbarch = *gdbarch); extern void set_gdbarch_disassembler_options_implicit (struct gdbarch *gdb= arch, const char * disassembler_options_implicit); =20 -extern char ** gdbarch_disassembler_options (struct gdbarch *gdbarch); -extern void set_gdbarch_disassembler_options (struct gdbarch *gdbarch, cha= r ** disassembler_options); +extern std::string * gdbarch_disassembler_options (struct gdbarch *gdbarch= ); +extern void set_gdbarch_disassembler_options (struct gdbarch *gdbarch, std= ::string * disassembler_options); =20 extern const disasm_options_and_args_t * gdbarch_valid_disassembler_option= s (struct gdbarch *gdbarch); extern void set_gdbarch_valid_disassembler_options (struct gdbarch *gdbarc= h, const disasm_options_and_args_t * valid_disassembler_options); diff --git a/gdb/gdbarch.c b/gdb/gdbarch.c index 80a04bf0caf..9319571deba 100644 --- a/gdb/gdbarch.c +++ b/gdb/gdbarch.c @@ -252,7 +252,7 @@ struct gdbarch gdbarch_gnu_triplet_regexp_ftype *gnu_triplet_regexp =3D default_gnu_tri= plet_regexp; gdbarch_addressable_memory_unit_size_ftype *addressable_memory_unit_size= =3D default_addressable_memory_unit_size; const char * disassembler_options_implicit =3D 0; - char ** disassembler_options =3D 0; + std::string * disassembler_options =3D 0; const disasm_options_and_args_t * valid_disassembler_options =3D 0; gdbarch_type_align_ftype *type_align =3D default_type_align; gdbarch_get_pc_address_flags_ftype *get_pc_address_flags =3D default_get= _pc_address_flags; @@ -5362,7 +5362,7 @@ set_gdbarch_disassembler_options_implicit (struct gdb= arch *gdbarch, gdbarch->disassembler_options_implicit =3D disassembler_options_implicit; } =20 -char ** +std::string * gdbarch_disassembler_options (struct gdbarch *gdbarch) { gdb_assert (gdbarch !=3D NULL); @@ -5374,7 +5374,7 @@ gdbarch_disassembler_options (struct gdbarch *gdbarch) =20 void set_gdbarch_disassembler_options (struct gdbarch *gdbarch, - char ** disassembler_options) + std::string * disassembler_options) { gdbarch->disassembler_options =3D disassembler_options; } diff --git a/gdb/gdbarch_components.py b/gdb/gdbarch_components.py index 762d48a0187..7d913ade621 100644 --- a/gdb/gdbarch_components.py +++ b/gdb/gdbarch_components.py @@ -2711,7 +2711,7 @@ Functions for allowing a target to modify its disasse= mbler options. ) =20 Value( - type=3D"char **", + type=3D"std::string *", name=3D"disassembler_options", invalid=3DFalse, printer=3D"pstring_ptr (gdbarch->disassembler_options)", diff --git a/gdb/mips-tdep.c b/gdb/mips-tdep.c index 107d06191b4..67bed1d2ba0 100644 --- a/gdb/mips-tdep.c +++ b/gdb/mips-tdep.c @@ -213,7 +213,7 @@ struct target_desc *mips_tdesc_gp32; struct target_desc *mips_tdesc_gp64; =20 /* The current set of options to be passed to the disassembler. */ -static char *mips_disassembler_options; +static std::string mips_disassembler_options; =20 /* Implicit disassembler options for individual ABIs. These tell libopcodes to use general-purpose register names corresponding diff --git a/gdb/riscv-tdep.c b/gdb/riscv-tdep.c index 68ef3233e8d..604a19fe2a6 100644 --- a/gdb/riscv-tdep.c +++ b/gdb/riscv-tdep.c @@ -133,7 +133,7 @@ static const char *riscv_feature_name_virtual =3D "org.= gnu.gdb.riscv.virtual"; static const char *riscv_feature_name_vector =3D "org.gnu.gdb.riscv.vector= "; =20 /* The current set of options to be passed to the disassembler. */ -static char *riscv_disassembler_options; +static std::string riscv_disassembler_options; =20 /* Cached information about a frame. */ =20 diff --git a/gdb/rs6000-tdep.c b/gdb/rs6000-tdep.c index c8450345be2..3157213cb1f 100644 --- a/gdb/rs6000-tdep.c +++ b/gdb/rs6000-tdep.c @@ -130,7 +130,7 @@ && (regnum) < (tdep)->ppc_cefpr0_regnum + ppc_num_efprs) =20 /* Holds the current set of options to be passed to the disassembler. */ -static char *powerpc_disassembler_options; +static std::string powerpc_disassembler_options; =20 /* The list of available "set powerpc ..." and "show powerpc ..." commands. */ diff --git a/gdb/s390-tdep.c b/gdb/s390-tdep.c index 75983550a5c..174338e1885 100644 --- a/gdb/s390-tdep.c +++ b/gdb/s390-tdep.c @@ -45,7 +45,7 @@ #include "features/s390x-linux64.c" =20 /* Holds the current set of options to be passed to the disassembler. */ -static char *s390_disassembler_options; +static std::string s390_disassembler_options; =20 /* Breakpoints. */