From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-oi1-x22b.google.com (mail-oi1-x22b.google.com [IPv6:2607:f8b0:4864:20::22b]) by sourceware.org (Postfix) with ESMTPS id 6ED5F38582A1 for ; Wed, 14 Feb 2024 16:03:17 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 6ED5F38582A1 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=obs.cr Authentication-Results: sourceware.org; spf=none smtp.mailfrom=obs.cr ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 6ED5F38582A1 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::22b ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1707926599; cv=none; b=mpeDj2EkfZAWi7jI1e3RGI+haeNzwfBgX9l2LKg4pokgbVN1wWNqXupDOxNDlHFIe8uZKbrJaDV0+pniCQlKDVdLqPSzaeuhG6QDEmuvQq0HWJxJ2qe8gNnndpl0R778SuPsBf4z1/2pS6PSfOsrOXGfte334bznLoAKFByIoto= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1707926599; c=relaxed/simple; bh=/0m2//ypCZUxk2lPytl6+P4ipmVjPsBVGyX2N4/9JEs=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=RySoqfOT8dzgWCELzU3Ors1sHtxR5jqdWlS9qY3AtArzO1KbiBoPAUrRV0mS3tEOuqiwuvitIumQSEKNuDx36AcNfibntkxu8rvVLq6KmS1ToYnziJoTQDa03nbOIjtTNbLauDsbywDF/DAaXWpqlt91HByW8TEV4m9m8Dbgi08= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-oi1-x22b.google.com with SMTP id 5614622812f47-3c0467b94c6so1096193b6e.0 for ; Wed, 14 Feb 2024 08:03:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=obs-cr.20230601.gappssmtp.com; s=20230601; t=1707926596; x=1708531396; darn=sourceware.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=A7+fnXHmFn/cGMLdFusnft31wYgnRndmCrMIWuNkQLg=; b=oawG3yOdN2ENf8BMTZ55k9aGyNJhaqPYmr9FAlTGsGNo1TlI6YthbUAjjCCN4u1vFK 9p0gSQbU7g/c19Hse38hI9jlVkpOKOWd107N2bYbe3VeMZvWzmnXoR5vvL8SqERAii6O wtRLTkSkNd+sRaBy/S0b/2KETMjsHkORiPzEn7e7S1YN6kUX461NUAQmJlwkhZfQ6bko bW7tO0DCWAkkWOaIiJzpsWNLvKA6/aVCUFlXxHfNxofI4yby9D4QG+QfqCZc5X8igprm wujqycVZlA06pocdJctyMxjpAJJAqo94wb7clBWLZ6KmfP31OOBz4d5D0g63Mue/fs1q uKpw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707926596; x=1708531396; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=A7+fnXHmFn/cGMLdFusnft31wYgnRndmCrMIWuNkQLg=; b=YSSTZ/zksk2n51vF5B+A4Oog/z1GZtameHsLiv+yDriW0KuV40bUdmUxmVBjkwClR+ qrx+d255iCcskEi2JkJ34ID7ss6zjDkGfU/M7+fely+1zuh9HutOIKNhZYRO34q+OjH1 F7/2/Ct9hCFNI5/8smr3hUmAC9HQG/GNokbyBI7ZSl9VSSUgSGfsS7nTeiqXjvd7Wjji 90L+eqydSPNXJO2WusiIqHQB9I53Wl+pivSG9eXoQqaNJ879svitxhxkxtlNnFdBb3wv TAbcwyEn26fLGt6gUa/ZdkwFpkiy8GtZJRdYYs/fQsF/bS46zBR7OUjRo98JLibIyN3B e9QA== X-Gm-Message-State: AOJu0YwT7EH/v9CrpxEyfZ+7WbjXrclyGuncVQrD5v/y/vqFA+kblOvR kCpJXHCZf4yzSXzei9L85y0p4neHiRvDLUUNUoEpS29TllUSvkMaZvHPjTwrhr02QOC7lZ05ygj t X-Google-Smtp-Source: AGHT+IE0r2tesblvUHw7KNXLKCAj7fGMTM8JQhOKzVKMvTJ+cFdaMOAmzIKZJMbVXLPOBLJhbIqKJA== X-Received: by 2002:a05:6808:ecc:b0:3c0:5afc:e02d with SMTP id q12-20020a0568080ecc00b003c05afce02dmr1984789oiv.16.1707926596383; Wed, 14 Feb 2024 08:03:16 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCWmM+bFi5GAcgAGDffzlsE9qzB3vjv2mVUrY37yjgeg6OlEv86gAcoEIBVCc4wIhJcUX+ZIhyIGoIu+dBa8yVjrjE2s0s7AUw== Received: from borderland.rhod.uc.edu ([129.137.96.2]) by smtp.gmail.com with ESMTPSA id fa11-20020a0561302f8b00b007d2e2f14bd4sm1593032uab.29.2024.02.14.08.03.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Feb 2024 08:03:16 -0800 (PST) From: Will Hawkins To: binutils@sourceware.org Cc: Will Hawkins , yonghong.song@linux.dev Subject: [PATCH v3 1/1] objdump, as: Add callx support for BPF CPU v1 Date: Wed, 14 Feb 2024 11:03:00 -0500 Message-ID: <20240214160303.869180-2-hawkinsw@obs.cr> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240214160303.869180-1-hawkinsw@obs.cr> References: <20240214160303.869180-1-hawkinsw@obs.cr> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-8.7 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,GIT_PATCH_0,KAM_NUMSUBJECT,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_NONE,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: Add support for (dis)assembling the callx instruction back to CPU v1. gas/ChangeLog: * testsuite/gas/bpf/indcall-1-pseudoc.d: Refactor tests ... * testsuite/gas/bpf/indcall-1-pseudoc.s: ... to visually match ... * testsuite/gas/bpf/indcall-1.d: ... equivalent test in ... * testsuite/gas/bpf/indcall-1.s: ... clang/llvm. include/ChangeLog: * opcode/bpf.h (enum bpf_insn_id): BPF_INSN_CALLR to BPF_INSN_CALLX * (for consistency) and add it to the v1 ISA variant. opcodes/ChangeLog: * bpf-opc.c: Use BPF_INSN_CALLX instead of BPF_INSN_CALLR. Signed-off-by: Will Hawkins --- gas/testsuite/gas/bpf/indcall-1-pseudoc.d | 8 ++++---- gas/testsuite/gas/bpf/indcall-1-pseudoc.s | 6 +++--- gas/testsuite/gas/bpf/indcall-1.d | 10 +++++----- gas/testsuite/gas/bpf/indcall-1.s | 6 +++--- include/opcode/bpf.h | 2 +- opcodes/bpf-opc.c | 4 ++-- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/gas/testsuite/gas/bpf/indcall-1-pseudoc.d b/gas/testsuite/gas/bpf/indcall-1-pseudoc.d index 7a95bad8e65..12f9d6a9d49 100644 --- a/gas/testsuite/gas/bpf/indcall-1-pseudoc.d +++ b/gas/testsuite/gas/bpf/indcall-1-pseudoc.d @@ -1,4 +1,4 @@ -#as: -EL -mdialect=pseudoc -misa-spec=xbpf +#as: -EL -mdialect=pseudoc -misa-spec=v1 #objdump: -M xbpf,pseudoc,dec -dr #source: indcall-1-pseudoc.s #name: BPF indirect call 1, pseudoc syntax @@ -10,11 +10,11 @@ Disassembly of section \.text: 0000000000000000
: 0: b7 00 00 00 01 00 00 00 r0=1 8: b7 01 00 00 01 00 00 00 r1=1 - 10: b7 02 00 00 02 00 00 00 r2=2 - 18: 18 06 00 00 38 00 00 00 r6=56 ll + 10: b7 03 00 00 03 00 00 00 r3=3 + 18: 18 02 00 00 38 00 00 00 r2=56 ll 20: 00 00 00 00 00 00 00 00[ ]* 18: R_BPF_64_64 .text - 28: 8d 06 00 00 00 00 00 00 callx r6 + 28: 8d 02 00 00 00 00 00 00 callx r2 30: 95 00 00 00 00 00 00 00 exit 0000000000000038 : diff --git a/gas/testsuite/gas/bpf/indcall-1-pseudoc.s b/gas/testsuite/gas/bpf/indcall-1-pseudoc.s index 2042697f15b..5639e288869 100644 --- a/gas/testsuite/gas/bpf/indcall-1-pseudoc.s +++ b/gas/testsuite/gas/bpf/indcall-1-pseudoc.s @@ -4,9 +4,9 @@ main: r0 = 1 r1 = 1 - r2 = 2 - r6 = bar ll - callx r6 + r3 = 3 + r2 = bar ll + callx r2 exit bar: r0 = 0 diff --git a/gas/testsuite/gas/bpf/indcall-1.d b/gas/testsuite/gas/bpf/indcall-1.d index 51103bba2a1..1a2c36999b1 100644 --- a/gas/testsuite/gas/bpf/indcall-1.d +++ b/gas/testsuite/gas/bpf/indcall-1.d @@ -1,5 +1,5 @@ -#as: -EL -misa-spec=xbpf -#objdump: -dr -M xbpf,dec +#as: -EL -misa-spec=v1 +#objdump: -dr -M v1,dec #source: indcall-1.s #name: BPF indirect call 1, normal syntax @@ -10,11 +10,11 @@ Disassembly of section \.text: 0000000000000000
: 0: b7 00 00 00 01 00 00 00 mov %r0,1 8: b7 01 00 00 01 00 00 00 mov %r1,1 - 10: b7 02 00 00 02 00 00 00 mov %r2,2 - 18: 18 06 00 00 38 00 00 00 lddw %r6,56 + 10: b7 03 00 00 03 00 00 00 mov %r3,3 + 18: 18 02 00 00 38 00 00 00 lddw %r2,56 20: 00 00 00 00 00 00 00 00[ ]* 18: R_BPF_64_64 .text - 28: 8d 06 00 00 00 00 00 00 call %r6 + 28: 8d 02 00 00 00 00 00 00 call %r2 30: 95 00 00 00 00 00 00 00 exit 0000000000000038 : diff --git a/gas/testsuite/gas/bpf/indcall-1.s b/gas/testsuite/gas/bpf/indcall-1.s index 5d49e41040a..7fbeeeb9a38 100644 --- a/gas/testsuite/gas/bpf/indcall-1.s +++ b/gas/testsuite/gas/bpf/indcall-1.s @@ -4,9 +4,9 @@ main: mov %r0, 1 mov %r1, 1 - mov %r2, 2 - lddw %r6, bar - call %r6 + mov %r3, 3 + lddw %r2, bar + call %r2 exit bar: diff --git a/include/opcode/bpf.h b/include/opcode/bpf.h index df1e3bd0918..97e25053175 100644 --- a/include/opcode/bpf.h +++ b/include/opcode/bpf.h @@ -202,7 +202,7 @@ enum bpf_insn_id BPF_INSN_JAR, BPF_INSN_JEQR, BPF_INSN_JGTR, BPF_INSN_JSGTR, BPF_INSN_JGER, BPF_INSN_JSGER, BPF_INSN_JLTR, BPF_INSN_JSLTR, BPF_INSN_JSLER, BPF_INSN_JLER, BPF_INSN_JSETR, BPF_INSN_JNER, - BPF_INSN_CALLR, BPF_INSN_CALL, BPF_INSN_EXIT, + BPF_INSN_CALLX, BPF_INSN_CALL, BPF_INSN_EXIT, /* Compare-and-jump instructions (reg OP imm.) */ BPF_INSN_JEQI, BPF_INSN_JGTI, BPF_INSN_JSGTI, BPF_INSN_JGEI, BPF_INSN_JSGEI, BPF_INSN_JLTI, BPF_INSN_JSLTI, diff --git a/opcodes/bpf-opc.c b/opcodes/bpf-opc.c index 19e096501a2..23473fc0cd9 100644 --- a/opcodes/bpf-opc.c +++ b/opcodes/bpf-opc.c @@ -272,8 +272,8 @@ const struct bpf_opcode bpf_opcodes[] = BPF_V1, BPF_CODE, BPF_CLASS_JMP|BPF_CODE_JSET|BPF_SRC_X}, {BPF_INSN_JNER, "jne%W%dr , %sr , %d16", "if%w%dr != %sr%wgoto%w%d16", BPF_V1, BPF_CODE, BPF_CLASS_JMP|BPF_CODE_JNE|BPF_SRC_X}, - {BPF_INSN_CALLR, "call%W%dr", "callx%w%dr", - BPF_XBPF, BPF_CODE, BPF_CLASS_JMP|BPF_CODE_CALL|BPF_SRC_X}, + {BPF_INSN_CALLX, "call%W%dr", "callx%w%dr", + BPF_V1, BPF_CODE, BPF_CLASS_JMP|BPF_CODE_CALL|BPF_SRC_X}, {BPF_INSN_CALL, "call%W%d32", "call%w%d32", BPF_V1, BPF_CODE, BPF_CLASS_JMP|BPF_CODE_CALL|BPF_SRC_K}, {BPF_INSN_EXIT, "exit", "exit", -- 2.43.0