From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795383651; b=TnsaXlaFFOsaNVTjBZZ5s43hxONQO+ISVeXvNEItloVbkbNrrzCZoGZ523x6j6b14qxl 36K8pYIRhnqPqSYVuZn3dH1OjOlf20B/FRcp2NYaAgoGjmt2DcU9h+D33gTDhUooKiOnG WxdVfX0cRMVogqIuNuvGdZFaHwSYdSephmoopxe6QWeQ8adQiwwscQrDJ+laN+4UlMR5a TjxMFZJAqKeenoz3zAmgfKU26NAXPekKX85Vo7QyeicRC3KaqfuuGhvG/ddgsWBVA14LN 7pLzGpo+pUT8F2Aj2NFJRNlx4eg97DnmzA+NPQR3hYperbZVxxLaqoKm04rTiWmlV9Q== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795383651; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:MIME-Version:Content-Transfer-Encoding; bh=PKYLmHPn96TWds9ALdJsGGUruv58A496zNmgt2Inywo=; b=xNfpR2aaanTLTmdalFK5UHULovhAV7DqYGb0Uj95KIA2I8xKGScvAkxJcJmOz8e+Njbt ZhFn3QcnBv2o41DjtxOWpLW3Sj2MY0aNkxnH0d+0TDniq6lizHuRW3zuM8S5+FsUiujdp 0TmRczQg/ZcETkCDp0fL7ZgCXClFho+/h6DvX2kKD9vkQAMivafEys2PaKz5gqdU8aw+f F3Rf1o2ObChmsFxWJNAamtjZOoIg+eOqau06jX31+uPLMzU9tQZHaWe2586R5tBx/cNaa SafjTfTzpjGgNFUetK1D71zXenRupPW/gd1ecW+5OCKquWWaUBU5mCxoGjPPsnEemng== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=DZH3U+Pn; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 88907606A330; Sun, 22 Nov 2026 21:40:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=DZH3U+Pn Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7DA871F000C4; Sun, 22 Nov 2026 21:40:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1795383651; bh=PKYLmHPn96TWds9ALdJsGGUruv58A496zNmgt2Inywo=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=DZH3U+Pn9/oDH5xFif+XIqnni42OSgTnGE37XhugWSKX6DQYUM3vlifna2QQQAppP m5PMb03XC0jvXaG/qAqTSJf863CdKGs72+WEXAXP0eDbAm/U93el+ZEZO4H85l1pUz 5pAISJIh7hYgkxXKeHdDl+pYQDwOIpKC6ROAfTHar25dKjmDliyNkAm0myFNm6UhWq StRjd9exlfaa+dYMQCWuOX7YCnx7p03KRBPeocvwqdgNEsl1pwmHLzVTlwEsdx3L71 4K23rwrgF37peyLGl3lgZ7qeHoYqWeSltBUF+EAbw3CPKECZ1JDxNSCyVwppyHHOcp jKKtHMlG4dr0w== From: Arnaldo Carvalho de Melo To: Namhyung Kim Cc: Ingo Molnar , Thomas Gleixner , James Clark , Jiri Olsa , Ian Rogers , Adrian Hunter , Clark Williams , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Arnaldo Carvalho de Melo Subject: [PATCH v11 05/19] perf annotate-x86: Record immediates in a 64-bit field Date: Sun, 22 Nov 2026 18:40:11 -0300 Message-ID: <20261122214025.16769-6-acme@kernel.org> X-Mailer: git-send-email 2.56.1 In-Reply-To: <20261122214025.16769-1-acme@kernel.org> References: <20261122214025.16769-1-acme@kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Arnaldo Carvalho de Melo An x86 immediate is parsed into the int offset shared with displacements, so a constant wider than 32 bits is truncated to garbage that the register tracking then records as its value. Add a s64 imm_value to struct annotated_op_loc, fill it in extract_op_location_x86() with strtoull() and read it in the three places of update_insn_state_x86() that take an immediate as a constant. The displacement and the ARM64 and x86 %gs: immediates, which fit in 32 bits, stay in offset, and pointer offset tracking is unchanged. Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/annotate-arch/annotate-x86.c | 13 ++++++++----- tools/perf/util/annotate.h | 6 ++++-- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/tools/perf/util/annotate-arch/annotate-x86.c b/tools/perf/util/annotate-arch/annotate-x86.c index a975c39c3d6ce008..94c45806029ee670 100644 --- a/tools/perf/util/annotate-arch/annotate-x86.c +++ b/tools/perf/util/annotate-arch/annotate-x86.c @@ -341,7 +341,7 @@ static void update_insn_state_x86(struct type_state *state, tsr->lifetime_end = 0; if (src->imm) - imm_value = src->offset; + imm_value = src->imm_value; else if (has_reg_type(state, src->reg1) && state->regs[src->reg1].kind == TSR_KIND_CONST) imm_value = state->regs[src->reg1].imm_value; @@ -408,7 +408,7 @@ static void update_insn_state_x86(struct type_state *state, tsr->lifetime_end = 0; if (src->imm) - imm_value = src->offset; + imm_value = src->imm_value; else if (has_reg_type(state, src->reg1) && state->regs[src->reg1].kind == TSR_KIND_CONST) imm_value = state->regs[src->reg1].imm_value; @@ -589,7 +589,7 @@ static void update_insn_state_x86(struct type_state *state, if (src->imm) { tsr->kind = TSR_KIND_CONST; - tsr->imm_value = (s64)src->offset; + tsr->imm_value = src->imm_value; tsr->offset = 0; tsr->ok = true; @@ -967,8 +967,11 @@ static void extract_op_location_x86(const struct arch *arch, if (*s == arch->objdump.register_char) { op_loc->reg1 = arch__dwarf_regnum(arch, s); } else if (*s == arch->objdump.imm_char) { - op_loc->offset = strtol(s + 1, &p, 0); - if (p && p != s + 1) + const char *start = s + 1; + u64 imm = strtoull(start, &p, 0); + + op_loc->imm_value = imm; + if (p && p != start) op_loc->imm = true; } else if (*s == '-' || strstarts(s, "0x")) { u64 offset = strtoull(s, NULL, 0); diff --git a/tools/perf/util/annotate.h b/tools/perf/util/annotate.h index dc4fc8b1b320c1fb..2dc3fac81593a686 100644 --- a/tools/perf/util/annotate.h +++ b/tools/perf/util/annotate.h @@ -530,7 +530,8 @@ int arch__dwarf_regnum(const struct arch *arch, const char *str); * struct annotated_op_loc - Location info of instruction operand * @reg1: First register in the operand * @reg2: Second register in the operand - * @offset: Memory access offset in the operand + * @imm_value: Immediate value of an x86 operand + * @offset: Memory access offset, or an ARM64 or x86 %gs: immediate * @segment: Segment selector register * @addr_mode: Addressing mode, only valid if @mem_ref is true * @extend_type: Operand extension type (enum annotated_ext_type) @@ -538,11 +539,12 @@ int arch__dwarf_regnum(const struct arch *arch, const char *str); * @amount: Number of bits to shift * @mem_ref: Whether the operand accesses memory * @multi_regs: Whether the second register is used - * @imm: Whether the operand is an immediate value (in offset) + * @imm: Whether the operand is an immediate value */ struct annotated_op_loc { int reg1; int reg2; + s64 imm_value; int offset; u8 segment; u8 addr_mode; -- 2.56.1