* [PATCH 0/2] [ARC] Two additional sets of nps400 instructions
@ 2016-04-14 16:36 Andrew Burgess
2016-04-14 16:36 ` [PATCH 2/2] opcodes/arc: Add yet more nps instructions Andrew Burgess
2016-04-14 16:36 ` [PATCH 1/2] opcodes/arc: Add " Andrew Burgess
0 siblings, 2 replies; 9+ messages in thread
From: Andrew Burgess @ 2016-04-14 16:36 UTC (permalink / raw)
To: binutils; +Cc: Claudiu.Zissulescu, Cupertino.Miranda, noamca, Andrew Burgess
Two more sets of nps400 instructions, along with associated assembler
tests.
---
Andrew Burgess (2):
opcodes/arc: Add more nps instructions
opcodes/arc: Add yet more nps instructions
gas/ChangeLog | 12 +++
gas/testsuite/gas/arc/nps400-4.d | 12 +++
gas/testsuite/gas/arc/nps400-4.s | 11 +++
gas/testsuite/gas/arc/nps400-5.d | 10 ++
gas/testsuite/gas/arc/nps400-5.s | 5 +
gas/testsuite/gas/arc/nps400-6.d | 70 +++++++++++++
gas/testsuite/gas/arc/nps400-6.s | 67 +++++++++++++
include/ChangeLog | 8 ++
include/opcode/arc.h | 4 +-
opcodes/ChangeLog | 22 +++++
opcodes/arc-nps400-tbl.h | 62 ++++++++++++
opcodes/arc-opc.c | 208 ++++++++++++++++++++++++++++++++++-----
12 files changed, 467 insertions(+), 24 deletions(-)
create mode 100644 gas/testsuite/gas/arc/nps400-4.d
create mode 100644 gas/testsuite/gas/arc/nps400-4.s
create mode 100644 gas/testsuite/gas/arc/nps400-5.d
create mode 100644 gas/testsuite/gas/arc/nps400-5.s
create mode 100644 gas/testsuite/gas/arc/nps400-6.d
create mode 100644 gas/testsuite/gas/arc/nps400-6.s
--
2.5.1
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 1/2] opcodes/arc: Add more nps instructions
2016-04-14 16:36 [PATCH 0/2] [ARC] Two additional sets of nps400 instructions Andrew Burgess
2016-04-14 16:36 ` [PATCH 2/2] opcodes/arc: Add yet more nps instructions Andrew Burgess
@ 2016-04-14 16:36 ` Andrew Burgess
2016-04-18 11:23 ` Nick Clifton
1 sibling, 1 reply; 9+ messages in thread
From: Andrew Burgess @ 2016-04-14 16:36 UTC (permalink / raw)
To: binutils; +Cc: Claudiu.Zissulescu, Cupertino.Miranda, noamca, Andrew Burgess
Add dctcp, dcip, dcet, and dcacl instructions.
gas/ChangeLog:
* testsuite/gas/arc/nps400-4.d: New file.
* testsuite/gas/arc/nps400-4.s: New file.
* testsuite/gas/arc/nps400-5.d: New file.
* testsuite/gas/arc/nps400-5.s: New file.
include/ChangeLog:
* opcode/arc.h (insn_class_t): Add NET and ACL class.
opcodes/ChangeLog:
* arc-nps400-tbl.h: Add dctcp, dcip, dcet, and dcacl instructions.
---
gas/ChangeLog | 7 +++++++
gas/testsuite/gas/arc/nps400-4.d | 12 ++++++++++++
gas/testsuite/gas/arc/nps400-4.s | 11 +++++++++++
gas/testsuite/gas/arc/nps400-5.d | 10 ++++++++++
gas/testsuite/gas/arc/nps400-5.s | 5 +++++
include/ChangeLog | 4 ++++
include/opcode/arc.h | 2 ++
opcodes/ChangeLog | 4 ++++
opcodes/arc-nps400-tbl.h | 19 +++++++++++++++++++
9 files changed, 74 insertions(+)
create mode 100644 gas/testsuite/gas/arc/nps400-4.d
create mode 100644 gas/testsuite/gas/arc/nps400-4.s
create mode 100644 gas/testsuite/gas/arc/nps400-5.d
create mode 100644 gas/testsuite/gas/arc/nps400-5.s
diff --git a/gas/testsuite/gas/arc/nps400-4.d b/gas/testsuite/gas/arc/nps400-4.d
new file mode 100644
index 0000000..2caab8c
--- /dev/null
+++ b/gas/testsuite/gas/arc/nps400-4.d
@@ -0,0 +1,12 @@
+#as: -mcpu=nps400
+#objdump: -dr
+
+.*: +file format .*arc.*
+
+Disassembly of section .text:
+
+[0-9a-f]+ <.*>:
+ 0: 3a2f 1300 dctcp r10,r12
+ 4: 3e29 13cd dcip r13,r14,r15
+ 8: 382f 2442 dcet r16,r17
+ c: 3b20 2512 dcet r18,r19,r20
diff --git a/gas/testsuite/gas/arc/nps400-4.s b/gas/testsuite/gas/arc/nps400-4.s
new file mode 100644
index 0000000..d2d7814
--- /dev/null
+++ b/gas/testsuite/gas/arc/nps400-4.s
@@ -0,0 +1,11 @@
+ .text
+
+ /* dctcp */
+ dctcp r10, r12
+
+ /* dcip */
+ dcip r13, r14, r15
+
+ /* dcet */
+ dcet r16, r17
+ dcet r18, r19, r20
diff --git a/gas/testsuite/gas/arc/nps400-5.d b/gas/testsuite/gas/arc/nps400-5.d
new file mode 100644
index 0000000..214e38e
--- /dev/null
+++ b/gas/testsuite/gas/arc/nps400-5.d
@@ -0,0 +1,10 @@
+#as: -mcpu=nps400
+#objdump: -dr
+
+.*: +file format .*arc.*
+
+Disassembly of section .text:
+
+[0-9a-f]+ <.*>:
+ 0: 3925 0080 dcacl r0,r1,r2
+ 4: 3c25 8143 dcacl.f r3,r4,r5
diff --git a/gas/testsuite/gas/arc/nps400-5.s b/gas/testsuite/gas/arc/nps400-5.s
new file mode 100644
index 0000000..38a34c2
--- /dev/null
+++ b/gas/testsuite/gas/arc/nps400-5.s
@@ -0,0 +1,5 @@
+ .text
+
+ /* dcacl */
+ dcacl r0, r1, r2
+ dcacl.f r3, r4, r5
diff --git a/include/opcode/arc.h b/include/opcode/arc.h
index 2811877..31daeb7 100644
--- a/include/opcode/arc.h
+++ b/include/opcode/arc.h
@@ -47,6 +47,8 @@ typedef enum
LOGICAL,
MEMORY,
BITOP,
+ NET,
+ ACL,
} insn_class_t;
/* Instruction Subclass. */
diff --git a/opcodes/arc-nps400-tbl.h b/opcodes/arc-nps400-tbl.h
index 832d2ff..ebafc15 100644
--- a/opcodes/arc-nps400-tbl.h
+++ b/opcodes/arc-nps400-tbl.h
@@ -124,6 +124,25 @@
/* crc32<.r> 0,limm,u6 00111 110 01 110100 R 111 uuuuuu 111110 */
{ "crc32", 0x3e74703e, 0xffff703f, ARC_OPCODE_NPS400, BITOP, NONE, { ZA, LIMM, UIMM6_20 }, { C_NPS_R }},
+/**** Protocol Decoder Instructions ****/
+
+/* dctcp b,c 00111bbb001011110bbbcccccc000000 */
+{ "dctcp", 0x382f0000, 0xf8ff803f, ARC_OPCODE_NPS400, NET, NONE, { RB, RC }, { 0 }},
+
+/* dcip a,b,c 00111bbb001011110bbbccccccaaaaaa */
+{ "dcip", 0x38290000, 0xf8ff8000, ARC_OPCODE_NPS400, NET, NONE, { RA, RB, RC }, { 0 }},
+
+/* dcet b,c 00111bbb001011110bbbcccccc000010 */
+{ "dcet", 0x382f0002, 0xf8ff803f, ARC_OPCODE_NPS400, NET, NONE, { RB, RC }, { 0 }},
+
+/* dcet a,b,c 00111bbb001000000bbbccccccaaaaaa */
+{ "dcet", 0x38200000, 0xf8ff8000, ARC_OPCODE_NPS400, NET, NONE, { RA, RB, RC }, { 0 }},
+
+/**** ACL Instructions ****/
+
+/* dcacl<.f> a,b,c 00111bbb001001010bbbccccccaaaaaa */
+{ "dcacl", 0x38250000, 0xf8ff0000, ARC_OPCODE_NPS400, ACL, NONE, { RA, RB, RC }, { C_F }},
+
/**** Pipeline Control Instructions ****/
/* schd<.rw|.rd> */
--
2.5.1
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 2/2] opcodes/arc: Add yet more nps instructions
2016-04-14 16:36 [PATCH 0/2] [ARC] Two additional sets of nps400 instructions Andrew Burgess
@ 2016-04-14 16:36 ` Andrew Burgess
2016-04-19 16:05 ` Nick Clifton
2016-04-14 16:36 ` [PATCH 1/2] opcodes/arc: Add " Andrew Burgess
1 sibling, 1 reply; 9+ messages in thread
From: Andrew Burgess @ 2016-04-14 16:36 UTC (permalink / raw)
To: binutils; +Cc: Claudiu.Zissulescu, Cupertino.Miranda, noamca, Andrew Burgess
Add some more arc/nps400 instructions and the associated operands.
There's also a test added into the assembler.
gas/ChangeLog:
* testsuite/gas/arc/nps400-6.d: New file.
* testsuite/gas/arc/nps400-6.s: New file.
include/ChangeLog:
* opcode/arc.h (MAX_INSN_ARGS): Increase 6 to 8.
opcodes/ChangeLog:
* arc-nps400-tbl.h: Add addb, subb, adcb, sbcb, andb, xorb, orb,
fxorb, wxorb, shlb, shrb, notb, cntbb, div, mod, divm, and qcmp
instructions.
* arc-opc.c (insert_nps_bitop_size): Delete.
(extract_nps_bitop_size): Delete.
(MAKE_SRC_POS_INSERT_EXTRACT_FUNCS): Define, and use.
(extract_nps_qcmp_m3): Define.
(extract_nps_qcmp_m2): Define.
(extract_nps_qcmp_m1): Define.
(arc_flag_operands): Add F_NPS_SX, F_NPS_AR, F_NPS_AL.
(arc_flag_classes): Add C_NPS_SX, C_NPS_AR_AL
(arc_operands): Add NPS_SRC2_POS, NPS_SRC1_POS, NPS_ADDB_SIZE,
NPS_ANDB_SIZE, NPS_FXORB_SIZ, NPS_WXORB_SIZ, NPS_R_XLDST,
NPS_DIV_UIMM4, NPS_QCMP_SIZE, NPS_QCMP_M1, NPS_QCMP_M2, and
NPS_QCMP_M3.
---
gas/ChangeLog | 5 +
gas/testsuite/gas/arc/nps400-6.d | 70 +++++++++++++
gas/testsuite/gas/arc/nps400-6.s | 67 +++++++++++++
include/ChangeLog | 4 +
include/opcode/arc.h | 2 +-
opcodes/ChangeLog | 18 ++++
opcodes/arc-nps400-tbl.h | 43 ++++++++
opcodes/arc-opc.c | 208 ++++++++++++++++++++++++++++++++++-----
8 files changed, 393 insertions(+), 24 deletions(-)
create mode 100644 gas/testsuite/gas/arc/nps400-6.d
create mode 100644 gas/testsuite/gas/arc/nps400-6.s
diff --git a/gas/testsuite/gas/arc/nps400-6.d b/gas/testsuite/gas/arc/nps400-6.d
new file mode 100644
index 0000000..3292177
--- /dev/null
+++ b/gas/testsuite/gas/arc/nps400-6.d
@@ -0,0 +1,70 @@
+#as: -mcpu=nps400
+#objdump: -dr
+
+.*: +file format .*arc.*
+
+Disassembly of section .text:
+
+[0-9a-f]+ <.*>:
+ 0: 4820 1020 addb r0,r0,r1,0,0x8,0x2
+ 4: 4830 1820 addb.f r0,r0,r1,0x10,0x8,0x2
+ 8: 4830 74a0 addb.f.sx r0,r0,r1,0x8,0x18,0x6
+ c: 4820 1024 subb r0,r0,r1,0,0x8,0x2
+ 10: 4830 1824 subb.f r0,r0,r1,0x10,0x8,0x2
+ 14: 4830 74a4 subb.f.sx r0,r0,r1,0x8,0x18,0x6
+ 18: 4820 1025 adcb r0,r0,r1,0,0x8,0x2
+ 1c: 4830 1825 adcb.f r0,r0,r1,0x10,0x8,0x2
+ 20: 4830 74a5 adcb.f.sx r0,r0,r1,0x8,0x18,0x6
+ 24: 4820 1026 sbcb r0,r0,r1,0,0x8,0x2
+ 28: 4830 1826 sbcb.f r0,r0,r1,0x10,0x8,0x2
+ 2c: 4830 74a6 sbcb.f.sx r0,r0,r1,0x8,0x18,0x6
+ 30: 4820 1021 andb r0,r0,r1,0,0x8,0x2
+ 34: 4830 1821 andb.f r0,r0,r1,0x10,0x8,0x2
+ 38: 4820 1022 xorb r0,r0,r1,0,0x8,0x2
+ 3c: 4830 1822 xorb.f r0,r0,r1,0x10,0x8,0x2
+ 40: 4820 1023 orb r0,r0,r1,0,0x8,0x2
+ 44: 4830 1823 orb.f r0,r0,r1,0x10,0x8,0x2
+ 48: 4820 102b shlb r0,r0,r1,0,0x8,0x2
+ 4c: 4830 182b shlb.f r0,r0,r1,0x10,0x8,0x2
+ 50: 4820 102c shrb r0,r0,r1,0,0x8,0x2
+ 54: 4830 182c shrb.f r0,r0,r1,0x10,0x8,0x2
+ 58: 4820 1007 fxorb r0,r0,r1,0,0x8,0x8
+ 5c: 4830 1807 fxorb.f r0,r0,r1,0x10,0x8,0x8
+ 60: 4820 1008 wxorb r0,r0,r1,0,0x8,0x10
+ 64: 4830 1808 wxorb.f r0,r0,r1,0x10,0x8,0x10
+ 68: 4820 00e9 notb r0,r1,0,0x8
+ 6c: 4830 21e9 notb.f r0,r1,0x10,0x10
+ 70: 4820 00ea cntbb r0,r1,0,0x8
+ 74: 4830 21ea cntbb.f r0,r1,0x10,0x10
+ 78: 4840 540d div r0,r0,r2,0x8,0x8
+ 7c: 4810 47ed div.f r0,r0,0xf,0x8
+ 80: 4840 940d mod r0,r0,r2,0x8,0x8
+ 84: 4810 87ed mod.f r0,r0,0xf,0x8
+ 88: 4840 140d divm r0,r0,r2,0x8,0x8
+ 8c: 4810 07ed divm.f r0,r0,0xf,0x8
+ 90: 4a10 9e6e qcmp.ar r2,r2,r0,0x8,0x8,0,0x1,0x3
+ 94: 4a10 dfee qcmp.ar r2,r2,r0,0x8,0x8,0x1,0x1
+ 98: 4a10 5fee qcmp.ar r2,r2,r0,0x8,0x8,0x1
+ 9c: 4a10 1fee qcmp.ar r2,r2,r0,0x8,0x8
+ a0: 4a10 9e6f qcmp.al r2,r2,r0,0x8,0x8,0,0x1,0x3
+ a4: 4a10 dfef qcmp.al r2,r2,r0,0x8,0x8,0x1,0x1
+ a8: 4a10 5fef qcmp.al r2,r2,r0,0x8,0x8,0x1
+ ac: 4a10 1fef qcmp.al r2,r2,r0,0x8,0x8
+ b0: 4800 0010 calcsd r0,r0,r0,0x1
+ b4: 4910 0110 calcsd.f r1,r1,r0,0x2
+ b8: 4a60 0210 calcsd r2,r2,r3,0x4
+ bc: 4810 0310 calcsd.f r0,r0,r0,0x8
+ c0: 4b00 0410 calcsd r3,r3,r0,0x10
+ c4: 4810 0510 calcsd.f r0,r0,r0,0x20
+ c8: 4820 0610 calcsd r0,r0,r1,0x40
+ cc: 4a10 0710 calcsd.f r2,r2,r0,0x80
+ d0: 4940 0810 calcsd r1,r1,r2,0x100
+ d4: 4800 4010 calcxd r0,r0,r0,0x1
+ d8: 4910 4110 calcxd.f r1,r1,r0,0x2
+ dc: 4a60 4210 calcxd r2,r2,r3,0x4
+ e0: 4810 4310 calcxd.f r0,r0,r0,0x8
+ e4: 4b00 4410 calcxd r3,r3,r0,0x10
+ e8: 4810 4510 calcxd.f r0,r0,r0,0x20
+ ec: 4820 4610 calcxd r0,r0,r1,0x40
+ f0: 4a10 4710 calcxd.f r2,r2,r0,0x80
+ f4: 4940 4810 calcxd r1,r1,r2,0x100
diff --git a/gas/testsuite/gas/arc/nps400-6.s b/gas/testsuite/gas/arc/nps400-6.s
new file mode 100644
index 0000000..4a94a0c
--- /dev/null
+++ b/gas/testsuite/gas/arc/nps400-6.s
@@ -0,0 +1,67 @@
+ .text
+
+ .macro addb_like_test mnem
+ \mnem r0,r0,r1,0,8,2
+ \mnem\().f r0,r0,r1,16,8,2
+ \mnem\().f.sx r0,r0,r1,8,24,6
+ .endm
+
+ .macro andb_like_test mnem, size
+ \mnem r0,r0,r1,0,8,\size
+ \mnem\().f r0,r0,r1,16,8,\size
+ .endm
+
+ .macro notb_like_test mnem
+ \mnem r0,r1,0,8
+ \mnem\().f r0,r1,16,16
+ .endm
+
+ .macro div_like_test mnem
+ \mnem r0,r0,r2,8,8
+ \mnem\().f r0,r0,0xf,8
+ .endm
+
+ .macro qcmp_test mnem
+ \mnem r2,r2,r0,8,8,0,1,3
+ \mnem r2,r2,r0,8,8,1,1
+ \mnem r2,r2,r0,8,8,1
+ \mnem r2,r2,r0,8,8
+ .endm
+
+ .macro calcsxd_test mnem
+ \mnem\() r0, r0, r0, 1
+ \mnem\().f r1, r1, r0, 2
+ \mnem\() r2, r2, r3, 4
+ \mnem\().f r0, r0, r0, 8
+ \mnem\() r3, r3, r0, 16
+ \mnem\().f r0, r0, r0, 32
+ \mnem\() r0, r0, r1, 64
+ \mnem\().f r2, r2, r0, 128
+ \mnem\() r1, r1, r2, 256
+ .endm
+
+ addb_like_test addb
+ addb_like_test subb
+ addb_like_test adcb
+ addb_like_test sbcb
+
+ andb_like_test andb, 2
+ andb_like_test xorb, 2
+ andb_like_test orb, 2
+ andb_like_test shlb, 2
+ andb_like_test shrb, 2
+ andb_like_test fxorb, 8
+ andb_like_test wxorb, 16
+
+ notb_like_test notb
+ notb_like_test cntbb
+
+ div_like_test div
+ div_like_test mod
+ div_like_test divm
+
+ qcmp_test qcmp.ar
+ qcmp_test qcmp.al
+
+ calcsxd_test calcsd
+ calcsxd_test calcxd
diff --git a/include/opcode/arc.h b/include/opcode/arc.h
index 31daeb7..1d4a844 100644
--- a/include/opcode/arc.h
+++ b/include/opcode/arc.h
@@ -25,7 +25,7 @@
#define OPCODE_ARC_H
#ifndef MAX_INSN_ARGS
-#define MAX_INSN_ARGS 6
+#define MAX_INSN_ARGS 8
#endif
#ifndef MAX_INSN_FLGS
diff --git a/opcodes/arc-nps400-tbl.h b/opcodes/arc-nps400-tbl.h
index ebafc15..5716119 100644
--- a/opcodes/arc-nps400-tbl.h
+++ b/opcodes/arc-nps400-tbl.h
@@ -124,6 +124,49 @@
/* crc32<.r> 0,limm,u6 00111 110 01 110100 R 111 uuuuuu 111110 */
{ "crc32", 0x3e74703e, 0xffff703f, ARC_OPCODE_NPS400, BITOP, NONE, { ZA, LIMM, UIMM6_20 }, { C_NPS_R }},
+/**** Arithmetic & Logic Instructions ****/
+
+#define ADDB_LIKE(NAME,SUBOP2) \
+ { NAME, (0x48000000 | SUBOP2), 0xf80f001f, ARC_OPCODE_NPS400, ARITH, NONE, { NPS_R_DST_3B, NPS_R_SRC1_3B, NPS_R_SRC2_3B, NPS_SRC1_POS, NPS_SRC2_POS, NPS_ADDB_SIZE }, { C_NPS_F, C_NPS_SX }},
+
+ADDB_LIKE ("addb", 0)
+ADDB_LIKE ("subb", 4)
+ADDB_LIKE ("adcb", 5)
+ADDB_LIKE ("sbcb", 6)
+
+#define ANDB_LIKE(NAME,SUBOP2,SIZE_OPERAND) \
+ { NAME, (0x48000000 | SUBOP2), 0xf80f001f, ARC_OPCODE_NPS400, ARITH, NONE, { NPS_R_DST_3B, NPS_R_SRC1_3B, NPS_R_SRC2_3B, NPS_SRC1_POS, NPS_SRC2_POS, SIZE_OPERAND }, { C_NPS_F }},
+
+ANDB_LIKE ("andb", 1, NPS_ANDB_SIZE)
+ANDB_LIKE ("xorb", 2, NPS_ANDB_SIZE)
+ANDB_LIKE ("orb", 3, NPS_ANDB_SIZE)
+ANDB_LIKE ("fxorb", 7, NPS_FXORB_SIZE)
+ANDB_LIKE ("wxorb", 8, NPS_WXORB_SIZE)
+ANDB_LIKE ("shlb", 0xb, NPS_ANDB_SIZE)
+ANDB_LIKE ("shrb", 0xc, NPS_ANDB_SIZE)
+
+#define NOTB_LIKE(NAME,SUBOP2) \
+ { NAME, (0x48000000 | SUBOP2), 0xf80f001f, ARC_OPCODE_NPS400, ARITH, NONE, { NPS_R_DST_3B, NPS_R_SRC2_3B, NPS_SRC2_POS, NPS_ANDB_SIZE }, { C_NPS_F }},
+
+NOTB_LIKE ("notb", 0x9)
+NOTB_LIKE ("cntbb", 0xa)
+
+#define DIV_LIKE(NAME,DIV_MODE) \
+ { NAME, (0x4800000d | DIV_MODE << 14), 0xf80fc3ff, ARC_OPCODE_NPS400, ARITH, NONE, { NPS_R_DST_3B, NPS_R_SRC1_3B, NPS_R_SRC2_3B, NPS_SRC1_POS, NPS_SRC2_POS, }, { C_NPS_F }}, \
+ { NAME, (0x4800020d | DIV_MODE << 14), 0xf8efc21f, ARC_OPCODE_NPS400, ARITH, NONE, { NPS_R_DST_3B, NPS_R_SRC1_3B, NPS_DIV_UIMM4, NPS_SRC1_POS }, { C_NPS_F }},
+
+DIV_LIKE ("div", 0x1)
+DIV_LIKE ("mod", 0x2)
+DIV_LIKE ("divm", 0x0)
+
+{ "qcmp", 0x4810000e, 0xf81f001e, ARC_OPCODE_NPS400, ARITH, NONE, { NPS_R_DST_3B, NPS_R_SRC1_3B, NPS_R_SRC2_3B, NPS_SRC2_POS, NPS_QCMP_SIZE, NPS_QCMP_M1, NPS_QCMP_M2, NPS_QCMP_M3 }, { C_NPS_AR_AL }},
+{ "qcmp", 0x481001ee, 0xf81f01fe, ARC_OPCODE_NPS400, ARITH, NONE, { NPS_R_DST_3B, NPS_R_SRC1_3B, NPS_R_SRC2_3B, NPS_SRC2_POS, NPS_QCMP_SIZE, NPS_QCMP_M1, NPS_QCMP_M2 }, { C_NPS_AR_AL }},
+{ "qcmp", 0x481001ee, 0xf81f81fe, ARC_OPCODE_NPS400, ARITH, NONE, { NPS_R_DST_3B, NPS_R_SRC1_3B, NPS_R_SRC2_3B, NPS_SRC2_POS, NPS_QCMP_SIZE, NPS_QCMP_M1 }, { C_NPS_AR_AL }},
+{ "qcmp", 0x481001ee, 0xf81fc1fe, ARC_OPCODE_NPS400, ARITH, NONE, { NPS_R_DST_3B, NPS_R_SRC1_3B, NPS_R_SRC2_3B, NPS_SRC2_POS, NPS_QCMP_SIZE }, { C_NPS_AR_AL }},
+
+{ "calcsd", 0x48000010, 0xf80f407f, ARC_OPCODE_NPS400, ARITH, NONE, { NPS_R_DST_3B, NPS_R_SRC1_3B, NPS_R_SRC2_3B, NPS_CALC_ENTRY_SIZE }, { C_NPS_F }},
+{ "calcxd", 0x48004010, 0xf80f407f, ARC_OPCODE_NPS400, ARITH, NONE, { NPS_R_DST_3B, NPS_R_SRC1_3B, NPS_R_SRC2_3B, NPS_CALC_ENTRY_SIZE }, { C_NPS_F }},
+
/**** Protocol Decoder Instructions ****/
/* dctcp b,c 00111bbb001011110bbbcccccc000000 */
diff --git a/opcodes/arc-opc.c b/opcodes/arc-opc.c
index 2ce8853..9effbaf 100644
--- a/opcodes/arc-opc.c
+++ b/opcodes/arc-opc.c
@@ -719,29 +719,6 @@ extract_nps_3bit_src2 (unsigned insn ATTRIBUTE_UNUSED,
}
static unsigned
-insert_nps_bitop_size (unsigned insn ATTRIBUTE_UNUSED,
- int value ATTRIBUTE_UNUSED,
- const char **errmsg ATTRIBUTE_UNUSED)
-{
- if (value < 1 || value > 32)
- {
- *errmsg = _("Invalid bit size, should be between 1 and 32 inclusive.");
- return insn;
- }
-
- --value;
- insn |= ((value & 0x1f) << 10);
- return insn;
-}
-
-static int
-extract_nps_bitop_size (unsigned insn ATTRIBUTE_UNUSED,
- bfd_boolean * invalid ATTRIBUTE_UNUSED)
-{
- return ((insn >> 10) & 0x1f) + 1;
-}
-
-static unsigned
insert_nps_bitop_size_2b (unsigned insn ATTRIBUTE_UNUSED,
int value ATTRIBUTE_UNUSED,
const char **errmsg ATTRIBUTE_UNUSED)
@@ -857,6 +834,139 @@ extract_nps_cmem_uimm16 (unsigned insn ATTRIBUTE_UNUSED,
return (NPS_CMEM_HIGH_VALUE << 16) | (insn & 0xffff);
}
+#define MAKE_SRC_POS_INSERT_EXTRACT_FUNCS(NAME,SHIFT) \
+static unsigned \
+insert_nps_##NAME##_pos (unsigned insn ATTRIBUTE_UNUSED, \
+ int value ATTRIBUTE_UNUSED, \
+ const char **errmsg ATTRIBUTE_UNUSED) \
+{ \
+ switch (value) \
+ { \
+ case 0: \
+ case 8: \
+ case 16: \
+ case 24: \
+ value = value / 8; \
+ break; \
+ default: \
+ *errmsg = _("Invalid position, should be 0, 8, 16, or 24."); \
+ value = 0; \
+ } \
+ insn |= (value << SHIFT); \
+ return insn; \
+} \
+ \
+static int \
+extract_nps_##NAME##_pos (unsigned insn ATTRIBUTE_UNUSED, \
+ bfd_boolean * invalid ATTRIBUTE_UNUSED) \
+{ \
+ return ((insn >> SHIFT) & 0x3) * 8; \
+}
+
+MAKE_SRC_POS_INSERT_EXTRACT_FUNCS (src2, 12)
+MAKE_SRC_POS_INSERT_EXTRACT_FUNCS (src1, 10)
+
+#define MAKE_SIZE_INSERT_EXTRACT_FUNCS(NAME,LOWER,UPPER,BITS,BIAS,SHIFT)\
+static unsigned \
+insert_nps_##NAME##_size (unsigned insn ATTRIBUTE_UNUSED, \
+ int value ATTRIBUTE_UNUSED, \
+ const char **errmsg ATTRIBUTE_UNUSED) \
+ { \
+ if (value < LOWER || value > 32) \
+ { \
+ *errmsg = _("Invalid size, value must be " \
+ #LOWER " to " #UPPER "."); \
+ return insn; \
+ } \
+ value -= BIAS; \
+ insn |= (value << SHIFT); \
+ return insn; \
+ } \
+ \
+static int \
+extract_nps_##NAME##_size (unsigned insn ATTRIBUTE_UNUSED, \
+ bfd_boolean * invalid ATTRIBUTE_UNUSED) \
+{ \
+ return ((insn >> SHIFT) & ((1 << BITS) - 1)) + BIAS; \
+}
+
+MAKE_SIZE_INSERT_EXTRACT_FUNCS(addb,2,32,5,1,5)
+MAKE_SIZE_INSERT_EXTRACT_FUNCS(andb,1,32,5,1,5)
+MAKE_SIZE_INSERT_EXTRACT_FUNCS(fxorb,8,32,5,8,5)
+MAKE_SIZE_INSERT_EXTRACT_FUNCS(wxorb,16,32,5,16,5)
+MAKE_SIZE_INSERT_EXTRACT_FUNCS(bitop,1,32,5,1,10)
+MAKE_SIZE_INSERT_EXTRACT_FUNCS(qcmp,1,8,3,1,9)
+
+static int
+extract_nps_qcmp_m3 (unsigned insn ATTRIBUTE_UNUSED,
+ bfd_boolean * invalid ATTRIBUTE_UNUSED)
+{
+ int m3 = (insn >> 5) & 0xf;
+ if (m3 == 0xf)
+ *invalid = TRUE;
+ return m3;
+}
+
+static int
+extract_nps_qcmp_m2 (unsigned insn ATTRIBUTE_UNUSED,
+ bfd_boolean * invalid ATTRIBUTE_UNUSED)
+{
+ bfd_boolean tmp_invalid = FALSE;
+ int m2 = (insn >> 15) & 0x1;
+ int m3 = extract_nps_qcmp_m3 (insn, &tmp_invalid);
+
+ if (m2 == 0 && m3 == 0xf)
+ *invalid = TRUE;
+ return m2;
+}
+
+static int
+extract_nps_qcmp_m1 (unsigned insn ATTRIBUTE_UNUSED,
+ bfd_boolean * invalid ATTRIBUTE_UNUSED)
+{
+ bfd_boolean tmp_invalid = FALSE;
+ int m1 = (insn >> 14) & 0x1;
+ int m2 = extract_nps_qcmp_m2 (insn, &tmp_invalid);
+ int m3 = extract_nps_qcmp_m3 (insn, &tmp_invalid);
+
+ if (m1 == 0 && m2 == 0 && m3 == 0xf)
+ *invalid = TRUE;
+ return m1;
+}
+
+static unsigned
+insert_nps_calc_entry_size (unsigned insn ATTRIBUTE_UNUSED,
+ int value ATTRIBUTE_UNUSED,
+ const char **errmsg ATTRIBUTE_UNUSED)
+{
+ unsigned pwr;
+
+ if (value < 1 || value > 256)
+ {
+ *errmsg = _("value out of range 1 - 256");
+ return 0;
+ }
+
+ for (pwr = 0; (value & 1) == 0; value >>= 1)
+ ++pwr;
+
+ if (value != 1)
+ {
+ *errmsg = _("value must be power of 2");
+ return 0;
+ }
+
+ return insn | (pwr << 8);
+}
+
+static int
+extract_nps_calc_entry_size (unsigned insn ATTRIBUTE_UNUSED,
+ bfd_boolean * invalid ATTRIBUTE_UNUSED)
+{
+ unsigned entry_size = (insn >> 8) & 0xf;
+ return 1 << entry_size;
+}
+
/* Include the generic extract/insert functions. Order is important
as some of the functions present in the .h may be disabled via
defines. */
@@ -1053,6 +1163,14 @@ const struct arc_flag_operand arc_flag_operands[] =
#define F_NPS_HWS_RESTORE (F_NPS_HWS_OFF + 1)
{ "restore", 0, 0, 0, 1 },
+#define F_NPS_SX (F_NPS_HWS_RESTORE + 1)
+ { "sx", 1, 1, 14, 1 },
+
+#define F_NPS_AR (F_NPS_SX + 1)
+ { "ar", 0, 1, 0, 1 },
+
+#define F_NPS_AL (F_NPS_AR + 1)
+ { "al", 1, 1, 0, 1 },
};
const unsigned arc_num_flag_operands = ARRAY_SIZE (arc_flag_operands);
@@ -1154,6 +1272,11 @@ const struct arc_flag_class arc_flag_classes[] =
#define C_NPS_HWS_RESTORE (C_NPS_HWS_OFF + 1)
{ F_CLASS_REQUIRED, { F_NPS_HWS_RESTORE, F_NULL}},
+#define C_NPS_SX (C_NPS_HWS_RESTORE + 1)
+ { F_CLASS_OPTIONAL, { F_NPS_SX, F_NULL}},
+
+#define C_NPS_AR_AL (C_NPS_SX + 1)
+ { F_CLASS_REQUIRED, { F_NPS_AR, F_NPS_AL, F_NULL}},
};
const unsigned char flags_none[] = { 0 };
@@ -1520,6 +1643,45 @@ const struct arc_operand arc_operands[] =
#define NPS_XLDST_UIMM16 (NPS_RFLT_UIMM6 + 1)
{ 16, 0, BFD_RELOC_ARC_NPS_CMEM16, ARC_OPERAND_UNSIGNED | ARC_OPERAND_NCHK, insert_nps_cmem_uimm16, extract_nps_cmem_uimm16 },
+
+#define NPS_SRC2_POS (NPS_XLDST_UIMM16 + 1)
+ { 0, 0, 0, ARC_OPERAND_UNSIGNED | ARC_OPERAND_NCHK, insert_nps_src2_pos, extract_nps_src2_pos },
+
+#define NPS_SRC1_POS (NPS_SRC2_POS + 1)
+ { 0, 0, 0, ARC_OPERAND_UNSIGNED | ARC_OPERAND_NCHK, insert_nps_src1_pos, extract_nps_src1_pos },
+
+#define NPS_ADDB_SIZE (NPS_SRC1_POS + 1)
+ { 0, 0, 0, ARC_OPERAND_UNSIGNED | ARC_OPERAND_NCHK, insert_nps_addb_size, extract_nps_addb_size },
+
+#define NPS_ANDB_SIZE (NPS_ADDB_SIZE + 1)
+ { 0, 0, 0, ARC_OPERAND_UNSIGNED | ARC_OPERAND_NCHK, insert_nps_andb_size, extract_nps_andb_size },
+
+#define NPS_FXORB_SIZE (NPS_ANDB_SIZE + 1)
+ { 0, 0, 0, ARC_OPERAND_UNSIGNED | ARC_OPERAND_NCHK, insert_nps_fxorb_size, extract_nps_fxorb_size },
+
+#define NPS_WXORB_SIZE (NPS_FXORB_SIZE + 1)
+ { 0, 0, 0, ARC_OPERAND_UNSIGNED | ARC_OPERAND_NCHK, insert_nps_wxorb_size, extract_nps_wxorb_size },
+
+#define NPS_R_XLDST (NPS_WXORB_SIZE + 1)
+ { 6, 5, 0, ARC_OPERAND_IR, NULL, NULL },
+
+#define NPS_DIV_UIMM4 (NPS_R_XLDST + 1)
+ { 4, 5, 0, ARC_OPERAND_UNSIGNED, NULL, NULL },
+
+#define NPS_QCMP_SIZE (NPS_DIV_UIMM4 + 1)
+ { 0, 0, 0, ARC_OPERAND_UNSIGNED | ARC_OPERAND_NCHK, insert_nps_qcmp_size, extract_nps_qcmp_size },
+
+#define NPS_QCMP_M1 (NPS_QCMP_SIZE + 1)
+ { 1, 14, 0, ARC_OPERAND_UNSIGNED, NULL, extract_nps_qcmp_m1 },
+
+#define NPS_QCMP_M2 (NPS_QCMP_M1 + 1)
+ { 1, 15, 0, ARC_OPERAND_UNSIGNED, NULL, extract_nps_qcmp_m2 },
+
+#define NPS_QCMP_M3 (NPS_QCMP_M2 + 1)
+ { 4, 5, 0, ARC_OPERAND_UNSIGNED, NULL, extract_nps_qcmp_m3 },
+
+#define NPS_CALC_ENTRY_SIZE (NPS_QCMP_M3 + 1)
+ { 0, 0, 0, ARC_OPERAND_UNSIGNED | ARC_OPERAND_NCHK, insert_nps_calc_entry_size, extract_nps_calc_entry_size },
};
const unsigned arc_num_operands = ARRAY_SIZE (arc_operands);
--
2.5.1
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 1/2] opcodes/arc: Add more nps instructions
2016-04-14 16:36 ` [PATCH 1/2] opcodes/arc: Add " Andrew Burgess
@ 2016-04-18 11:23 ` Nick Clifton
2016-04-20 13:19 ` Claudiu Zissulescu
0 siblings, 1 reply; 9+ messages in thread
From: Nick Clifton @ 2016-04-18 11:23 UTC (permalink / raw)
To: Andrew Burgess, binutils; +Cc: Claudiu.Zissulescu, Cupertino.Miranda, noamca
Hi Andrew,
> gas/ChangeLog:
>
> * testsuite/gas/arc/nps400-4.d: New file.
> * testsuite/gas/arc/nps400-4.s: New file.
> * testsuite/gas/arc/nps400-5.d: New file.
> * testsuite/gas/arc/nps400-5.s: New file.
>
> include/ChangeLog:
>
> * opcode/arc.h (insn_class_t): Add NET and ACL class.
>
> opcodes/ChangeLog:
>
> * arc-nps400-tbl.h: Add dctcp, dcip, dcet, and dcacl instructions.
Approved - please apply.
Cheers
Nick
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 2/2] opcodes/arc: Add yet more nps instructions
2016-04-14 16:36 ` [PATCH 2/2] opcodes/arc: Add yet more nps instructions Andrew Burgess
@ 2016-04-19 16:05 ` Nick Clifton
0 siblings, 0 replies; 9+ messages in thread
From: Nick Clifton @ 2016-04-19 16:05 UTC (permalink / raw)
To: Andrew Burgess, binutils; +Cc: Claudiu.Zissulescu, Cupertino.Miranda, noamca
Hi Andrew,
> gas/ChangeLog:
>
> * testsuite/gas/arc/nps400-6.d: New file.
> * testsuite/gas/arc/nps400-6.s: New file.
>
> include/ChangeLog:
>
> * opcode/arc.h (MAX_INSN_ARGS): Increase 6 to 8.
>
> opcodes/ChangeLog:
>
> * arc-nps400-tbl.h: Add addb, subb, adcb, sbcb, andb, xorb, orb,
> fxorb, wxorb, shlb, shrb, notb, cntbb, div, mod, divm, and qcmp
> instructions.
> * arc-opc.c (insert_nps_bitop_size): Delete.
> (extract_nps_bitop_size): Delete.
> (MAKE_SRC_POS_INSERT_EXTRACT_FUNCS): Define, and use.
> (extract_nps_qcmp_m3): Define.
> (extract_nps_qcmp_m2): Define.
> (extract_nps_qcmp_m1): Define.
> (arc_flag_operands): Add F_NPS_SX, F_NPS_AR, F_NPS_AL.
> (arc_flag_classes): Add C_NPS_SX, C_NPS_AR_AL
> (arc_operands): Add NPS_SRC2_POS, NPS_SRC1_POS, NPS_ADDB_SIZE,
> NPS_ANDB_SIZE, NPS_FXORB_SIZ, NPS_WXORB_SIZ, NPS_R_XLDST,
> NPS_DIV_UIMM4, NPS_QCMP_SIZE, NPS_QCMP_M1, NPS_QCMP_M2, and
> NPS_QCMP_M3.
Approved - please apply.
Cheers
Nick
^ permalink raw reply [flat|nested] 9+ messages in thread
* RE: [PATCH 1/2] opcodes/arc: Add more nps instructions
2016-04-18 11:23 ` Nick Clifton
@ 2016-04-20 13:19 ` Claudiu Zissulescu
2016-04-21 13:34 ` Andrew Burgess
2016-04-21 14:50 ` Andrew Burgess
0 siblings, 2 replies; 9+ messages in thread
From: Claudiu Zissulescu @ 2016-04-20 13:19 UTC (permalink / raw)
To: Nick Clifton, Andrew Burgess, binutils; +Cc: Cupertino.Miranda, noamca
Hi Andrew,
Those patches:
> >
> > * testsuite/gas/arc/nps400-4.d: New file.
> > * testsuite/gas/arc/nps400-4.s: New file.
> > * testsuite/gas/arc/nps400-5.d: New file.
> > * testsuite/gas/arc/nps400-5.s: New file.
> >
Together with nps400-6.s are currently failing. Are they also fixed by your latest approved patches?
Best,
Claudiu
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 1/2] opcodes/arc: Add more nps instructions
2016-04-20 13:19 ` Claudiu Zissulescu
@ 2016-04-21 13:34 ` Andrew Burgess
2016-04-21 14:50 ` Andrew Burgess
1 sibling, 0 replies; 9+ messages in thread
From: Andrew Burgess @ 2016-04-21 13:34 UTC (permalink / raw)
To: Claudiu Zissulescu; +Cc: Nick Clifton, binutils, Cupertino.Miranda, noamca
* Claudiu Zissulescu <Claudiu.Zissulescu@synopsys.com> [2016-04-20 13:19:26 +0000]:
> Those patches:
> > >
> > > * testsuite/gas/arc/nps400-4.d: New file.
> > > * testsuite/gas/arc/nps400-4.s: New file.
> > > * testsuite/gas/arc/nps400-5.d: New file.
> > > * testsuite/gas/arc/nps400-5.s: New file.
> > >
> Together with nps400-6.s are currently failing. Are they also fixed by your latest approved patches?
Claudiu,
Sorry for the delay. I will investigate these later today.
Thanks,
Andrew
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 1/2] opcodes/arc: Add more nps instructions
2016-04-20 13:19 ` Claudiu Zissulescu
2016-04-21 13:34 ` Andrew Burgess
@ 2016-04-21 14:50 ` Andrew Burgess
2016-04-22 6:56 ` Claudiu Zissulescu
1 sibling, 1 reply; 9+ messages in thread
From: Andrew Burgess @ 2016-04-21 14:50 UTC (permalink / raw)
To: Claudiu Zissulescu; +Cc: Nick Clifton, binutils, Cupertino.Miranda, noamca
* Claudiu Zissulescu <Claudiu.Zissulescu@synopsys.com> [2016-04-20 13:19:26 +0000]:
> Those patches:
> > >
> > > * testsuite/gas/arc/nps400-4.d: New file.
> > > * testsuite/gas/arc/nps400-4.s: New file.
> > > * testsuite/gas/arc/nps400-5.d: New file.
> > > * testsuite/gas/arc/nps400-5.s: New file.
> > >
> Together with nps400-6.s are currently failing. Are they also fixed by your latest approved patches?
I've retested with targets arceb-elf and arc-elf, and I'm not seeing
any failures now. Let me know if you're still seeing issues, or if
you're using a different target that is showing failures.
Thanks,
Andrew
^ permalink raw reply [flat|nested] 9+ messages in thread
* RE: [PATCH 1/2] opcodes/arc: Add more nps instructions
2016-04-21 14:50 ` Andrew Burgess
@ 2016-04-22 6:56 ` Claudiu Zissulescu
0 siblings, 0 replies; 9+ messages in thread
From: Claudiu Zissulescu @ 2016-04-22 6:56 UTC (permalink / raw)
To: Andrew Burgess; +Cc: Nick Clifton, binutils, Cupertino.Miranda, noamca
Everything is fine. False alarm.
Thanks for checking it up!
//Claudiu
> -----Original Message-----
> From: Andrew Burgess [mailto:andrew.burgess@embecosm.com]
> Sent: Thursday, April 21, 2016 4:50 PM
> To: Claudiu Zissulescu
> Cc: Nick Clifton; binutils@sourceware.org;
> Cupertino.Miranda@synopsys.com; noamca@mellanox.com
> Subject: Re: [PATCH 1/2] opcodes/arc: Add more nps instructions
>
> * Claudiu Zissulescu <Claudiu.Zissulescu@synopsys.com> [2016-04-20
> 13:19:26 +0000]:
>
> > Those patches:
> > > >
> > > > * testsuite/gas/arc/nps400-4.d: New file.
> > > > * testsuite/gas/arc/nps400-4.s: New file.
> > > > * testsuite/gas/arc/nps400-5.d: New file.
> > > > * testsuite/gas/arc/nps400-5.s: New file.
> > > >
> > Together with nps400-6.s are currently failing. Are they also fixed by your
> latest approved patches?
>
> I've retested with targets arceb-elf and arc-elf, and I'm not seeing
> any failures now. Let me know if you're still seeing issues, or if
> you're using a different target that is showing failures.
>
> Thanks,
> Andrew
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2016-04-22 6:56 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-04-14 16:36 [PATCH 0/2] [ARC] Two additional sets of nps400 instructions Andrew Burgess
2016-04-14 16:36 ` [PATCH 2/2] opcodes/arc: Add yet more nps instructions Andrew Burgess
2016-04-19 16:05 ` Nick Clifton
2016-04-14 16:36 ` [PATCH 1/2] opcodes/arc: Add " Andrew Burgess
2016-04-18 11:23 ` Nick Clifton
2016-04-20 13:19 ` Claudiu Zissulescu
2016-04-21 13:34 ` Andrew Burgess
2016-04-21 14:50 ` Andrew Burgess
2016-04-22 6:56 ` Claudiu Zissulescu
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).