From patchwork Thu Mar 21 18:10:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 87465 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 5678B3858286 for ; Thu, 21 Mar 2024 18:11:12 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mail-io1-xd2d.google.com (mail-io1-xd2d.google.com [IPv6:2607:f8b0:4864:20::d2d]) by sourceware.org (Postfix) with ESMTPS id 7281C3858C98 for ; Thu, 21 Mar 2024 18:10:34 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 7281C3858C98 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 7281C3858C98 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::d2d ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1711044637; cv=none; b=nD9SDRzLSCIZ3229l1XDnsx3KslDL18bsqcUovQy+L5pODf2jRjjGLv3AWPy5gDayByYD185/yGgJSQIZlf9bvmYny8sCRezqpnI4eOzcCPfjsgEL5iYhuamEYz4sZUQWxYx9AYfK1bmJJnP0Sbyo4o4y6hS/J8kYD5rtsxuPXY= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1711044637; c=relaxed/simple; bh=YWXqDbcTwxcNHRuLuL9aa4f8FxrV4/0ItdLUKuEU40k=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=yAmzUhZYlIBVPxwin/BrFuKi65DIJEf+WrTttseXHZ98bPeAqYG4FhHs8Tn7E2PYuYe8jioT9aOzLzgX33tt8FfZ2fuNhyhniZoTXDMImrabZCkgMLS1VzamPM9gI7xYuLgXUQpJX04Wf+t+ONJDDY8TCs3w0QdVx2O9+Uvlt3A= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-io1-xd2d.google.com with SMTP id ca18e2360f4ac-7cc0e0dba0fso57549739f.3 for ; Thu, 21 Mar 2024 11:10:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1711044633; x=1711649433; 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=Mkk4q1RTngNzpu/Z1SO5ct5LVIzhkfWXw3iCQRmvGIw=; b=MX6UV58GGYVzyH5qiTM1vCp4QkqUiZvb3nhRRLGG/yr2agj3B5BYFa5oBGxMHcSB4A 5eIf80eQ7HY972r4LJ4AhALAWQBAtVZZp24uddq4sH0Q2IRCp2uxnVnBfSF0Kyq9XKb2 b/YV76TuxhQ/4WAk3BPPTmibQku/mQAoRLJainl7Fa4ndqN6RO30FT8SqhfFqZB60D9W fr5Snkm6mbhF67zDjBsh6gQ3WFX2rmuHvfPKgxX1MBbBuZPqAtqHcjY8PlCbVxAKkUhc /5PWJP8iPzFl13+rC9CXbmR++uZkKzWPFjNj4iMd2/rc6jFe7o1oCg9leToZW0E0Lz7E ESuA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711044633; x=1711649433; 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=Mkk4q1RTngNzpu/Z1SO5ct5LVIzhkfWXw3iCQRmvGIw=; b=O6OBF7B6uJZrCMPsE24GFhpTlnu9ekgkH7ycL9m1qD1Mllp273qHz0qsdZ894//Pyo 0RBbis8VKP8k3+cUU7fWhx+BPGb3/aIVpK2K3b0+Qcp5hpq85KLWn8xg9gPnJPp3lHlT c1FUEdNFMd1MbCMatKlJA0XLSP4YpECVh1hjAuU/TOFBAVgbxoNaiLYypARdXArER9Iy 6MS3SGkmcWN+BBM8DQHPe4NkfRykuEoNiIKmfOlAVYHYCP+4Fp11z94MsKnVBJM/56dv 7diVoxkYtRD4eDF2Mmz3zcmYECXot5j0YfEkPr+j/zeXS9KbFVQ5Vv1+ZEjFwYNf9dkf X6Nw== X-Gm-Message-State: AOJu0YzytDkgD+bh7zDh+6MaPYK3wODxz5Riyf1WAdlFhZiYnPCdwAZy a6qb1FiubZNrslFeeDlnFTXhL1tlLZPWtM15YTW+5wPntt6FwG+emvsKTJeopkn0whpOwVGVTVA = X-Google-Smtp-Source: AGHT+IF5XYDdqvXScxjNx8jjLzxY7ImFdtWInXNtCMDv7ZGVS55Exy5KHkKwS62ym+zwwoXJE3Lt+A== X-Received: by 2002:a6b:7209:0:b0:7d0:22b7:5e81 with SMTP id n9-20020a6b7209000000b007d022b75e81mr267671ioc.1.1711044633683; Thu, 21 Mar 2024 11:10:33 -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.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Mar 2024 11:10:33 -0700 (PDT) From: Tom Tromey Date: Thu, 21 Mar 2024 12:10:32 -0600 Subject: [PATCH 1/3] Constify get_disassembler_options MIME-Version: 1.0 Message-Id: <20240321-disassemble-cleanup-v1-1-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 This changes get_disassembler_options to return a const char *. --- gdb/arm-tdep.c | 2 +- gdb/disasm.c | 2 +- gdb/disasm.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c index 3b4ae15df07..82b06f63fcb 100644 --- a/gdb/arm-tdep.c +++ b/gdb/arm-tdep.c @@ -9640,7 +9640,7 @@ show_disassembly_style_sfunc (struct ui_file *file, int from_tty, struct cmd_list_element *c, const char *value) { struct gdbarch *gdbarch = get_current_arch (); - char *options = get_disassembler_options (gdbarch); + const char *options = get_disassembler_options (gdbarch); const char *style = ""; int len = 0; const char *opt; diff --git a/gdb/disasm.c b/gdb/disasm.c index 15d641cfc1f..5bab5cf6199 100644 --- a/gdb/disasm.c +++ b/gdb/disasm.c @@ -1291,7 +1291,7 @@ gdb_buffered_insn_length (struct gdbarch *gdbarch, return result; } -char * +const char * get_disassembler_options (struct gdbarch *gdbarch) { char **disassembler_options = gdbarch_disassembler_options (gdbarch); diff --git a/gdb/disasm.h b/gdb/disasm.h index a2251445707..9282632b270 100644 --- a/gdb/disasm.h +++ b/gdb/disasm.h @@ -385,7 +385,7 @@ extern int gdb_buffered_insn_length (struct gdbarch *gdbarch, /* Returns GDBARCH's disassembler options. */ -extern char *get_disassembler_options (struct gdbarch *gdbarch); +extern const char *get_disassembler_options (struct gdbarch *gdbarch); /* Sets the active gdbarch's disassembler options to OPTIONS. */