feat(cpu): refactor LDM/STM

This commit is contained in:
Rekai Nyangadzayi Musuka 2022-10-21 05:11:53 -03:00
parent 527bd2889e
commit cffffab8ea
1 changed files with 45 additions and 36 deletions

View File

@ -8,27 +8,42 @@ pub fn blockDataTransfer(comptime P: bool, comptime U: bool, comptime S: bool, c
return struct { return struct {
fn inner(cpu: *Arm7tdmi, bus: *Bus, opcode: u32) void { fn inner(cpu: *Arm7tdmi, bus: *Bus, opcode: u32) void {
const rn = opcode >> 16 & 0xF; const rn = opcode >> 16 & 0xF;
var base = cpu.r[rn]; const base = cpu.r[rn];
// TODO: For Performance (?) if U we got from 0 -> 0xF, if !U, 0xF -> 0
// we can do this and have it be fast because of comptime, baby!
if (!U) {
var count: u32 = 0;
var i: u5 = 0;
while (i < 0x10) : (i += 1) {
count += opcode >> i & 1;
}
base -= count * 4;
}
var address = if (@boolToInt(P) ^ @boolToInt(U) == 0) base + 4 else base;
if (S and opcode >> 15 & 1 == 0) std.debug.panic("[CPU] TODO: STM/LDM with S set but R15 not in transfer list", .{}); if (S and opcode >> 15 & 1 == 0) std.debug.panic("[CPU] TODO: STM/LDM with S set but R15 not in transfer list", .{});
if (U) {
// Increment
var address = if (P) base + 4 else base;
var i: u5 = 0; var i: u5 = 0;
while (i < 0x10) : (i += 1) { while (i < 0x10) : (i += 1) {
if (opcode >> i & 1 == 1) { if (opcode >> i & 1 == 1) {
transfer(cpu, bus, i, address);
address += 4;
}
}
if (W and P or !P) cpu.r[rn] = address - 4;
} else {
// Decrement
var address = if (P) base - 4 else base;
var i: u5 = 0x10;
while (i > 0) : (i -= 1) {
const reg_idx = i - 1;
if (opcode >> reg_idx & 1 == 1) {
transfer(cpu, bus, reg_idx, address);
address -= 4;
}
}
if (W and P or !P) cpu.r[rn] = address + 4;
}
}
fn transfer(cpu: *Arm7tdmi, bus: *Bus, i: u5, address: u32) void {
if (L) { if (L) {
cpu.r[i] = bus.read32(address); cpu.r[i] = bus.read32(address);
if (S and i == 0xF) std.debug.panic("[CPU] TODO: SPSR_<mode> is transferred to CPSR", .{}); if (S and i == 0xF) std.debug.panic("[CPU] TODO: SPSR_<mode> is transferred to CPSR", .{});
@ -44,12 +59,6 @@ pub fn blockDataTransfer(comptime P: bool, comptime U: bool, comptime S: bool, c
bus.write32(address, cpu.r[i]); bus.write32(address, cpu.r[i]);
} }
} }
address += 4;
}
}
if (W and P or !P) cpu.r[rn] = if (U) address - 4 else base;
} }
}.inner; }.inner;
} }