344,346c344,346
< const uint32_t a = bits(machInst, 11, 8);
< const bool b = bits(machInst, 4);
< const uint32_t c = bits(machInst, 21, 20);
---
> const uint32_t opc = bits(machInst, 11, 8);
> const bool o1 = bits(machInst, 4);
> const uint32_t size = bits(machInst, 21, 20);
356d355
< const unsigned size = bits(machInst, 21, 20);
360c359
< switch (a) {
---
> switch (opc) {
362c361
< if (b) {
---
> if (o1) {
377c376
< if (!b) {
---
> if (!o1) {
382c381
< switch (c) {
---
> switch (size) {
411c410
< switch (c) {
---
> switch (size) {
456c455
< if (b) {
---
> if (o1) {
471c470
< if (b) {
---
> if (o1) {
479c478
< if (b) {
---
> if (o1) {
492c491
< if (b) {
---
> if (o1) {
505c504
< if (b) {
---
> if (o1) {
513c512
< if (b) {
---
> if (o1) {
530c529
< if (b) {
---
> if (o1) {
548c547
< if (b) {
---
> if (o1) {
568c567
< if (b) {
---
> if (o1) {
576c575
< if (b) {
---
> if (o1) {
593c592
< if (b) {
---
> if (o1) {
595c594
< if (bits(c, 1) == 0) {
---
> if (bits(size, 1) == 0) {
611c610
< switch (c) {
---
> switch (size) {
624c623
< switch (c) {
---
> switch (size) {
640c639
< if (b) {
---
> if (o1) {
642c641
< if (bits(c, 1) == 0) {
---
> if (bits(size, 1) == 0) {
652c651
< if (bits(c, 1) == 0) {
---
> if (bits(size, 1) == 0) {
668c667
< if (bits(c, 1) == 0) {
---
> if (bits(size, 1) == 0) {
682c681
< if (bits(c, 1) == 0) {
---
> if (bits(size, 1) == 0) {
698c697
< if (b) {
---
> if (o1) {
700c699
< if (bits(c, 1) == 0) {
---
> if (bits(size, 1) == 0) {
718c717
< if (bits(c, 1) == 0) {
---
> if (bits(size, 1) == 0) {
732c731
< if (bits(c, 1) == 0) {
---
> if (bits(size, 1) == 0) {
744c743
< if (b) {
---
> if (o1) {
748c747
< if (bits(c, 1) == 0) {
---
> if (bits(size, 1) == 0) {
764c763
< if (bits(c, 1) == 0) {
---
> if (bits(size, 1) == 0) {
778c777
< if (bits(c, 1) == 0) {
---
> if (bits(size, 1) == 0) {
906c905
< const uint32_t a = bits(machInst, 11, 8);
---
> const uint32_t opc = bits(machInst, 11, 8);
908c907
< const bool b = bits(machInst, 6);
---
> const bool q = bits(machInst, 6);
930c929
< if (a != 0xe && a != 0xf) {
---
> if (opc != 0xe && opc != 0xf) {
937c936
< switch (a) {
---
> switch (opc) {
940c939
< b, u, size, machInst, vd, vm, rShiftAmt);
---
> q, u, size, machInst, vd, vm, rShiftAmt);
943c942
< b, u, size, machInst, vd, vm, rShiftAmt);
---
> q, u, size, machInst, vd, vm, rShiftAmt);
946c945
< b, u, size, machInst, vd, vm, rShiftAmt);
---
> q, u, size, machInst, vd, vm, rShiftAmt);
949c948
< b, u, size, machInst, vd, vm, rShiftAmt);
---
> q, u, size, machInst, vd, vm, rShiftAmt);
953c952
< b, size, machInst, vd, vm, rShiftAmt);
---
> q, size, machInst, vd, vm, rShiftAmt);
960c959
< b, size, machInst, vd, vm, lShiftAmt);
---
> q, size, machInst, vd, vm, lShiftAmt);
963c962
< b, size, machInst, vd, vm, lShiftAmt);
---
> q, size, machInst, vd, vm, lShiftAmt);
968c967
< if (a == 0x6) {
---
> if (opc == 0x6) {
970c969
< b, size, machInst, vd, vm, lShiftAmt);
---
> q, size, machInst, vd, vm, lShiftAmt);
973c972
< b, size, machInst, vd, vm, lShiftAmt);
---
> q, size, machInst, vd, vm, lShiftAmt);
977c976
< b, size, machInst, vd, vm, lShiftAmt);
---
> q, size, machInst, vd, vm, lShiftAmt);
984c983
< b, size, machInst, vd, vm, rShiftAmt);
---
> q, size, machInst, vd, vm, rShiftAmt);
987c986
< b, size, machInst, vd, vm, rShiftAmt);
---
> q, size, machInst, vd, vm, rShiftAmt);
994c993
< b, size, machInst, vd, vm, rShiftAmt);
---
> q, size, machInst, vd, vm, rShiftAmt);
997c996
< b, size, machInst, vd, vm, rShiftAmt);
---
> q, size, machInst, vd, vm, rShiftAmt);
1000c999
< if (l || b) {
---
> if (l || q) {
1013c1012
< if (b) {
---
> if (q) {
1021c1020
< if (b) {
---
> if (q) {
1037c1036
< if (b) {
---
> if (q) {
1045c1044
< if (b) {
---
> if (q) {
1062c1061
< const uint32_t a = bits(machInst, 11, 8);
---
> const uint32_t opc = bits(machInst, 11, 8);
1073c1072
< switch (a) {
---
> switch (opc) {
1154c1153
< const uint32_t a = bits(machInst, 11, 8);
---
> const uint32_t opc = bits(machInst, 11, 8);
1167c1166
< switch (a) {
---
> switch (opc) {
1412c1411
< const uint32_t a = bits(machInst, 17, 16);
---
> const uint32_t opc1 = bits(machInst, 17, 16);
1422c1421
< switch (a) {
---
> switch (opc1) {
1750c1749
< const uint32_t b = bits(machInst, 11, 8);
---
> const uint32_t q = bits(machInst, 11, 8);
1790c1789
< } else if (bits(b, 3) == 0 && bits(c, 0) == 0) {
---
> } else if (bits(q, 3) == 0 && bits(c, 0) == 0) {
1792c1791
< } else if (bits(b, 3, 2) == 0x2 && bits(c, 0) == 0) {
---
> } else if (bits(q, 3, 2) == 0x2 && bits(c, 0) == 0) {
1819c1818
< } else if (b == 0xc && (c & 0x9) == 0) {
---
> } else if (q == 0xc && (c & 0x9) == 0) {
2030c2029
< const uint32_t b = bits(machInst, 6, 5);
---
> const uint32_t q = bits(machInst, 6, 5);
2260c2259
< } else if (bits(b, 1) == 0) {
---
> } else if (bits(q, 1) == 0) {