diff options
| author | Maciej Żenczykowski <maze@google.com> | 2024-03-20 13:02:34 -0700 |
|---|---|---|
| committer | Maciej Żenczykowski <maze@google.com> | 2024-03-20 13:03:27 -0700 |
| commit | 3bd1158007bc6620ad963839ed471298e2fc5801 (patch) | |
| tree | aeeb9ddf8d24285c6f633b3c3a287875f7b34fb2 | |
| parent | d2e302b5d53df7ec18bc2101577b806c83da7147 (diff) | |
| download | apf-3bd1158007bc6620ad963839ed471298e2fc5801.tar.gz | |
apf2java: adjust for jnebs -> jbsne rename
Test: N/A
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Icd371541a348b6e3b09d00afbacb9743e07093e8
| -rwxr-xr-x | apf2java/apf2java.sh | 2 | ||||
| -rw-r--r-- | apf2java/apf2java.txt | 28 |
2 files changed, 15 insertions, 15 deletions
diff --git a/apf2java/apf2java.sh b/apf2java/apf2java.sh index 77f1c6f..b46fea6 100755 --- a/apf2java/apf2java.sh +++ b/apf2java/apf2java.sh @@ -13,7 +13,7 @@ sed -r \ 's@: swap +@: gen.addSwap();@;'\ 's@: neg +r([01])@: gen.addNeg(R\1);@;'\ 's@: jmp +(PASS|DROP)@: gen.addJump(\1_LABEL);@;'\ -'s@: jnebs +r0, 0x([0-9a-f]+), ([0-9]+), ([0-9a-f]+)@: gen.addJumpIfBytesAtR0NotEqual(hexStringToByteArray("\3"), LABEL_\2);@;'\ +'s@: jbsne +r0, 0x([0-9a-f]+), ([0-9]+), ([0-9a-f]+)@: gen.addJumpIfBytesAtR0NotEqual(hexStringToByteArray("\3"), LABEL_\2);@;'\ 's@: jeq +r([01]), 0x([0-9a-f]+), ([0-9]+)@: gen.addJumpIfR\1Equals(0x\2, LABEL_\3);@;'\ 's@: jne +r([01]), 0x([0-9a-f]+), ([0-9]+)@: gen.addJumpIfR\1NotEquals(0x\2, LABEL_\3);@;'\ 's@: jlt +r([01]), 0x([0-9a-f]+), ([0-9]+)@: gen.addJumpIfR\1LessThan(0x\2, LABEL_\3);@;'\ diff --git a/apf2java/apf2java.txt b/apf2java/apf2java.txt index 761a8e1..6012332 100644 --- a/apf2java/apf2java.txt +++ b/apf2java/apf2java.txt @@ -15,7 +15,7 @@ 47: jne r0, 0x806, 122 52: li r0, 14 54: li r1, -152 - 57: jnebs r0, 0x6, 570, 000108000604 + 57: jbsne r0, 0x6, 570, 000108000604 68: ldh r0, [20] 70: jeq r0, 0x1, 104 73: li r1, -156 @@ -25,10 +25,10 @@ 85: jeq r0, 0x0, 570 90: li r0, 0 91: li r1, -56 - 93: jnebs r0, 0x6, 564, ffffffffffff + 93: jbsne r0, 0x6, 564, ffffffffffff 104: li r0, 38 106: li r1, -80 - 108: jnebs r0, 0x4, 570, c0a801ec + 108: jbsne r0, 0x4, 570, c0a801ec 117: li r1, -20 119: jmp 564 122: ldh r0, [12] @@ -42,7 +42,7 @@ 145: jne r0, 0x44, 165 148: li r0, 50 150: add r0, r1 - 151: jnebs r0, 0x6, 165, 7e9046bc7008 + 151: jbsne r0, 0x6, 165, 7e9046bc7008 160: li r1, -24 162: jmp 564 165: ldb r0, [30] @@ -65,7 +65,7 @@ 222: jmp 570 225: li r1, -36 227: li r0, 0 - 228: jnebs r0, 0x6, 564, ffffffffffff + 228: jbsne r0, 0x6, 564, ffffffffffff 239: li r1, -84 241: jmp 570 244: li r1, -28 @@ -73,7 +73,7 @@ 249: jeq r0, 0x86dd, 273 254: li r0, 0 255: li r1, -60 - 257: jnebs r0, 0x6, 564, ffffffffffff + 257: jbsne r0, 0x6, 564, ffffffffffff 268: li r1, -68 270: jmp 570 273: ldb r0, [20] @@ -89,7 +89,7 @@ 301: jeq r0, 0x85, 570 306: jne r0, 0x88, 333 309: li r0, 38 - 311: jnebs r0, 0xf, 333, ff0200000000000000000000000000 + 311: jbsne r0, 0xf, 333, ff0200000000000000000000000000 329: li r1, -104 331: jmp 570 333: ldm r0, m[14] @@ -97,18 +97,18 @@ 338: ldm r0, m[15] 340: jgt r0, 0x48e, 562 345: li r0, 0 - 346: jnebs r0, 0xf, 562, 7e9046bc700828c68e23672c86dd60 + 346: jbsne r0, 0xf, 562, 7e9046bc700828c68e23672c86dd60 364: li r0, 18 - 366: jnebs r0, 0x14, 562, 00603afffe800000000000002ac68efffe23672c + 366: jbsne r0, 0x14, 562, 00603afffe800000000000002ac68efffe23672c 389: li r0, 54 - 391: jnebs r0, 0x2, 562, 8600 + 391: jbsne r0, 0x2, 562, 8600 396: li r0, 58 - 398: jnebs r0, 0x2, 562, 40c0 + 398: jbsne r0, 0x2, 562, 40c0 403: ldh r0, [60] 405: jlt r0, 0x91e, 562 410: jgt r0, 0x1b58, 562 415: li r0, 62 - 417: jnebs r0, 0x1c, 562, 0000000000000000010128c68e23672c05010000000005dc030440c0 + 417: jbsne r0, 0x1c, 562, 0000000000000000010128c68e23672c05010000000005dc030440c0 448: ldw r0, [90] 450: jlt r0, 0x55555555, 562 459: jgt r0, 0xffffffff, 562 @@ -116,14 +116,14 @@ 470: jlt r0, 0x55555555, 562 479: jgt r0, 0xffffffff, 562 488: li r0, 98 - 490: jnebs r0, 0x18, 562, 000000002401fa000480f000000000000000000019030000 + 490: jbsne r0, 0x18, 562, 000000002401fa000480f000000000000000000019030000 517: ldw r0, [122] 519: jeq r0, 0x0, 562 522: jlt r0, 0x78, 535 525: jlt r0, 0x91e, 562 530: jgt r0, 0x1b58, 562 535: li r0, 126 - 537: jnebs r0, 0x12, 562, 2401fa000480f00000000000000000010701 + 537: jbsne r0, 0x12, 562, 2401fa000480f00000000000000000010701 558: li r1, -72 560: jmp 570 562: li r1, -40 |