From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f202.google.com (mail-pl1-f202.google.com [209.85.214.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 871812472BF for ; Mon, 29 Sep 2025 19:08:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.202 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759172930; cv=none; b=f53dCHTvtj0vU26WOCzwsDP/CcmJKCqjgggpEIX2f/C+9LYfhZzSpK5uL8vFNASotdfxaiafgvbxoPPVNEMvwzaBuhxmmgG/wd80iXxK/5YwJrN9mgzs6E1Ibhb1BGqz5Yf++rl2jcd0FvBSV3d+cwrgYc1m1TUQ6ATtP9FzEog= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759172930; c=relaxed/simple; bh=UcoUgqD5Q/SkkemokbzVJ+iRz4obkkfuwAK0b461Crs=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Content-Type; b=m0lu9+1fEM/9tHIsziWmf747CnFulHkayNPNc1soERigcrrcsWPxDys6uvVchXngUMkeT8g6Eqlqd+UXza6YGGAZ6tgwNbotWSacoreqyfhZZ+zHvRpCJE4oPoJq6m0NuQG/BOsI/UDMDakNkGNImu4ckVDSt5q4MYYHMg+hIR4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=RcmmtYL+; arc=none smtp.client-ip=209.85.214.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="RcmmtYL+" Received: by mail-pl1-f202.google.com with SMTP id d9443c01a7336-27eeb9730d9so40563225ad.0 for ; Mon, 29 Sep 2025 12:08:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1759172928; x=1759777728; darn=lists.linux.dev; h=to:from:subject:message-id:references:mime-version:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=dDZ0M0yiFaINDqNMQn65gDjbecQUNUjlpaqlu/RqK2I=; b=RcmmtYL+hUpbR1JevHR+FJMvYIbq36RC9iuyhyvcFhPBONq7das1G8k87MJAktOUwR 0Zq3OwCceFWVAXSIlz0p0YVgw+c3WXGYTk+w6FzRPz5nEJpGmhHGj4UGBXo1Ks/7YVE3 KhdtYiEEdxuuOwsOd1vSvjyC4KEFB3JckRzewfkdn/LCx7oYSUzozIQF4AUx39/GDF0L sJrG69xY34C3aZNt4B5VFE09F5zBAZbCjebpBOTFMLNiufpsboKcGkAksFUuUKm2Wzum dPQSntU/mNvlHnkuDodFpIz7aqfh90Jvjaed2fU6GtkQ5zU7q3eA3mxb1OCfoWIf9DEO sEHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759172928; x=1759777728; h=to:from:subject:message-id:references:mime-version:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=dDZ0M0yiFaINDqNMQn65gDjbecQUNUjlpaqlu/RqK2I=; b=j/I46xDAgJ6D1n3TX1M6U/bdQSKpowMuYc/rAPoysSfUnOqvksN3pjmyLr+niropYL cnXpTtP9PM3+blij8w+t8+iGkctRjOlJ/Q2Ve0unXi58fid6jEk9iYvoubePNOd2JcLf 9Fqkqj6dZT/XMAbYWpi5YhyzWLyRgMXRpjkdmkMfAY5M2atCZDDxbnmKkV4mtY+EfBBw 8exiAwMFLZcIr9udUDu/Q/aUfk/mPtxYnhPVUQfHClrbbXkrTrnDDvQ0ktamqjQUMuGb 9r0miUx+Nk0wbOJJCT8K2RrO94kZG9B7AN6cFGSwBwPzuVIv6rHAxPw/91PnfQ2PbNRj EQaw== X-Forwarded-Encrypted: i=1; AJvYcCVrEfJeQHE8j9n658X08kL9iPQ7PunJV4ZswKYjGtTl4lhiD0xJz35cTiXcrFL1XYxqZYPX@lists.linux.dev X-Gm-Message-State: AOJu0YwnMB8STK6eAGxCuvqiUsG/5wqtX9qHW8MXRQIw87S5aaIy9+su mi/8B/+6gqDCKv4tkWk3JgYnxYeo516EullGWFhPO85wCBWbRQRDJQrVJpjTXZ5CfalFTLHQx5Q UQYGfjG4LTA== X-Google-Smtp-Source: AGHT+IG/L8wfV8J+ckgrkT+kb7TWIc9uNlSseJshUzk1fQYWWvGgp/ovT6W4Pa0aDHCOn4arQ2uxbLWCwwft X-Received: from pjber8.prod.google.com ([2002:a17:90a:f6c8:b0:32b:6136:95b9]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90a:e7d0:b0:338:2c90:1540 with SMTP id 98e67ed59e1d1-3382c90186cmr5122050a91.20.1759172926884; Mon, 29 Sep 2025 12:08:46 -0700 (PDT) Date: Mon, 29 Sep 2025 12:07:55 -0700 In-Reply-To: <20250929190805.201446-1-irogers@google.com> Precedence: bulk X-Mailing-List: llvm@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250929190805.201446-1-irogers@google.com> X-Mailer: git-send-email 2.51.0.570.gb178f27e6d-goog Message-ID: <20250929190805.201446-6-irogers@google.com> Subject: [PATCH v6 05/15] perf capstone: Remove open_capstone_handle From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Nathan Chancellor , Nick Desaulniers , Bill Wendling , Justin Stitt , Charlie Jenkins , Eric Biggers , "Masami Hiramatsu (Google)" , James Clark , Collin Funk , "Dr. David Alan Gilbert" , Li Huafei , Athira Rajeev , Stephen Brennan , Dmitry Vyukov , Alexandre Ghiti , Haibo Xu , Andi Kleen , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, bpf@vger.kernel.org, llvm@lists.linux.dev, Song Liu Content-Type: text/plain; charset="UTF-8" open_capstone_handle is similar to capstone_init and used only by symbol__disassemble_capstone. symbol__disassemble_capstone_powerpc already uses capstone_init, transition symbol__disassemble_capstone and eliminate open_capstone_handle. Signed-off-by: Ian Rogers --- tools/perf/util/capstone.c | 34 ++++++---------------------------- 1 file changed, 6 insertions(+), 28 deletions(-) diff --git a/tools/perf/util/capstone.c b/tools/perf/util/capstone.c index dd58e574aa52..01e47d5c8e3e 100644 --- a/tools/perf/util/capstone.c +++ b/tools/perf/util/capstone.c @@ -137,33 +137,6 @@ ssize_t capstone__fprintf_insn_asm(struct machine *machine __maybe_unused, #endif } -#ifdef HAVE_LIBCAPSTONE_SUPPORT -static int open_capstone_handle(struct annotate_args *args, bool is_64bit, csh *handle) -{ - struct annotation_options *opt = args->options; - cs_mode mode = is_64bit ? CS_MODE_64 : CS_MODE_32; - - /* TODO: support more architectures */ - if (!arch__is(args->arch, "x86")) - return -1; - - if (cs_open(CS_ARCH_X86, mode, handle) != CS_ERR_OK) - return -1; - - if (!opt->disassembler_style || - !strcmp(opt->disassembler_style, "att")) - cs_option(*handle, CS_OPT_SYNTAX, CS_OPT_SYNTAX_ATT); - - /* - * Resolving address operands to symbols is implemented - * on x86 by investigating instruction details. - */ - cs_option(*handle, CS_OPT_DETAIL, CS_OPT_ON); - - return 0; -} -#endif - #ifdef HAVE_LIBCAPSTONE_SUPPORT static void print_capstone_detail(cs_insn *insn, char *buf, size_t len, struct annotate_args *args, u64 addr) @@ -309,6 +282,7 @@ int symbol__disassemble_capstone(const char *filename __maybe_unused, cs_insn *insn = NULL; char disasm_buf[512]; struct disasm_line *dl; + bool disassembler_style = false; if (args->options->objdump_path) return -1; @@ -333,7 +307,11 @@ int symbol__disassemble_capstone(const char *filename __maybe_unused, annotation_line__add(&dl->al, ¬es->src->source); - if (open_capstone_handle(args, is_64bit, &handle) < 0) + if (!args->options->disassembler_style || + !strcmp(args->options->disassembler_style, "att")) + disassembler_style = true; + + if (capstone_init(maps__machine(args->ms.maps), &handle, is_64bit, disassembler_style) < 0) goto err; needs_cs_close = true; -- 2.51.0.570.gb178f27e6d-goog