From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D8CF5D4A5F5 for ; Sat, 17 Jan 2026 05:30:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:To:From:Subject:Message-ID:References: Mime-Version:In-Reply-To:Date:Reply-To:Cc:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=TxavT/3TvBr1+LhAPsyFb6eDs1H54OrqPTaCGnMdOdA=; b=qa93v/CkqLsKyq a0ywRkH9zRFfzK9OVGERtbrtmubJPLHhM97L9PbT/mSnd/LxwN+weRw5bT738lCHbcNHCKcBw2FM5 d15sgq7pScPLNqD9hNXLkJbh73c27fXTUdrfW0DA1sQmBySrJU7LAqf1oIfgafGqE6GZO56RWwqlY ztqibsi0HaOKq2z86CZHZfk+brlWnFb+IzvNbeQIYdRmUNKfVyTAQaEnILvwvHUG6pILrB1kbmwqi i98WN+MZQYtX8nFUcrtWn7VKwgjYcHJuXbAz67G045SMIl/o4xti6HsTflAIdCfWAUFutgCgBchDD 900H09O5tjoQ1U6s4KSA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1vgysy-0000000FF8e-3mBI; Sat, 17 Jan 2026 05:30:08 +0000 Received: from mail-dy1-x1349.google.com ([2607:f8b0:4864:20::1349]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1vgysW-0000000FEYN-2S0Z for linux-riscv@lists.infradead.org; Sat, 17 Jan 2026 05:29:41 +0000 Received: by mail-dy1-x1349.google.com with SMTP id 5a478bee46e88-2b6ad399cd8so4788576eec.1 for ; Fri, 16 Jan 2026 21:29:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1768627779; x=1769232579; darn=lists.infradead.org; h=to:from:subject:message-id:references:mime-version:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=ZVnccFhyVIdPmX1GN08af1KDJO30zSaL9HTGsky0Apo=; b=qlseyCsGXgrDdYdUl+gWspZW9PcPNLFjyXhnauCyh6ZL1HveiSqMNFYvr21CK4Uh8L gBk+UfHK3M0fq8dUUlY38nKlYxFzBzRLejP1HI4Zfujf1+1/OSwd3EIghdKgiHwwHeHh 8MXGpxXNEEklvNOu2sre/JvJZVEBjYa3tHaudWjYCPUv7n80hN0O9LMGrFcY9kTZu8mu b2zobzTkKAa6k6AqAb92wystX4LpFOZ88/nNb9CpI/F669UlhUxsgFJJuGGJcec15lFi z+gmG606M3eWKa8jDjWkOwXCRJ0ei+RSar1XVxCseryzZTREXcTOoj8K101dIbcS7nmd MAGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768627779; x=1769232579; 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=ZVnccFhyVIdPmX1GN08af1KDJO30zSaL9HTGsky0Apo=; b=v6mefsaAE/VthArV10DocRyWKw5CbvjBoiXooHq+dI5PT1oSbafL/nQMkVUnMoZ4R9 U2xZ6Qsit04phJLAIsa3Im0BgoALJs+N2PaO3C5HZPdiKRAG/4vB5SruyFPcSffPwUvu f83oc7XZlXsBCluyCZjMCUpOTGHNCqVrDc9LBPFHDq0BQo23J3QZTcztuLFtq6r7CA1q r2K8Qnu7XedLBQAB/59pduwh3yevhZEriXeD351TyWGxwwWPB+D7dyJsTtgFSax+SzZu vJiugciGlMO6QOyCK409bM4gBpPeYCD8TMCOeHNECPu20Zs02uZ6d55Li7/o0Xz/KZzS DLFA== X-Forwarded-Encrypted: i=1; AJvYcCVR+/QFegStn77eK1djnFSpkMCg/hvsg9kE2k81pe6XLxIAKmZYRDMht5PO98KQA71WBFszlVT3860ObA==@lists.infradead.org X-Gm-Message-State: AOJu0YwPM/RSEkfPXOgFX5H8UrfjMD1YQFZrt3fIvkXueNOiUk8eo1jR uFJzlT0fKaRqucC30CX1zYLmE7sPM2ekJH1P9QzlzQOReZSug91YN4v3PuCUsgpjMN+Y36D9fgr Dza422pQjpQ== X-Received: from dybqu3.prod.google.com ([2002:a05:7301:6583:b0:2b6:b139:8515]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7300:cc14:b0:2b0:5696:26c0 with SMTP id 5a478bee46e88-2b6b4e28165mr5422981eec.2.1768627779350; Fri, 16 Jan 2026 21:29:39 -0800 (PST) Date: Fri, 16 Jan 2026 21:28:37 -0800 In-Reply-To: <20260117052849.2205545-1-irogers@google.com> Mime-Version: 1.0 References: <20260117052849.2205545-1-irogers@google.com> X-Mailer: git-send-email 2.52.0.457.g6b5491de43-goog Message-ID: <20260117052849.2205545-12-irogers@google.com> Subject: [PATCH v1 11/23] perf dwarf-regs: Clean up x86 dwarf_regnum code From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Jiri Olsa , Ian Rogers , Adrian Hunter , James Clark , John Garry , Will Deacon , Leo Yan , Guo Ren , Paul Walmsley , Palmer Dabbelt , Albert Ou , Alexandre Ghiti , Shimin Guo , Athira Rajeev , Stephen Brennan , Howard Chu , Thomas Falcon , Andi Kleen , "Dr. David Alan Gilbert" , Dmitry Vyukov , "=?UTF-8?q?Krzysztof=20=C5=81opatowski?=" , Chun-Tse Shao , Aditya Bodkhe , Haibo Xu , Sergei Trofimovich , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-csky@vger.kernel.org, linux-riscv@lists.infradead.org, Mark Wielaard X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260116_212940_647394_6B974237 X-CRM114-Status: GOOD ( 16.32 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org The i386 and x86-64 register numbers differ on x86, but previously x86 was a single arch string and so this couldn't be handled. The transition to using ELF EM_* values means we can translate x86 registers correctly for either the x86-64 dwarf register mappings (from the System V ABI) or i386 register mappings. Correct the mappings. Signed-off-by: Ian Rogers --- .../util/dwarf-regs-arch/dwarf-regs-x86.c | 133 ++++++++++++++++-- tools/perf/util/dwarf-regs.c | 5 +- tools/perf/util/include/dwarf-regs.h | 3 +- 3 files changed, 129 insertions(+), 12 deletions(-) diff --git a/tools/perf/util/dwarf-regs-arch/dwarf-regs-x86.c b/tools/perf/util/dwarf-regs-arch/dwarf-regs-x86.c index 7a55c65e8da6..f0c42e4d7423 100644 --- a/tools/perf/util/dwarf-regs-arch/dwarf-regs-x86.c +++ b/tools/perf/util/dwarf-regs-arch/dwarf-regs-x86.c @@ -13,10 +13,65 @@ struct dwarf_regs_idx { const char *name; - int idx; + int dwarf_regnum; }; -static const struct dwarf_regs_idx x86_regidx_table[] = { +static const struct dwarf_regs_idx i386_regidx_table[] = { + { "eax", 0 }, { "ax", 0 }, { "al", 0 }, + { "ecx", 1 }, { "cx", 1 }, { "cl", 1 }, + { "edx", 2 }, { "dx", 2 }, { "dl", 2 }, + { "ebx", 3 }, { "bx", 3 }, { "bl", 3 }, + { "esp", 4 }, { "sp", 4 }, { "$stack", 4}, + { "ebp", 5 }, { "bp", 5 }, + { "esi", 6 }, { "si", 6 }, + { "edi", 7 }, { "di", 7 }, + // 8 - Return Address RA + { "eflags", 9}, { "flags", 9}, + // 10 - reserved + { "st0", 11}, + { "st1", 12}, + { "st2", 13}, + { "st3", 14}, + { "st4", 15}, + { "st5", 16}, + { "st6", 17}, + { "st7", 18}, + // 19-20 - reserved + { "xmm0", 21}, + { "xmm1", 22}, + { "xmm2", 23}, + { "xmm3", 24}, + { "xmm4", 25}, + { "xmm5", 26}, + { "xmm6", 27}, + { "xmm7", 28}, + { "mm0", 29}, + { "mm1", 30}, + { "mm2", 31}, + { "mm3", 32}, + { "mm4", 33}, + { "mm5", 34}, + { "mm6", 35}, + { "mm7", 36}, + // 37-38 - unknown + { "mxcsr", 39}, // 128-bit Media Control and Status + { "es", 40}, + { "cs", 41}, + { "ss", 42}, + { "ds", 43}, + { "fs", 44}, + { "gs", 45}, + // 46-47 - reserved + { "tr", 48}, // Task Register + { "ldtr", 49}, // LDT Register + // 50-92 - reserved + { "fs.base", 92}, + { "gs.base", 93}, + // End of regular dwarf registers. + { "eip", DWARF_REG_PC }, { "ip", DWARF_REG_PC }, +}; + +static const struct dwarf_regs_idx x86_64_regidx_table[] = { { "rax", 0 }, { "eax", 0 }, { "ax", 0 }, { "al", 0 }, { "rdx", 1 }, { "edx", 1 }, { "dx", 1 }, { "dl", 1 }, { "rcx", 2 }, { "ecx", 2 }, { "cx", 2 }, { "cl", 2 }, @@ -33,18 +88,78 @@ static const struct dwarf_regs_idx x86_regidx_table[] = { { "r13", 13 }, { "r13d", 13 }, { "r13w", 13 }, { "r13b", 13 }, { "r14", 14 }, { "r14d", 14 }, { "r14w", 14 }, { "r14b", 14 }, { "r15", 15 }, { "r15d", 15 }, { "r15w", 15 }, { "r15b", 15 }, - { "rip", DWARF_REG_PC }, + // 16 - Return Address RA + { "xmm0", 17}, + { "xmm1", 18}, + { "xmm2", 19}, + { "xmm3", 20}, + { "xmm4", 21}, + { "xmm5", 22}, + { "xmm6", 23}, + { "xmm7", 24}, + { "xmm8", 25}, + { "xmm9", 26}, + { "xmm10", 27}, + { "xmm11", 28}, + { "xmm12", 29}, + { "xmm13", 30}, + { "xmm14", 31}, + { "xmm15", 32}, + { "st0", 33}, + { "st1", 34}, + { "st2", 35}, + { "st3", 36}, + { "st4", 37}, + { "st5", 38}, + { "st6", 39}, + { "st7", 40}, + { "mm0", 41}, + { "mm1", 42}, + { "mm2", 43}, + { "mm3", 44}, + { "mm4", 45}, + { "mm5", 46}, + { "mm6", 47}, + { "mm7", 48}, + { "rflags", 49}, { "eflags", 49}, { "flags", 49}, + { "es", 50}, + { "cs", 51}, + { "ss", 52}, + { "ds", 53}, + { "fs", 54}, + { "gs", 55}, + // 56-47 - reserved + { "fs.base", 58}, + { "gs.base", 59}, + // 60-61 - reserved + { "tr", 62}, // Task Register + { "ldtr", 63}, // LDT Register + { "mxcsr", 64}, // 128-bit Media Control and Status + { "fcw", 65}, // x87 Control Word + { "fsw", 66}, // x87 Status Word + // End of regular dwarf registers. + { "rip", DWARF_REG_PC }, { "eip", DWARF_REG_PC }, { "ip", DWARF_REG_PC }, }; -int get_x86_regnum(const char *name) +static int get_regnum(const struct dwarf_regs_idx *entries, size_t num_entries, const char *name) { - unsigned int i; - if (*name != '%') return -EINVAL; - for (i = 0; i < ARRAY_SIZE(x86_regidx_table); i++) - if (!strcmp(x86_regidx_table[i].name, name + 1)) - return x86_regidx_table[i].idx; + name++; + for (size_t i = 0; i < num_entries; i++) { + if (!strcmp(entries[i].name, name)) + return entries[i].dwarf_regnum; + } return -ENOENT; } + +int __get_dwarf_regnum_i386(const char *name) +{ + return get_regnum(i386_regidx_table, ARRAY_SIZE(i386_regidx_table), name); +} + +int __get_dwarf_regnum_x86_64(const char *name) +{ + return get_regnum(x86_64_regidx_table, ARRAY_SIZE(x86_64_regidx_table), name); +} diff --git a/tools/perf/util/dwarf-regs.c b/tools/perf/util/dwarf-regs.c index b2f37299147e..ef249dd589e3 100644 --- a/tools/perf/util/dwarf-regs.c +++ b/tools/perf/util/dwarf-regs.c @@ -92,9 +92,10 @@ int get_dwarf_regnum(const char *name, unsigned int machine, unsigned int flags } switch (machine) { case EM_X86_64: - fallthrough; + reg = __get_dwarf_regnum_x86_64(name); + break; case EM_386: - reg = get_x86_regnum(regname); + reg = __get_dwarf_regnum_i386(name); break; default: pr_err("ELF MACHINE %x is not supported.\n", machine); diff --git a/tools/perf/util/include/dwarf-regs.h b/tools/perf/util/include/dwarf-regs.h index 015d1ade645f..bb5413b0fee4 100644 --- a/tools/perf/util/include/dwarf-regs.h +++ b/tools/perf/util/include/dwarf-regs.h @@ -99,7 +99,8 @@ const char *get_csky_regstr(unsigned int n, unsigned int flags); */ const char *get_dwarf_regstr(unsigned int n, unsigned int machine, unsigned int flags); -int get_x86_regnum(const char *name); +int __get_dwarf_regnum_i386(const char *name); +int __get_dwarf_regnum_x86_64(const char *name); /* * get_dwarf_regnum - Returns DWARF regnum from register name -- 2.52.0.457.g6b5491de43-goog _______________________________________________ linux-riscv mailing list linux-riscv@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-riscv