From patchwork Thu Mar 21 18:10:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 87467 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 919DB385829A for ; Thu, 21 Mar 2024 18:11:15 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mail-io1-xd30.google.com (mail-io1-xd30.google.com [IPv6:2607:f8b0:4864:20::d30]) by sourceware.org (Postfix) with ESMTPS id AA8923858D28 for ; Thu, 21 Mar 2024 18:10:35 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org AA8923858D28 Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=adacore.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org AA8923858D28 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::d30 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1711044638; cv=none; b=sHONFpGE01Zth/eu/SKrbhrJoJKdKjl0c66Pf2XflX8ItwSJZJBB0HPDGhzh2Di3YAY1QpBY1cGhnl1bXdSQ1Qch69WeB/HIqemk1p1/4z1B3avzeFAjSyFPaz/cxOjdCu4M/PP5Wb9HvfeFqk+lp4dQ0Lr92gerN90Rv/qVQU0= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1711044638; c=relaxed/simple; bh=jCqj0MkVhdtlLoeTwdZ+V+NLEDn8c2LfT4u35PXJmKI=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=lWygq1ZS74G19l3+cwkwHGiXLBsQH00zJ4wOhfU9iSIervZPYy84ZVxSIKuiJVFu7roet2MxTSUjwj96AN2s7v3QMuJA2FdTSvkpuLbxX4xn2YrNwn5jEVFu0b9CAyNtqP5A/jtC8YtRIj8e/jm9Wp3bk75OhpgQ0OCQmNWCpOk= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-io1-xd30.google.com with SMTP id ca18e2360f4ac-7cf25c1ee7aso52925139f.2 for ; Thu, 21 Mar 2024 11:10:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1711044635; x=1711649435; darn=sourceware.org; h=to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=yFPeO/t5nCKesMX1oEwIsOVYVXhw4sMZWkdoPFxQzkA=; b=ENKWGn5m9qrcrLbdA5TXK7OyFTxfYRLsTtu47/eaOzOm0vpyEYpfNS39IfSw8a+afZ uwXq8l0cawguA1TZewfAuG9gjyhX3DJzkwXpqA7PxLRqHcW+pTtWhw3A9vvjd+Jq4jZT pIULBe2p0bO1J8cIYS72gAjjL+eqg3fDbwR/xPmtGUzyATESHqU999h/R6xEEMbYj5FW 2mjqjmCALgnAplQgQYm/QVufACs/R2A1zf81lltBhw0/iD4tUpyMXev2Pnmfrg6wlzyW rRJaGibSsk010AdRwuls31XzefUjwNsUBmxAiiQn1me6/T5eMD9bAs3WsKLo8c8I+HGI q7Bw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711044635; x=1711649435; h=to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=yFPeO/t5nCKesMX1oEwIsOVYVXhw4sMZWkdoPFxQzkA=; b=gcHvAqpm1jNKPuBJJIu9Rn8DaUi/LXyT0ObFBAqvUHx1gEQnPpZajETAZWKMmTN+n3 XrSjBl66/4W7DKRpdftXd/hznkk031ESWoSwss46TY7MDntZwCjp0QmJ0BoPOjvFqKuT zd/lt9rNLGpSACmdwxd07vAQtM4MqozFazw9zCdTAvQB/G+iUIRt8TK07RsGfJXsYp+C PaAd8q84JQKdWLxqI98CHSzpLSfTXzdecWa/dKEfAGCKOnoMkdXuuH20xnTmU5tc8d/0 JFt5btDRfxqt3Q0+OEATMJMtdxSFr2E8UNrcBqKw0RMSu1cS9gEsu5/oZNHc9VetnUZD 5S6A== X-Gm-Message-State: AOJu0YwBnWrk61WO4zRUKeKHCWt8hIxnytKWjoNsyGO47eznyMkFx8IT bnX4E5/OPwxwMkYv8Ksd5QD4UXJh+wIVFUG2bKXG5AEYS8NFLGpUY1UKu6Eg2uRjzy/7qQI/AfQ = X-Google-Smtp-Source: AGHT+IF7MvYhL9F3YtWQPtajNA9Q4LT6RMEbMxs0Zp5zws7fI/RPyaonuMKsJ70FK6iBBXTCfH/YSw== X-Received: by 2002:a6b:7d0a:0:b0:7cb:e510:c289 with SMTP id c10-20020a6b7d0a000000b007cbe510c289mr207493ioq.9.1711044634689; Thu, 21 Mar 2024 11:10:34 -0700 (PDT) Received: from localhost.localdomain (97-122-82-115.hlrn.qwest.net. [97.122.82.115]) by smtp.gmail.com with ESMTPSA id r23-20020a5e9517000000b007cf05417adbsm76582ioj.22.2024.03.21.11.10.34 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Mar 2024 11:10:34 -0700 (PDT) From: Tom Tromey Date: Thu, 21 Mar 2024 12:10:34 -0600 Subject: [PATCH 3/3] Use std::string for disassembler options MIME-Version: 1.0 Message-Id: <20240321-disassemble-cleanup-v1-3-77448506f4ab@adacore.com> References: <20240321-disassemble-cleanup-v1-0-77448506f4ab@adacore.com> In-Reply-To: <20240321-disassemble-cleanup-v1-0-77448506f4ab@adacore.com> To: gdb-patches@sourceware.org X-Mailer: b4 0.12.4 X-Spam-Status: No, score=-11.2 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org I noticed that the disassembler_options code uses manual memory management. It seemed simpler to replace this with std::string. --- 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 = } }; -static char *arc_disassembler_options = NULL; +static std::string arc_disassembler_options; /* 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 gdbarch_list *arches) = tdesc_architecture (info.target_desc); if (tdesc_arch != 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 = xstrdup ("cpu=arc601"); + arc_disassembler_options = "cpu=arc601"; break; case bfd_mach_arc_arc600: - arc_disassembler_options = xstrdup ("cpu=arc600"); + arc_disassembler_options = "cpu=arc600"; break; case bfd_mach_arc_arc700: - arc_disassembler_options = xstrdup ("cpu=arc700"); + arc_disassembler_options = "cpu=arc700"; 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 = xstrdup ("cpu=hs38_linux"); + arc_disassembler_options = "cpu=hs38_linux"; else - arc_disassembler_options = xstrdup ("cpu=em4_fpuda"); + arc_disassembler_options = "cpu=em4_fpuda"; break; default: - arc_disassembler_options = NULL; + arc_disassembler_options = ""; 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) } static const char * -pstring_ptr (char **string) +pstring_ptr (std::string *string) { - if (string == NULL || *string == NULL) + if (string == nullptr) return "(null)"; - return *string; + return string->c_str (); } /* 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[] = "fps", "cpsr" }; /* 24 25 */ /* Holds the current set of options to be passed to the disassembler. */ -static char *arm_disassembler_options; +static std::string arm_disassembler_options; /* Valid register name styles. */ static const char **valid_disassembly_styles; @@ -11042,7 +11042,7 @@ _initialize_arm_tdep () &setarmcmdlist, &showarmcmdlist, &setlist, &showlist); - arm_disassembler_options = xstrdup ("reg-names-std"); + arm_disassembler_options = "reg-names-std"; const disasm_options_t *disasm_options = &disassembler_options_arm ()->options; int num_disassembly_styles = 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 = gdbarch_disassembler_options (gdbarch); - if (disassembler_options == NULL) - return NULL; - return *disassembler_options; + std::string *disassembler_options = gdbarch_disassembler_options (gdbarch); + if (disassembler_options == nullptr || disassembler_options->empty ()) + return nullptr; + return disassembler_options->c_str (); } void set_disassembler_options (const char *prospective_options) { struct gdbarch *gdbarch = get_current_arch (); - char **disassembler_options = gdbarch_disassembler_options (gdbarch); + std::string *disassembler_options = gdbarch_disassembler_options (gdbarch); 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_options) to reset their disassembler options to NULL. */ if (options == NULL) { - if (disassembler_options != NULL) - { - free (*disassembler_options); - *disassembler_options = NULL; - } + if (disassembler_options != nullptr) + disassembler_options->clear (); return; } @@ -1373,8 +1370,7 @@ set_disassembler_options (const char *prospective_options) } } - free (*disassembler_options); - *disassembler_options = xstrdup (options); + *disassembler_options = options; } 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 *gdbarch, const char * disassembler_options_implicit); -extern char ** gdbarch_disassembler_options (struct gdbarch *gdbarch); -extern void set_gdbarch_disassembler_options (struct gdbarch *gdbarch, char ** disassembler_options); +extern std::string * gdbarch_disassembler_options (struct gdbarch *gdbarch); +extern void set_gdbarch_disassembler_options (struct gdbarch *gdbarch, std::string * disassembler_options); extern const disasm_options_and_args_t * gdbarch_valid_disassembler_options (struct gdbarch *gdbarch); extern void set_gdbarch_valid_disassembler_options (struct gdbarch *gdbarch, 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 = default_gnu_triplet_regexp; gdbarch_addressable_memory_unit_size_ftype *addressable_memory_unit_size = default_addressable_memory_unit_size; const char * disassembler_options_implicit = 0; - char ** disassembler_options = 0; + std::string * disassembler_options = 0; const disasm_options_and_args_t * valid_disassembler_options = 0; gdbarch_type_align_ftype *type_align = default_type_align; gdbarch_get_pc_address_flags_ftype *get_pc_address_flags = default_get_pc_address_flags; @@ -5362,7 +5362,7 @@ set_gdbarch_disassembler_options_implicit (struct gdbarch *gdbarch, gdbarch->disassembler_options_implicit = disassembler_options_implicit; } -char ** +std::string * gdbarch_disassembler_options (struct gdbarch *gdbarch) { gdb_assert (gdbarch != NULL); @@ -5374,7 +5374,7 @@ gdbarch_disassembler_options (struct gdbarch *gdbarch) void set_gdbarch_disassembler_options (struct gdbarch *gdbarch, - char ** disassembler_options) + std::string * disassembler_options) { gdbarch->disassembler_options = 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 disassembler options. ) Value( - type="char **", + type="std::string *", name="disassembler_options", invalid=False, printer="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; /* The current set of options to be passed to the disassembler. */ -static char *mips_disassembler_options; +static std::string mips_disassembler_options; /* 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 = "org.gnu.gdb.riscv.virtual"; static const char *riscv_feature_name_vector = "org.gnu.gdb.riscv.vector"; /* The current set of options to be passed to the disassembler. */ -static char *riscv_disassembler_options; +static std::string riscv_disassembler_options; /* Cached information about a frame. */ 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) /* Holds the current set of options to be passed to the disassembler. */ -static char *powerpc_disassembler_options; +static std::string powerpc_disassembler_options; /* 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" /* Holds the current set of options to be passed to the disassembler. */ -static char *s390_disassembler_options; +static std::string s390_disassembler_options; /* Breakpoints. */