summaryrefslogtreecommitdiff
path: root/opcodes/bpf-opc.c
diff options
context:
space:
mode:
authorJose E. Marchesi <jose.marchesi@oracle.com>2019-07-15 16:00:28 +0200
committerJose E. Marchesi <jose.marchesi@oracle.com>2019-07-15 16:00:28 +0200
commit3719fd55b6f89662653d50d33bb267c5f21127a5 (patch)
tree7c046c3a10249178af42ff1ab11ba51468b62d6c /opcodes/bpf-opc.c
parent5b9d7a9a647260ba754fbd2a176d37806f15acc8 (diff)
downloadbinutils-gdb-3719fd55b6f89662653d50d33bb267c5f21127a5.tar.gz
cpu,opcodes,gas: fix explicit arguments to eBPF ldabs instructions
This patch fixes the eBPF CPU description in order to reflect the right explicit arguments passed to the ldabs{b,h,w,dw} instructions, updates the corresponding GAS tests, and updates the BPF section of the GAS manual. cpu/ChangeLog: 2019-07-15 Jose E. Marchesi <jose.marchesi@oracle.com> * bpf.cpu (dlabs): New pmacro. (dlind): Likewise. opcodes/ChangeLog: 2019-07-15 Jose E. Marchesi <jose.marchesi@oracle.com> * bpf-desc.c: Regenerate. * bpf-opc.c: Likewise. * bpf-opc.h: Likewise. gas/ChangeLog: 2019-07-15 Jose E. Marchesi <jose.marchesi@oracle.com> * testsuite/gas/bpf/mem.s: ldabs instructions do not take a `src' register as an argument. * testsuite/gas/bpf/mem.d: Updated accordingly. * testsuite/gas/bpf/mem-be.d: Likewise. * doc/c-bpf.texi (BPF Opcodes): Update to reflect the correct explicit arguments to ldabs and ldind instructions.
Diffstat (limited to 'opcodes/bpf-opc.c')
-rw-r--r--opcodes/bpf-opc.c72
1 files changed, 26 insertions, 46 deletions
diff --git a/opcodes/bpf-opc.c b/opcodes/bpf-opc.c
index 4a36cb9714a..7707aaa0da8 100644
--- a/opcodes/bpf-opc.c
+++ b/opcodes/bpf-opc.c
@@ -89,11 +89,15 @@ static const CGEN_IFMT ifmt_lddwbe ATTRIBUTE_UNUSED = {
8, 128, 0xff, { { F (F_IMM64) }, { F (F_OFFSET16) }, { F (F_DSTBE) }, { F (F_OP_MODE) }, { F (F_OP_SIZE) }, { F (F_SRCBE) }, { F (F_OP_CLASS) }, { 0 } }
};
-static const CGEN_IFMT ifmt_ldabswle ATTRIBUTE_UNUSED = {
+static const CGEN_IFMT ifmt_ldabsw ATTRIBUTE_UNUSED = {
+ 8, 64, 0xff, { { F (F_IMM32) }, { F (F_OFFSET16) }, { F (F_REGS) }, { F (F_OP_MODE) }, { F (F_OP_SIZE) }, { F (F_OP_CLASS) }, { 0 } }
+};
+
+static const CGEN_IFMT ifmt_ldindwle ATTRIBUTE_UNUSED = {
8, 64, 0xff, { { F (F_IMM32) }, { F (F_OFFSET16) }, { F (F_SRCLE) }, { F (F_OP_MODE) }, { F (F_OP_SIZE) }, { F (F_DSTLE) }, { F (F_OP_CLASS) }, { 0 } }
};
-static const CGEN_IFMT ifmt_ldabswbe ATTRIBUTE_UNUSED = {
+static const CGEN_IFMT ifmt_ldindwbe ATTRIBUTE_UNUSED = {
8, 64, 0xff, { { F (F_IMM32) }, { F (F_OFFSET16) }, { F (F_DSTBE) }, { F (F_OP_MODE) }, { F (F_OP_SIZE) }, { F (F_SRCBE) }, { F (F_OP_CLASS) }, { 0 } }
};
@@ -792,101 +796,77 @@ static const CGEN_OPCODE bpf_cgen_insn_opcode_table[MAX_INSNS] =
{ { MNEM, ' ', OP (DSTBE), ',', OP (IMM64), 0 } },
& ifmt_lddwbe, { 0x18 }
},
-/* ldabsw $srcle,$imm32 */
+/* ldabsw $imm32 */
{
{ 0, 0, 0, 0 },
- { { MNEM, ' ', OP (SRCLE), ',', OP (IMM32), 0 } },
- & ifmt_ldabswle, { 0x20 }
+ { { MNEM, ' ', OP (IMM32), 0 } },
+ & ifmt_ldabsw, { 0x20 }
},
-/* ldabsh $srcle,$imm32 */
+/* ldabsh $imm32 */
{
{ 0, 0, 0, 0 },
- { { MNEM, ' ', OP (SRCLE), ',', OP (IMM32), 0 } },
- & ifmt_ldabswle, { 0x28 }
+ { { MNEM, ' ', OP (IMM32), 0 } },
+ & ifmt_ldabsw, { 0x28 }
},
-/* ldabsb $srcle,$imm32 */
+/* ldabsb $imm32 */
{
{ 0, 0, 0, 0 },
- { { MNEM, ' ', OP (SRCLE), ',', OP (IMM32), 0 } },
- & ifmt_ldabswle, { 0x30 }
+ { { MNEM, ' ', OP (IMM32), 0 } },
+ & ifmt_ldabsw, { 0x30 }
},
-/* ldabsdw $srcle,$imm32 */
+/* ldabsdw $imm32 */
{
{ 0, 0, 0, 0 },
- { { MNEM, ' ', OP (SRCLE), ',', OP (IMM32), 0 } },
- & ifmt_ldabswle, { 0x38 }
+ { { MNEM, ' ', OP (IMM32), 0 } },
+ & ifmt_ldabsw, { 0x38 }
},
/* ldindw $srcle,$imm32 */
{
{ 0, 0, 0, 0 },
{ { MNEM, ' ', OP (SRCLE), ',', OP (IMM32), 0 } },
- & ifmt_ldabswle, { 0x40 }
+ & ifmt_ldindwle, { 0x40 }
},
/* ldindh $srcle,$imm32 */
{
{ 0, 0, 0, 0 },
{ { MNEM, ' ', OP (SRCLE), ',', OP (IMM32), 0 } },
- & ifmt_ldabswle, { 0x48 }
+ & ifmt_ldindwle, { 0x48 }
},
/* ldindb $srcle,$imm32 */
{
{ 0, 0, 0, 0 },
{ { MNEM, ' ', OP (SRCLE), ',', OP (IMM32), 0 } },
- & ifmt_ldabswle, { 0x50 }
+ & ifmt_ldindwle, { 0x50 }
},
/* ldinddw $srcle,$imm32 */
{
{ 0, 0, 0, 0 },
{ { MNEM, ' ', OP (SRCLE), ',', OP (IMM32), 0 } },
- & ifmt_ldabswle, { 0x58 }
- },
-/* ldabsw $srcbe,$imm32 */
- {
- { 0, 0, 0, 0 },
- { { MNEM, ' ', OP (SRCBE), ',', OP (IMM32), 0 } },
- & ifmt_ldabswbe, { 0x20 }
- },
-/* ldabsh $srcbe,$imm32 */
- {
- { 0, 0, 0, 0 },
- { { MNEM, ' ', OP (SRCBE), ',', OP (IMM32), 0 } },
- & ifmt_ldabswbe, { 0x28 }
- },
-/* ldabsb $srcbe,$imm32 */
- {
- { 0, 0, 0, 0 },
- { { MNEM, ' ', OP (SRCBE), ',', OP (IMM32), 0 } },
- & ifmt_ldabswbe, { 0x30 }
- },
-/* ldabsdw $srcbe,$imm32 */
- {
- { 0, 0, 0, 0 },
- { { MNEM, ' ', OP (SRCBE), ',', OP (IMM32), 0 } },
- & ifmt_ldabswbe, { 0x38 }
+ & ifmt_ldindwle, { 0x58 }
},
/* ldindw $srcbe,$imm32 */
{
{ 0, 0, 0, 0 },
{ { MNEM, ' ', OP (SRCBE), ',', OP (IMM32), 0 } },
- & ifmt_ldabswbe, { 0x40 }
+ & ifmt_ldindwbe, { 0x40 }
},
/* ldindh $srcbe,$imm32 */
{
{ 0, 0, 0, 0 },
{ { MNEM, ' ', OP (SRCBE), ',', OP (IMM32), 0 } },
- & ifmt_ldabswbe, { 0x48 }
+ & ifmt_ldindwbe, { 0x48 }
},
/* ldindb $srcbe,$imm32 */
{
{ 0, 0, 0, 0 },
{ { MNEM, ' ', OP (SRCBE), ',', OP (IMM32), 0 } },
- & ifmt_ldabswbe, { 0x50 }
+ & ifmt_ldindwbe, { 0x50 }
},
/* ldinddw $srcbe,$imm32 */
{
{ 0, 0, 0, 0 },
{ { MNEM, ' ', OP (SRCBE), ',', OP (IMM32), 0 } },
- & ifmt_ldabswbe, { 0x58 }
+ & ifmt_ldindwbe, { 0x58 }
},
/* ldxw $dstle,[$srcle+$offset16] */
{