From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-yb1-f201.google.com (mail-yb1-f201.google.com [209.85.219.201]) (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 EDB3B217719 for ; Wed, 22 Jan 2025 17:43:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737567806; cv=none; b=qepE3dzeALgLxxyfb4w3ZF5ZBbDPaVEMFJdlftt4GFqQTu3kmQ3b7QBQDAbifCd3i5KPPz2nwecFzzrfMcHidJWa3BbeAlUz1VnMlM4Pwr5Qj81V7VQbaMi9k6jJ6qusJHCLJl5vDnbfQdimDxWACRUjWmxYdPaYpymiHz7tIPs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737567806; c=relaxed/simple; bh=/6e4emTQAma3I/ECUbvp8eDgQ0XP3VoFcLmrxffX71Q=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=mm98vHNvoQ1HcdYEVl8a+atbWf5VSsHodvR/e1EtzGbmglc3oNJyRHx5NfiBhxZdEPYk8nQE3ZBErCNPiIOzwHTkSuFV/uhAESn4f2iI1CRA1qS+hJpmprLKAZ10RvnrmeziQyiZ7nBJnkTQ0iXhkDSFQCDXWhIwgDteI8YWX5o= 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=CQpqpQxZ; arc=none smtp.client-ip=209.85.219.201 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="CQpqpQxZ" Received: by mail-yb1-f201.google.com with SMTP id 3f1490d57ef6-e549e7072fbso14994412276.2 for ; Wed, 22 Jan 2025 09:43:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1737567804; x=1738172604; darn=lists.linux.dev; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=VogZlDmYyWqz8VLnX5mLueZuF1SFjnllQQUCqGSdoSM=; b=CQpqpQxZslDdB43KREVmdnKrYz3KAe/x2eO+uRM3iDwMm0oGiKbErcPQUGQCEZ+e2A e94XwzOZoQ6LM3f5q/hTgs1dynuV/IPU68/T7Gd8nonPhdqF2g0ZCXOAR4cXuU5OgZ53 SOIZSEOqHyobkn/r6YboICMqtY3ms9OKdL/eCevUAm2yQBzZpeZxtrdDd97X8BStvzXw aJTMLNqpxpURZM+JJgfTvECg4h4upk8a605Rwee/HWbuYFBWNOCmCfYgv7+Uf80/nizR 9Uv7gO1xke8HzYiSVp3uSC+nWOY8nVey+Bl1jsWDDGgyPeUBX2sUcZ2uCtwYBZe40VMi +mJg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737567804; x=1738172604; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=VogZlDmYyWqz8VLnX5mLueZuF1SFjnllQQUCqGSdoSM=; b=eo5EO8N31w8bPDLsbkh1otJrclzG1DtwBAbcS2tAil/F4nVRn+3Em0K2aADls6DouM i8izUXmoQLIGJuquKh404uQahyZBRbo5fgSSRkjkdr4Vi0TFwFHjxdrwE/p3tgvMffze FXKeXlnXJOm7jUHIEJYMwmY7PM1zrbPye6BB/EF/Oerwr7o0dWY4JXbVnbFyVKJOHN9U +MQdJiIAXAjEMEou83V6cuBuw0dB1/EAOSa/f+3hITNWkdjy4mHDHj41MCAe7ALRj68a d7tjVEvBruYE6MGXDLOOSTYMbh0kc6hn5a+w9xxEjJQh1mm3iuZ2uEExS8X4BJB2LALH cNcw== X-Forwarded-Encrypted: i=1; AJvYcCWO0nQeZulKqUg6Ua5wXUesGRvTStK7xwPYgp8aIzYpERXljSFuDgT4ejBM4x8AkmykO3k9@lists.linux.dev X-Gm-Message-State: AOJu0YxK2GGTZ0gj+tEENcdl/ZuvX8fi8ugf+pjp/bG2bzmCIza6vT6d f7r1BLWjWIBt5XbqKELE4ybAVdjVcjMpQfLww3/BU/vZKE6i3KXEGSFflFnGG3SPn5xGWBw2pU6 x4UsCww== X-Google-Smtp-Source: AGHT+IHkuY00040+mvLKGu21zh7GGvsLOIJdp3hWaxKfD0++kd9sPhyMqVnTMrrTJitRqM1oG5JXLSFmPL3k X-Received: from irogers.svl.corp.google.com ([2620:15c:2c5:11:807b:be79:d5c3:ee5c]) (user=irogers job=sendgmr) by 2002:a25:a469:0:b0:e57:41ff:5165 with SMTP id 3f1490d57ef6-e57b103232fmr44707276.2.1737567803903; Wed, 22 Jan 2025 09:43:23 -0800 (PST) Date: Wed, 22 Jan 2025 09:42:55 -0800 In-Reply-To: <20250122174308.350350-1-irogers@google.com> Message-Id: <20250122174308.350350-6-irogers@google.com> Precedence: bulk X-Mailing-List: llvm@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250122174308.350350-1-irogers@google.com> X-Mailer: git-send-email 2.48.1.262.g85cc9f2d1e-goog Subject: [PATCH v3 05/18] 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 , Kan Liang , Nathan Chancellor , Nick Desaulniers , Bill Wendling , Justin Stitt , Aditya Gupta , "Steinar H. Gunderson" , Charlie Jenkins , Changbin Du , "Masami Hiramatsu (Google)" , James Clark , Kajol Jain , Athira Rajeev , Li Huafei , Dmitry Vyukov , Andi Kleen , Chaitanya S Prakash , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, llvm@lists.linux.dev, Song Liu , bpf@vger.kernel.org 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 c0a6d94ebc18..c9845e4d8781 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.48.1.262.g85cc9f2d1e-goog