natto1784/matar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

memory: bus and rom should not be writeable

Browse Source 
so fix tests and shit

Signed-off-by: Amneesh Singh <natto@weirdnatto.in>
This commit is contained in:
Amneesh Singh
2023-10-05 00:21:18 +05:30
parent e0f7f32699
commit 174008f60c
8 changed files with 255 additions and 252 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
tests/cpu/cpu-fixture.cc
View File

@@ -41,17 +41,17 @@ CpuFixture::set_psr(Psr psr, bool spsr) {
// matters is that the public API is correct.
uint32_t
CpuFixture::getr_(uint8_t r, Cpu& cpu) {
size_t addr = 13000;
size_t offset = r == 15 ? 4 : 0;
uint32_t word = bus.read_word(addr + offset);
Cpu tmp = cpu;
uint32_t ret = 0xFFFFFFFF;
uint8_t base = r ? 0 : 1;
uint32_t addr = 0x02000000;
uint8_t offset = r == 15 ? 4 : 0;
uint32_t word = bus.read_word(addr + offset);
Cpu tmp = cpu;
uint32_t ret = 0xFFFFFFFF;
uint8_t base = r ? 0 : 1;
// set R0/R1 = 0
// set R0/R1 = addr
arm::Instruction zero(
Condition::AL,
arm::DataProcessing{ .operand = 0u,
arm::DataProcessing{ .operand = addr,
.rd = base,
.rn = 0,
.set = false,
@@ -60,7 +60,7 @@ CpuFixture::getr_(uint8_t r, Cpu& cpu) {
// get register
arm::Instruction get(
Condition::AL,
arm::SingleDataTransfer{ .offset = static_cast<uint16_t>(addr),
arm::SingleDataTransfer{ .offset = static_cast<uint16_t>(0),
.rd = r,
.rn = base,
.load = false,