fix(cpu): improve MRS and MSR instructions

2022-01-18 20:17:00 -04:00
parent 6177927049
commit fc5a3460dd
2 changed files with 41 additions and 30 deletions
--- a/src/cpu.zig
+++ b/src/cpu.zig
@@ -201,9 +201,10 @@ fn armPopulate() [0x1000]ArmInstrFn {
            if (i >> 10 & 0x3 == 0b00 and i >> 7 & 0x3 == 0b10 and i >> 4 & 1 == 0) {
                // PSR Transfer
                const I = i >> 9 & 1 == 1;
-                const isSpsr = i >> 6 & 1 == 1;
+                const R = i >> 6 & 1 == 1;
+                const kind = i >> 4 & 0x3;

-                lut[i] = psrTransfer(I, isSpsr);
+                lut[i] = psrTransfer(I, R, kind);
            }

            if (i == 0x121) {