From patchwork Mon Mar 30 22:42:01 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vineet Gupta X-Patchwork-Id: 132475 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from vm01.sourceware.org (localhost [127.0.0.1]) by sourceware.org (Postfix) with ESMTP id 428E64B7A1ED for ; Mon, 30 Mar 2026 22:43:40 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 428E64B7A1ED Authentication-Results: sourceware.org; dkim=pass (1024-bit key, unprotected) header.d=linux.dev header.i=@linux.dev header.a=rsa-sha256 header.s=key1 header.b=whNxs9sH X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from out-180.mta1.migadu.com (out-180.mta1.migadu.com [95.215.58.180]) by sourceware.org (Postfix) with ESMTPS id D4E324BB58DF for ; Mon, 30 Mar 2026 22:42:20 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D4E324BB58DF Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=linux.dev ARC-Filter: OpenARC Filter v1.0.0 sourceware.org D4E324BB58DF Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=95.215.58.180 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1774910541; cv=none; b=SxbeAtsKQ2MV+LL3BtMqyBOeCt9y5K+eNhB9+seQCR14hElTrhTRajSkkf2BG9TYQU8+SJosw/pzmOnaXTZZLuM5zbWtkQ4fH4fAJZapxAfImDGj2OdT4D05qez6OVmnX4CzJ4AmIT7R+//+d2jMBTDmCK2wveVc41PPtXjt8Mo= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1774910541; c=relaxed/simple; bh=tMFJtWJhDZs516qxR55R8BEJWpigDw765Jcg7gya4Gw=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=E132v1KofAiGsfkNJjXc4vxnqvZxB1Qsg5oB98Pq3/B1kpWl4Igh6PJQk6iKFEDDBxHv3MvheQLAo2j66ye6oBmgbTEcTcjKUOqFBSYOVlSLkQii+wWhbpa7IPbttu+QlsXRrWnLCEbg9fqYIlNE9Qwd/f6zF2YFEFbKmlQbquo= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D4E324BB58DF X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1774910539; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=hfFE4M4uPrECCP17x48EB7tFDy5ER+3JIkPWp7zyd24=; b=whNxs9sHonZhT46EbqZlpaJShES0Q1FnnBpflukxiyhki26GHX/4/ijreWxHiz2nLsZEDW 9v1PPKiikdxJuPs9GLNo1t83vuAZ6zOyGBtBFA6Pl8fP2QsDwbSB6roGbabf9WQxmjDBbL jWJcITlwi1cz28A2lPMpyA+Owjb0fdQ= From: Vineet Gupta To: bpf@gcc.gnu.org Cc: binutils@sourceware.org, jose.marchesi@oracle.com, ast@kernel.org, Eduard Zingerman , Yonghong Song , Vineet Gupta Subject: [PATCH 1/3] bpf: print failing insn for unexpected register Date: Mon, 30 Mar 2026 15:42:01 -0700 Message-ID: <20260330224203.3110788-2-vineet.gupta@linux.dev> In-Reply-To: <20260330224203.3110788-1-vineet.gupta@linux.dev> References: <20260330224203.3110788-1-vineet.gupta@linux.dev> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Spam-Status: No, score=-8.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED, SPF_HELO_PASS, SPF_PASS, TXREP, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on sourceware.org X-BeenThere: binutils@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: binutils-bounces~patchwork=sourceware.org@sourceware.org prev: | /tmp/cc7214hK.s: Assembler messages: | /tmp/cc7214hK.s:40: Error: unexpected register name `w0' in expression New | /tmp/cc7214hK.s: Assembler messages: | /tmp/cc7214hK.s:40: Error: unexpected register name `w0' in instruction `*(u32 *) (r9+0) = w5' Signed-off-by: Vineet Gupta --- gas/config/tc-bpf.c | 6 ++++-- gas/testsuite/gas/bpf/regs-for-symbols-pseudoc.l | 14 +++++++------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/gas/config/tc-bpf.c b/gas/config/tc-bpf.c index bc83d3d19d58..57c2b869cbab 100644 --- a/gas/config/tc-bpf.c +++ b/gas/config/tc-bpf.c @@ -1235,6 +1235,7 @@ add_relaxed_insn (struct bpf_insn *insn, expressionS *exp) static int exp_parse_failed = 0; static bool parsing_insn_operands = false; +static char *g_curr_insn_str; static char * parse_expression (char *s, expressionS *exp) @@ -1357,8 +1358,8 @@ bpf_parse_name (const char *name, expressionS *exp, enum expr_mode mode) if (parse_bpf_register ((char *) name, 'r', ®no) || parse_bpf_register ((char *) name, 'w', ®no)) { - as_bad (_("unexpected register name `%s' in expression"), - name); + as_bad (_("unexpected register name `%s' in instruction `%s'"), + name, g_curr_insn_str); return false; } } @@ -1464,6 +1465,7 @@ md_assemble (char *str ATTRIBUTE_UNUSED) function above. */ partial_match_length = 0; errmsg = NULL; + g_curr_insn_str = str; #define PARSE_ERROR(...) parse_error (s > str ? s - str : 0, __VA_ARGS__) diff --git a/gas/testsuite/gas/bpf/regs-for-symbols-pseudoc.l b/gas/testsuite/gas/bpf/regs-for-symbols-pseudoc.l index eeda735fb993..b12739ed7a68 100644 --- a/gas/testsuite/gas/bpf/regs-for-symbols-pseudoc.l +++ b/gas/testsuite/gas/bpf/regs-for-symbols-pseudoc.l @@ -1,8 +1,8 @@ .*: Assembler messages: -.*:1: Error: unexpected register name `w3' in expression -.*:2: Error: unexpected register name `r3' in expression -.*:2: Error: unexpected register name `r3' in expression -.*:3: Error: unexpected register name `r3' in expression -.*:3: Error: unexpected register name `r3' in expression -.*:4: Error: unexpected register name `r3' in expression -.*:4: Error: unexpected register name `r3' in expression +.*:1: Error: unexpected register name `w3' in instruction `goto w3' +.*:2: Error: unexpected register name `r3' in instruction `r2 =r3' +.*:2: Error: unexpected register name `r3' in instruction `r2 =r3' +.*:3: Error: unexpected register name `r3' in instruction `r2 =r3' +.*:3: Error: unexpected register name `r3' in instruction `r2 =r3' +.*:4: Error: unexpected register name `r3' in instruction `r2 =1\+r3' +.*:4: Error: unexpected register name `r3' in instruction `r2 =1\+r3'