From patchwork Tue Mar 31 20:42:10 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vineet Gupta X-Patchwork-Id: 132547 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 50A854BA23C1 for ; Tue, 31 Mar 2026 20:46:39 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 50A854BA23C1 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=pCzjz9DT 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 7B08D4B7A1EA for ; Tue, 31 Mar 2026 20:42:35 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 7B08D4B7A1EA 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 7B08D4B7A1EA 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=1774989755; cv=none; b=AnscunFq/Xy4w6yHYZV+o8mh4K6TutAgB5l0DKEhOpGam8LNZh9X3RLQDx31a7GuTIK4isYs2/aA+L7XhMUkNTzmVNKzQrHwZcafWbAFuvt7Sn3APcpaNu6jQVps+FTeAa4r69Jtn411Vbv3ol1u14J+zZh4nOkTs+03s/4BG/I= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1774989755; c=relaxed/simple; bh=ytx6TwZSz1vFYyzbqsHkYmV1RPFqJRB37aN6ktUfX08=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=Ez3Ut2l4TuVBDeU/rY+QDDpI2ZoBsM+Km/YLrRTnvckX/WHCltJIGDmSIcmFu2vuLijgOMWIijFYddUvx8sIssKMTAlvfBGGlQNK+EYdI0cch2bSeQ1MNxABj7+EIUwJN7MkT4R+/cpshE8UxThjIjj9a1B3DXzJZTuc2j/asb8= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 7B08D4B7A1EA 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=1774989753; 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=6b6bhOW/MbEkT4Yvlv0/HtpNyC53b0q7zsXpjx2bo60=; b=pCzjz9DTqQBkZCc2K+wGq/zyxz0Z3Fn6mKT05jw/SJaFXplddJfBVMkg7zJRB35XYtxbrx s/7JFgm3QEl9gakJ8ky1XIzBUijouCX1EUM4St5uhOEvByOwCUs9BTr1o9cN6mCkxBMTat +11HNIUvcmKdWgOXANzDEsZT40AGR+c= 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: [v2 2/4] bpf: consolidate register format specifier handling [NFC] Date: Tue, 31 Mar 2026 13:42:10 -0700 Message-ID: <20260331204212.3992270-3-vineet.gupta@linux.dev> In-Reply-To: <20260331204212.3992270-1-vineet.gupta@linux.dev> References: <20260331204212.3992270-1-vineet.gupta@linux.dev> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Spam-Status: No, score=-11.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED, SPF_HELO_PASS, SPF_PASS, TXREP, URIBL_BLOCKED autolearn=unavailable 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 NFC. Combine the separate if blocks for %dr/%dw and %sr/%sw into single blocks each, using the tag character to drive parse_bpf_register(). Signed-off-by: Vineet Gupta --- gas/config/tc-bpf.c | 50 ++++++++------------------------------------- opcodes/bpf-dis.c | 16 ++++----------- 2 files changed, 12 insertions(+), 54 deletions(-) diff --git a/gas/config/tc-bpf.c b/gas/config/tc-bpf.c index 57c2b869cbab..ecb6c5a70535 100644 --- a/gas/config/tc-bpf.c +++ b/gas/config/tc-bpf.c @@ -1524,10 +1524,12 @@ md_assemble (char *str ATTRIBUTE_UNUSED) s += 1; p += 2; } - else if (strncmp (p, "%dr", 3) == 0) + else if (strncmp (p, "%dr", 3) == 0 + || strncmp (p, "%dw", 3) == 0) { + char rw = *(p + 2); uint8_t regno; - char *news = parse_bpf_register (s, 'r', ®no); + char *news = parse_bpf_register (s, rw, ®no); if (news == NULL || (insn.has_dst && regno != insn.dst)) { @@ -1543,48 +1545,12 @@ md_assemble (char *str ATTRIBUTE_UNUSED) insn.has_dst = 1; p += 3; } - else if (strncmp (p, "%sr", 3) == 0) + else if (strncmp (p, "%sr", 3) == 0 + || strncmp (p, "%sw", 3) == 0) { + char rw = *(p + 2); uint8_t regno; - char *news = parse_bpf_register (s, 'r', ®no); - - if (news == NULL || (insn.has_src && regno != insn.src)) - { - if (news != NULL) - PARSE_ERROR ("expected register r%d, got r%d", - insn.dst, regno); - else - PARSE_ERROR ("expected register name, got '%s'", s); - break; - } - s = news; - insn.src = regno; - insn.has_src = 1; - p += 3; - } - else if (strncmp (p, "%dw", 3) == 0) - { - uint8_t regno; - char *news = parse_bpf_register (s, 'w', ®no); - - if (news == NULL || (insn.has_dst && regno != insn.dst)) - { - if (news != NULL) - PARSE_ERROR ("expected register r%d, got r%d", - insn.dst, regno); - else - PARSE_ERROR ("expected register name, got '%s'", s); - break; - } - s = news; - insn.dst = regno; - insn.has_dst = 1; - p += 3; - } - else if (strncmp (p, "%sw", 3) == 0) - { - uint8_t regno; - char *news = parse_bpf_register (s, 'w', ®no); + char *news = parse_bpf_register (s, rw, ®no); if (news == NULL || (insn.has_src && regno != insn.src)) { diff --git a/opcodes/bpf-dis.c b/opcodes/bpf-dis.c index 7b89a7994ee6..de8d417dcd38 100644 --- a/opcodes/bpf-dis.c +++ b/opcodes/bpf-dis.c @@ -214,22 +214,14 @@ print_insn_bpf (bfd_vma pc, disassemble_info *info) (*info->fprintf_styled_func) (info->stream, dis_style_text, " "); p += 2; } - else if (strncmp (p, "%dr", 3) == 0) + else if (strncmp (p, "%dr", 3) == 0 + || strncmp (p, "%dw", 3) == 0) { print_register (info, p, bpf_extract_dst (word, endian)); p += 3; } - else if (strncmp (p, "%sr", 3) == 0) - { - print_register (info, p, bpf_extract_src (word, endian)); - p += 3; - } - else if (strncmp (p, "%dw", 3) == 0) - { - print_register (info, p, bpf_extract_dst (word, endian)); - p += 3; - } - else if (strncmp (p, "%sw", 3) == 0) + else if (strncmp (p, "%sr", 3) == 0 + || strncmp (p, "%sw", 3) == 0) { print_register (info, p, bpf_extract_src (word, endian)); p += 3;