From: Will Hawkins <hawkinsw@obs.cr>
To: binutils@sourceware.org
Cc: Will Hawkins <hawkinsw@obs.cr>
Subject: [PATCH v4 1/1] objdump, as: Add callx support for BPF CPU v1
Date: Wed, 14 Feb 2024 17:12:53 -0500 [thread overview]
Message-ID: <20240214221257.908126-2-hawkinsw@obs.cr> (raw)
In-Reply-To: <20240214221257.908126-1-hawkinsw@obs.cr>
Add support for (dis)assembling the callx instruction back to CPU v1.
gas/ChangeLog:
* testsuite/gas/bpf/indcall-1-pseudoc.d: Remove xbpf CPU variant ...
* testsuite/gas/bpf/indcall-1.d: ... specification from callx tests.
opcodes/ChangeLog:
* bpf-opc.c: Move callx into the v1 BPF CPU variant.
Signed-off-by: Will Hawkins <hawkinsw@obs.cr>
---
gas/testsuite/gas/bpf/indcall-1-pseudoc.d | 4 ++--
gas/testsuite/gas/bpf/indcall-1.d | 4 ++--
opcodes/bpf-opc.c | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/gas/testsuite/gas/bpf/indcall-1-pseudoc.d b/gas/testsuite/gas/bpf/indcall-1-pseudoc.d
index 7a95bad8e65..ae49cd1c446 100644
--- a/gas/testsuite/gas/bpf/indcall-1-pseudoc.d
+++ b/gas/testsuite/gas/bpf/indcall-1-pseudoc.d
@@ -1,5 +1,5 @@
-#as: -EL -mdialect=pseudoc -misa-spec=xbpf
-#objdump: -M xbpf,pseudoc,dec -dr
+#as: -EL -mdialect=pseudoc
+#objdump: -M pseudoc,dec -dr
#source: indcall-1-pseudoc.s
#name: BPF indirect call 1, pseudoc syntax
diff --git a/gas/testsuite/gas/bpf/indcall-1.d b/gas/testsuite/gas/bpf/indcall-1.d
index 51103bba2a1..48e351fdaae 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
+#objdump: -dr -M dec
#source: indcall-1.s
#name: BPF indirect call 1, normal syntax
diff --git a/opcodes/bpf-opc.c b/opcodes/bpf-opc.c
index 19e096501a2..0524f4c7e1c 100644
--- a/opcodes/bpf-opc.c
+++ b/opcodes/bpf-opc.c
@@ -273,7 +273,7 @@ const struct bpf_opcode bpf_opcodes[] =
{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_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
next prev parent reply other threads:[~2024-02-14 22:13 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-14 22:12 [PATCH v4 0/1] Move call[xr] to v1 CPU variant Will Hawkins
2024-02-14 22:12 ` Will Hawkins [this message]
2024-02-15 14:15 ` [PATCH v4 1/1] objdump, as: Add callx support for BPF CPU v1 Jose E. Marchesi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240214221257.908126-2-hawkinsw@obs.cr \
--to=hawkinsw@obs.cr \
--cc=binutils@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).