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

chore: reimplement bus read/writes

Browse Source
This commit is contained in:
Rekai Nyangadzayi Musuka
2022-04-08 16:48:43 -03:00
parent 37a360ec07
commit 80e714e2eb
11 changed files with 130 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/cpu/thumb/block_data_transfer.zig
View File

@@ -21,9 +21,9 @@ pub fn format14(comptime L: bool, comptime R: bool) InstrFn {
while (i < 8) : (i += 1) {
if (opcode >> i & 1 == 1) {
if (L) {
cpu.r[i] = bus.read32(address);
cpu.r[i] = bus.read(u32, address);
} else {
bus.write32(address, cpu.r[i]);
bus.write(u32, address, cpu.r[i]);
}
address += 4;
@@ -32,10 +32,10 @@ pub fn format14(comptime L: bool, comptime R: bool) InstrFn {
if (R) {
if (L) {
const value = bus.read32(address);
const value = bus.read(u32, address);
cpu.r[15] = value & 0xFFFF_FFFE;
} else {
bus.write32(address, cpu.r[14]);
bus.write(u32, address, cpu.r[14]);
}
address += 4;
}
@@ -52,7 +52,7 @@ pub fn format15(comptime L: bool, comptime rb: u3) InstrFn {
const end_address = cpu.r[rb] + 4 * countRlist(opcode);
if (opcode & 0xFF == 0) {
if (L) cpu.r[15] = bus.read32(address) else bus.write32(address, cpu.r[15] + 4);
if (L) cpu.r[15] = bus.read(u32, address) else bus.write(u32, address, cpu.r[15] + 4);
cpu.r[rb] += 0x40;
return;
}
@@ -63,9 +63,9 @@ pub fn format15(comptime L: bool, comptime rb: u3) InstrFn {
while (i < 8) : (i += 1) {
if (opcode >> i & 1 == 1) {
if (L) {
cpu.r[i] = bus.read32(address);
cpu.r[i] = bus.read(u32, address);
} else {
bus.write32(address, cpu.r[i]);
bus.write(u32, address, cpu.r[i]);
}
if (!L and first_write) {