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

cpu/arm: fix single data transfer

Browse Source 
Signed-off-by: Amneesh Singh <natto@weirdnatto.in>
This commit is contained in:
Amneesh Singh
2024-06-11 23:28:27 +05:30
parent 1a2e101ebd
commit 441665abad
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/cpu/arm/exec.cc
View File

@@ -171,10 +171,6 @@ Instruction::exec(Cpu& cpu) {
cpu.cpsr.set_c(carry); cpu.cpsr.set_c(carry);
} }
// PC is always two instructions ahead
if (data.rn == cpu.PC_INDEX)
address -= 2 * INSTRUCTION_SIZE;
if (data.pre) if (data.pre)
address += (data.up ? offset : -offset); address += (data.up ? offset : -offset);

4
tests/cpu/arm/exec.cc
View File

@@ -319,9 +319,9 @@ TEST_CASE_METHOD(CpuFixture, "Single Data Transfer", TAG) {
exec(data); exec(data);
CHECK(bus.read_word(0x300352A - 2 * INSTRUCTION_SIZE) == 61119); CHECK(bus.read_word(0x300352A) == 61119);
// 0x300352A - 0xDA1 // 0x300352A - 0xDA1
CHECK(getr(15) == 0x3002789 - 2 * INSTRUCTION_SIZE); CHECK(getr(15) == 0x3002789);
// cleanup // cleanup
data_transfer->rn = 7; data_transfer->rn = 7;