paoda
/
zba
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix(cpu): properly decode THUMB PUSH and POP at comptime

This commit is contained in:
Rekai Nyangadzayi Musuka 2022-01-30 00:16:13 -04:00
parent dc6931639f
commit 6ffaf12804
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/cpu.zig
View File

@ -394,8 +394,8 @@ fn thumbPopulate() [0x400]ThumbInstrFn {
} }
if (i >> 6 & 0xF == 0b1011 and i >> 3 & 0x3 == 0b10) { if (i >> 6 & 0xF == 0b1011 and i >> 3 & 0x3 == 0b10) {
const L = i >> 11 & 1 == 1; const L = i >> 5 & 1 == 1;
const R = i >> 8 & 1 == 1; const R = i >> 2 & 1 == 1;
lut[i] = format14(L, R); lut[i] = format14(L, R);
} }

2
src/cpu/thumb/format14.zig
View File

@ -44,7 +44,7 @@ pub fn format14(comptime L: bool, comptime R: bool) InstrFn {
} }
} }
cpu.r[13] = address; cpu.r[13] = address + if (!L) 4 else 0;
} }
}.inner; }.inner;
} }