v5: rename JNEBS_OPCODE to JBSMATCH_OPCODE for consistency
Test: TH
Change-Id: If0d37ede2d3ad1c51eb7553b794fe2dcb2acd825
diff --git a/disassembler.c b/disassembler.c
index 6d10c7c..da4bb64 100644
--- a/disassembler.c
+++ b/disassembler.c
@@ -70,7 +70,7 @@
[JGT_OPCODE] = "jgt",
[JLT_OPCODE] = "jlt",
[JSET_OPCODE] = "jset",
- [JNEBS_OPCODE] = "jnebs",
+ [JBSMATCH_OPCODE] = NULL,
[LDDW_OPCODE] = "lddw",
[STDW_OPCODE] = "stdw",
[WRITE_OPCODE] = "write",
@@ -186,11 +186,11 @@
print_jump_target(*pc + imm, program_len);
break;
}
- case JNEBS_OPCODE: {
+ case JBSMATCH_OPCODE: {
if (reg_num == 0) {
- PRINT_OPCODE();
+ print_opcode("jbsne");
} else {
- print_opcode("jebs");
+ print_opcode("jbseq");
}
bprintf("r0, ");
uint32_t cmp_imm = 0;
diff --git a/testdata/one_ra_with_counters.output b/testdata/one_ra_with_counters.output
index 27c6c6c..4cd2b65 100644
--- a/testdata/one_ra_with_counters.output
+++ b/testdata/one_ra_with_counters.output
@@ -27,25 +27,25 @@
96 ffffffac 295: ldm r0, m[15]
0 ffffffac 297: jgt r0, 0x258, 495
0 ffffffac 302: li r0, 0
- 0 ffffffac 303: jnebs r0, 0xf, 495, 428e66343deb28a24b792e9086dd68
+ 0 ffffffac 303: jbsne r0, 0xf, 495, 428e66343deb28a24b792e9086dd68
0 ffffffac 321: li r0, 18
- 12 ffffffac 323: jnebs r0, 0x26, 495, 00603afffe8000000000000002005efffe000265fe80000000000000408e66fffe343deb8600
+ 12 ffffffac 323: jbsne r0, 0x26, 495, 00603afffe8000000000000002005efffe000265fe80000000000000408e66fffe343deb8600
12 ffffffac 364: li r0, 58
- 3a ffffffac 366: jnebs r0, 0x2, 495, 4000
+ 3a ffffffac 366: jbsne r0, 0x2, 495, 4000
3a ffffffac 371: ldh r0, [60]
e10 ffffffac 373: jlt r0, 0x258, 495
e10 ffffffac 378: li r0, 62
- 3e ffffffac 380: jnebs r0, 0x14, 495, 0000000000000000010100005e00026519050000
+ 3e ffffffac 380: jbsne r0, 0x14, 495, 0000000000000000010100005e00026519050000
3e ffffffac 403: ldw r0, [82]
e10 ffffffac 405: jlt r0, 0x258, 495
e10 ffffffac 410: li r0, 86
- 56 ffffffac 412: jnebs r0, 0x24, 495, 2001486048600000000000000000884420014860486000000000000000008888030440c0
+ 56 ffffffac 412: jbsne r0, 0x24, 495, 2001486048600000000000000000884420014860486000000000000000008888030440c0
56 ffffffac 451: ldw r0, [122]
278d00 ffffffac 453: jlt r0, 0x258, 495
278d00 ffffffac 458: ldw r0, [126]
93a80 ffffffac 460: jlt r0, 0x258, 495
93a80 ffffffac 465: li r0, 130
- 82 ffffffac 468: jnebs r0, 0x14, 495, 000000002a0079e10abc0e000000000000000000
+ 82 ffffffac 468: jbsne r0, 0x14, 495, 000000002a0079e10abc0e000000000000000000
82 ffffffac 491: li r1, -56
82 ffffffc8 493: jmp 503
82 ffffffc8 503: lddw r0, [r1]
diff --git a/testdata/one_ra_with_counters_age_30.output b/testdata/one_ra_with_counters_age_30.output
index 24f0a55..b2727f6 100644
--- a/testdata/one_ra_with_counters_age_30.output
+++ b/testdata/one_ra_with_counters_age_30.output
@@ -27,25 +27,25 @@
96 ffffffac 295: ldm r0, m[15]
1e ffffffac 297: jgt r0, 0x258, 495
1e ffffffac 302: li r0, 0
- 0 ffffffac 303: jnebs r0, 0xf, 495, 428e66343deb28a24b792e9086dd68
+ 0 ffffffac 303: jbsne r0, 0xf, 495, 428e66343deb28a24b792e9086dd68
0 ffffffac 321: li r0, 18
- 12 ffffffac 323: jnebs r0, 0x26, 495, 00603afffe8000000000000002005efffe000265fe80000000000000408e66fffe343deb8600
+ 12 ffffffac 323: jbsne r0, 0x26, 495, 00603afffe8000000000000002005efffe000265fe80000000000000408e66fffe343deb8600
12 ffffffac 364: li r0, 58
- 3a ffffffac 366: jnebs r0, 0x2, 495, 4000
+ 3a ffffffac 366: jbsne r0, 0x2, 495, 4000
3a ffffffac 371: ldh r0, [60]
e10 ffffffac 373: jlt r0, 0x258, 495
e10 ffffffac 378: li r0, 62
- 3e ffffffac 380: jnebs r0, 0x14, 495, 0000000000000000010100005e00026519050000
+ 3e ffffffac 380: jbsne r0, 0x14, 495, 0000000000000000010100005e00026519050000
3e ffffffac 403: ldw r0, [82]
e10 ffffffac 405: jlt r0, 0x258, 495
e10 ffffffac 410: li r0, 86
- 56 ffffffac 412: jnebs r0, 0x24, 495, 2001486048600000000000000000884420014860486000000000000000008888030440c0
+ 56 ffffffac 412: jbsne r0, 0x24, 495, 2001486048600000000000000000884420014860486000000000000000008888030440c0
56 ffffffac 451: ldw r0, [122]
278d00 ffffffac 453: jlt r0, 0x258, 495
278d00 ffffffac 458: ldw r0, [126]
93a80 ffffffac 460: jlt r0, 0x258, 495
93a80 ffffffac 465: li r0, 130
- 82 ffffffac 468: jnebs r0, 0x14, 495, 000000002a0079e10abc0e000000000000000000
+ 82 ffffffac 468: jbsne r0, 0x14, 495, 000000002a0079e10abc0e000000000000000000
82 ffffffac 491: li r1, -56
82 ffffffc8 493: jmp 503
82 ffffffc8 503: lddw r0, [r1]
diff --git a/testdata/one_ra_with_counters_age_600.output b/testdata/one_ra_with_counters_age_600.output
index eee3d64..6538ceb 100644
--- a/testdata/one_ra_with_counters_age_600.output
+++ b/testdata/one_ra_with_counters_age_600.output
@@ -27,25 +27,25 @@
96 ffffffac 295: ldm r0, m[15]
258 ffffffac 297: jgt r0, 0x258, 495
258 ffffffac 302: li r0, 0
- 0 ffffffac 303: jnebs r0, 0xf, 495, 428e66343deb28a24b792e9086dd68
+ 0 ffffffac 303: jbsne r0, 0xf, 495, 428e66343deb28a24b792e9086dd68
0 ffffffac 321: li r0, 18
- 12 ffffffac 323: jnebs r0, 0x26, 495, 00603afffe8000000000000002005efffe000265fe80000000000000408e66fffe343deb8600
+ 12 ffffffac 323: jbsne r0, 0x26, 495, 00603afffe8000000000000002005efffe000265fe80000000000000408e66fffe343deb8600
12 ffffffac 364: li r0, 58
- 3a ffffffac 366: jnebs r0, 0x2, 495, 4000
+ 3a ffffffac 366: jbsne r0, 0x2, 495, 4000
3a ffffffac 371: ldh r0, [60]
e10 ffffffac 373: jlt r0, 0x258, 495
e10 ffffffac 378: li r0, 62
- 3e ffffffac 380: jnebs r0, 0x14, 495, 0000000000000000010100005e00026519050000
+ 3e ffffffac 380: jbsne r0, 0x14, 495, 0000000000000000010100005e00026519050000
3e ffffffac 403: ldw r0, [82]
e10 ffffffac 405: jlt r0, 0x258, 495
e10 ffffffac 410: li r0, 86
- 56 ffffffac 412: jnebs r0, 0x24, 495, 2001486048600000000000000000884420014860486000000000000000008888030440c0
+ 56 ffffffac 412: jbsne r0, 0x24, 495, 2001486048600000000000000000884420014860486000000000000000008888030440c0
56 ffffffac 451: ldw r0, [122]
278d00 ffffffac 453: jlt r0, 0x258, 495
278d00 ffffffac 458: ldw r0, [126]
93a80 ffffffac 460: jlt r0, 0x258, 495
93a80 ffffffac 465: li r0, 130
- 82 ffffffac 468: jnebs r0, 0x14, 495, 000000002a0079e10abc0e000000000000000000
+ 82 ffffffac 468: jbsne r0, 0x14, 495, 000000002a0079e10abc0e000000000000000000
82 ffffffac 491: li r1, -56
82 ffffffc8 493: jmp 503
82 ffffffc8 503: lddw r0, [r1]
diff --git a/v5/apf.h b/v5/apf.h
index c28a380..dd254d9 100644
--- a/v5/apf.h
+++ b/v5/apf.h
@@ -168,7 +168,7 @@
#define JGT_OPCODE 17 // Compare greater than and branch, e.g. "jgt R0,5,label"
#define JLT_OPCODE 18 // Compare less than and branch, e.g. "jlt R0,5,label"
#define JSET_OPCODE 19 // Compare any bits set and branch, e.g. "jset R0,5,label"
-#define JNEBS_OPCODE 20 // Compare not equal byte sequence, e.g. "jnebs R0,5,label,0x1122334455"
+#define JBSMATCH_OPCODE 20 // Compare byte sequence [R=0 not] equal, e.g. "jbsne R0,2,label,0x1122"
#define EXT_OPCODE 21 // Immediate value is one of *_EXT_OPCODE
#define LDDW_OPCODE 22 // Load 4 bytes from data address (register + simm): "lddw R0, [5+R1]"
#define STDW_OPCODE 23 // Store 4 bytes to data address (register + simm): "stdw R0, [5+R1]"
diff --git a/v5/apf_interpreter.c b/v5/apf_interpreter.c
index 3d1d63e..7cf7cfc 100644
--- a/v5/apf_interpreter.c
+++ b/v5/apf_interpreter.c
@@ -233,7 +233,7 @@
#define JGT_OPCODE 17 /* Compare greater than and branch, e.g. "jgt R0,5,label" */
#define JLT_OPCODE 18 /* Compare less than and branch, e.g. "jlt R0,5,label" */
#define JSET_OPCODE 19 /* Compare any bits set and branch, e.g. "jset R0,5,label" */
-#define JNEBS_OPCODE 20 /* Compare not equal byte sequence, e.g. "jnebs R0,5,label,0x1122334455" */
+#define JBSMATCH_OPCODE 20 /* Compare byte sequence [R=0 not] equal, e.g. "jbsne R0,2,label,0x1122" */
#define EXT_OPCODE 21 /* Immediate value is one of *_EXT_OPCODE */
#define LDDW_OPCODE 22 /* Load 4 bytes from data address (register + simm): "lddw R0, [5+R1]" */
#define STDW_OPCODE 23 /* Store 4 bytes to data address (register + simm): "stdw R0, [5+R1]" */
@@ -720,7 +720,7 @@
case JGT_OPCODE:
case JLT_OPCODE:
case JSET_OPCODE:
- case JNEBS_OPCODE: {
+ case JBSMATCH_OPCODE: {
/* Load second immediate field. */
u32 cmp_imm = 0;
if (reg_num == 1) {
@@ -736,7 +736,7 @@
case JGT_OPCODE: if (registers[0] > cmp_imm) pc += imm; break;
case JLT_OPCODE: if (registers[0] < cmp_imm) pc += imm; break;
case JSET_OPCODE: if (registers[0] & cmp_imm) pc += imm; break;
- case JNEBS_OPCODE: {
+ case JBSMATCH_OPCODE: {
/* cmp_imm is size in bytes of data to compare. */
/* pc is offset of program bytes to compare. */
/* imm is jump target offset. */
diff --git a/v5/apf_interpreter_source.c b/v5/apf_interpreter_source.c
index b996956..c6b5b6d 100644
--- a/v5/apf_interpreter_source.c
+++ b/v5/apf_interpreter_source.c
@@ -202,7 +202,7 @@
case JGT_OPCODE:
case JLT_OPCODE:
case JSET_OPCODE:
- case JNEBS_OPCODE: {
+ case JBSMATCH_OPCODE: {
// Load second immediate field.
u32 cmp_imm = 0;
if (reg_num == 1) {
@@ -218,7 +218,7 @@
case JGT_OPCODE: if (registers[0] > cmp_imm) pc += imm; break;
case JLT_OPCODE: if (registers[0] < cmp_imm) pc += imm; break;
case JSET_OPCODE: if (registers[0] & cmp_imm) pc += imm; break;
- case JNEBS_OPCODE: {
+ case JBSMATCH_OPCODE: {
// cmp_imm is size in bytes of data to compare.
// pc is offset of program bytes to compare.
// imm is jump target offset.
