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

fix(cpu): force align thumb and arm block data transfers

Browse Source
This commit is contained in:
Rekai Nyangadzayi Musuka
2022-02-06 17:08:12 -04:00
parent 225c0f7d55
commit bbd4447734
2 changed files with 40 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/cpu/arm/block_data_transfer.zig
View File

@@ -48,17 +48,17 @@ pub fn blockDataTransfer(comptime P: bool, comptime U: bool, comptime S: bool, c
var address = start;
if (rlist == 0) {
var pc_addr = cpu.r[rn];
var und_addr = cpu.r[rn];
if (U) {
pc_addr += if (P) 4 else 0;
und_addr += if (P) 4 else 0;
} else {
pc_addr -= 0x40 - if (!P) 4 else 0;
und_addr -= 0x40 - if (!P) 4 else 0;
}
if (L) {
cpu.r[15] = bus.read32(pc_addr);
cpu.r[15] = bus.read32(und_addr & 0xFFFF_FFFC);
} else {
bus.write32(pc_addr, cpu.r[15] + 8);
bus.write32(und_addr & 0xFFFF_FFFC, cpu.r[15] + 8);
}
cpu.r[rn] = if (U) cpu.r[rn] + 0x40 else cpu.r[rn] - 0x40;
@@ -85,9 +85,9 @@ pub fn blockDataTransfer(comptime P: bool, comptime U: bool, comptime S: bool, c
if (L) {
if (S and !r15_present) {
// Always Transfer User mode Registers
cpu.setUserModeRegister(i, bus.read32(address));
cpu.setUserModeRegister(i, bus.read32(address & 0xFFFF_FFFC));
} else {
const value = bus.read32(address);
const value = bus.read32(address & 0xFFFF_FFFC);
cpu.r[i] = if (i == 0xF) value & 0xFFFF_FFFC else value;
if (S and i == 0xF) cpu.setCpsr(cpu.spsr.raw);
}
@@ -96,9 +96,9 @@ pub fn blockDataTransfer(comptime P: bool, comptime U: bool, comptime S: bool, c
// Always Transfer User mode Registers
// This happens regardless if r15 is in the list
const value = cpu.getUserModeRegister(i);
bus.write32(address, value + if (i == 0xF) 8 else @as(u32, 0)); // PC is already 4 ahead to make 12
bus.write32(address & 0xFFFF_FFFC, value + if (i == 0xF) 8 else @as(u32, 0)); // PC is already 4 ahead to make 12
} else {
bus.write32(address, cpu.r[i] + if (i == 0xF) 8 else @as(u32, 0));
bus.write32(address & 0xFFFF_FFFC, cpu.r[i] + if (i == 0xF) 8 else @as(u32, 0));
}
}
}