From patchwork Wed Apr 12 19:03:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josh Poimboeuf X-Patchwork-Id: 82648 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp562301vqo; Wed, 12 Apr 2023 12:40:53 -0700 (PDT) X-Google-Smtp-Source: AKy350bxJLnPw3p8/SpNcN5I5dJ3a+Jr/vDsjQkbk90qsSJ05B6Y0d8XStmwqY+QagDUXL/1UxRq X-Received: by 2002:a05:6a20:3392:b0:db:9131:dd7c with SMTP id f18-20020a056a20339200b000db9131dd7cmr7441199pzd.39.1681328453394; Wed, 12 Apr 2023 12:40:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681328453; cv=none; d=google.com; s=arc-20160816; b=WMiWkcJ/hItIs2Gre1iVAJmc0n4cf75DZRhP0trjgul2FWB4oWobWf1EMIXPDo0X3n 6dxkqJjDPW0TFaD9H/cnt75H6GMOkn6v4w8eNXEio+CijnTnHsuWOecNy/piIeR8fUH3 8p8V5z9nSL1o/KqfD+WL7Y6HBG2b8MwxI7lcgioSnvTo19crjOVbPZd+60j3iduy9tMs 3vSo6oFKExQ/CLcQxCL3UPbFyCD3MDahkI4kL/uie2SgRJa2LLJ5LauJfOZAfMfn9zhu tIbaI22SA7Xzf6Q/N8WD5fS+MDyuoNgiOufaNFrDT/e66lWlJOGm7OEIviza2dHr0A2X 0sNg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=efWCjtcUE4xvsAo1zHAGiD8hgTPm2YAyNz/54vJOJ4M=; b=0FmHxW6ilf9BtXK4utLAdcCaDwyK+54OwoFzeErgMeFVHdxbOhhIXmhUGRzlbAILSI P53TsI3A54QT0g2UDAoBTokAOvYXBLeX1J5mgiLj1H6Lo4n6WNkPDqU6kQhoDhCDQnNh zN+i/ZJp6L1yGH85ZkHwbKLgli1wwuevDHb3a3YoDC+oIkqsCep5sAPXc9FY16/TSwk8 O/2fEl5NgdqX7N9z0HIlOVz9J4O7qnIlmdKsyv2YN2tnkWBpUaOsAE+qpJ3eGl/86O6q XzgwvGgh5BjLfIVzos3GyU7/mzPzO/3Fl/wa+R45O7kGvpUUN9YPzfkQeVKh2e7omMWH 9giQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=VIDRrUvh; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id w26-20020aa7955a000000b0062b90348402si1557606pfq.106.2023.04.12.12.40.38; Wed, 12 Apr 2023 12:40:53 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=VIDRrUvh; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229917AbjDLTDv (ORCPT + 99 others); Wed, 12 Apr 2023 15:03:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44600 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229491AbjDLTDs (ORCPT ); Wed, 12 Apr 2023 15:03:48 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C7B39E6F for ; Wed, 12 Apr 2023 12:03:46 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 5A49C634D3 for ; Wed, 12 Apr 2023 19:03:46 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8DC60C4339B; Wed, 12 Apr 2023 19:03:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1681326225; bh=dAkEqTLkgIq2vIL65t1W7EqLc3ca55ao4IifwBU07ho=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VIDRrUvhwOjhD0Wf0t/If1fqIzu3GuH1BxHN/oPfMgfHOhaeEUq7vZAcPQK1QyZqB OrA7U4S1khWVVCxKFyPXum7dSlqvnBhgUbUamtMej0cYdEnnSUTfdt4zceP+STw3oR CmAiZzEhtdCBi+QELrZ8SItETeZ71Q1EZu5vYjHt9XX8TpemPjQxcIDEcGo+0Ogzj6 0lgL//aRZYDjH1zHS/femqKSKM2wUCA1ntPKMhJLmWtkykHOaRqgXGI0C7WUrLIGdh Iox4rongGMbsUdoN+3QKewQQVHPdI5fNdhIu3XqSVv3f6ofLGLO8zXSG8HiJOGoynm xwnYqwGgC20Zg== From: Josh Poimboeuf To: x86@kernel.org Cc: linux-kernel@vger.kernel.org, Peter Zijlstra , Miroslav Benes Subject: [PATCH v2 1/9] scripts/objdump-func: Support multiple functions Date: Wed, 12 Apr 2023 12:03:16 -0700 Message-Id: <0bf5f4f5978660985037b24c6db49b114374eb4d.1681325924.git.jpoimboe@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Content-type: text/plain X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1763000664506418083?= X-GMAIL-MSGID: =?utf-8?q?1763000664506418083?= Allow specifying multiple functions on the cmdline. Note this removes the secret EXTRA_ARGS feature. While at it, spread out the awk to make it more readable. Signed-off-by: Josh Poimboeuf --- scripts/objdump-func | 34 +++++++++++++++++++++++++--------- 1 file changed, 25 insertions(+), 9 deletions(-) diff --git a/scripts/objdump-func b/scripts/objdump-func index 4eb463dd9f52..7b15b873d0e2 100755 --- a/scripts/objdump-func +++ b/scripts/objdump-func @@ -3,7 +3,7 @@ # # Disassemble a single function. # -# usage: objdump-func +# usage: objdump-func [ ...] set -o errexit set -o nounset @@ -13,17 +13,33 @@ OBJDUMP="${CROSS_COMPILE:-}objdump" command -v gawk >/dev/null 2>&1 || die "gawk isn't installed" usage() { - echo "usage: objdump-func " >&2 + echo "usage: objdump-func [ ...]" >&2 exit 1 } [[ $# -lt 2 ]] && usage OBJ=$1; shift -FUNC=$1; shift - -# Secret feature to allow adding extra objdump args at the end -EXTRA_ARGS=$@ - -# Note this also matches compiler-added suffixes like ".cold", etc -${OBJDUMP} -wdr $EXTRA_ARGS $OBJ | gawk -M -v f=$FUNC '/^$/ { P=0; } $0 ~ "<" f "(\\..*)?>:" { P=1; O=strtonum("0x" $1); } { if (P) { o=strtonum("0x" $1); printf("%04x ", o-O); print $0; } }' +FUNCS=("$@") + +${OBJDUMP} -wdr $OBJ | gawk -M -v _funcs="${FUNCS[*]}" ' + BEGIN { split(_funcs, funcs); } + /^$/ { func_match=0; } + /<.*>:/ { + f = gensub(/.*<(.*)>:/, "\\1", 1); + for (i in funcs) { + # match compiler-added suffixes like ".cold", etc + if (f ~ "^" funcs[i] "(\\..*)?") { + func_match = 1; + base = strtonum("0x" $1); + break; + } + } + } + { + if (func_match) { + addr = strtonum("0x" $1); + printf("%04x ", addr - base); + print; + } + }'