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

fix(cpu): fix imm value calculation in MSR

This commit is contained in:
Rekai Nyangadzayi Musuka 2022-01-14 04:08:04 -04:00
parent 7f6ab626d9
commit 37bd6758fb
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/cpu/psr_transfer.zig
View File

@ -24,15 +24,13 @@ pub fn psrTransfer(comptime I: bool, comptime isSpsr: bool) InstrFn {
switch (@truncate(u3, opcode >> 16)) { switch (@truncate(u3, opcode >> 16)) {
0b000 => { 0b000 => {
const right = if (I) std.math.rotr(u32, opcode & 0xFF, opcode >> 8 & 0xF) else cpu.r[rm]; const right = if (I) std.math.rotr(u32, opcode & 0xFF, opcode >> 7 & 0xF) else cpu.r[rm];
if (isSpsr) { if (isSpsr) {
std.debug.panic("[CPU] TODO: MSR (flags only) on SPSR_<current_mode> is unimplemented", .{}); std.debug.panic("[CPU] TODO: MSR (flags only) on SPSR_<current_mode> is unimplemented", .{});
} else { } else {
cpu.cpsr.n.write(right >> 31 & 1 == 1); const mask: u32 = 0xF000_0000;
cpu.cpsr.z.write(right >> 30 & 1 == 1); cpu.cpsr.raw = (cpu.cpsr.raw & ~mask) | (right & mask);
cpu.cpsr.c.write(right >> 29 & 1 == 1);
cpu.cpsr.v.write(right >> 28 & 1 == 1);
} }
}, },
0b001 => { 0b001 => {