6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-11-21 21:33:54 +00:00
Code Issues Projects Releases Wiki Activity

Execution now runs into a prefetch abort loop.

Browse Source
This commit is contained in:
Thomas Harte 2024-03-06 15:05:24 -05:00
parent ed92e98ca2
commit 108a056f1c
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
InstructionSets/ARM/Executor.hpp
View File

@ -549,6 +549,11 @@ struct Executor {
return registers_;
}
/// Indicates a prefetch abort exception.
void prefetch_abort() {
registers_.exception<Registers::Exception::PrefetchAbort>();
}
/// Sets the expected address of the instruction after whichever is about to be executed.
/// So it's PC+4 compared to most other systems.
void set_pc(uint32_t pc) {

11
Machines/Acorn/Archimedes/Archimedes.cpp
View File

@ -95,7 +95,7 @@ struct Memory {
low_rom_access_time_ = ROMAccessTime((address >> 4) & 3);
page_size_ = PageSize((address >> 2) & 3);
logger.info().append("MEMC Control: OS:%d sound:%d video:%d ", os_mode_, sound_dma_enable_, video_dma_enable_);
logger.info().append("MEMC Control: %08x/%08x -> OS:%d sound:%d video:%d high:%d low:%d size:%d", address, source, os_mode_, sound_dma_enable_, video_dma_enable_, high_rom_access_time_, low_rom_access_time_, page_size_);
return true;
} else {
@ -313,8 +313,13 @@ class ConcreteMachine:
auto instructions = cycles.as<int>();
while(instructions--) {
uint32_t instruction;
executor_.bus.read(executor_.pc(), instruction, executor_.registers().mode(), false);
// TODO: what if abort? How about pipeline prefetch?
if(!executor_.bus.read(executor_.pc(), instruction, executor_.registers().mode(), false)) {
executor_.prefetch_abort();
// TODO: does a double abort cause a reset?
executor_.bus.read(executor_.pc(), instruction, executor_.registers().mode(), false);
}
// TODO: pipeline prefetch?
logger.info().append("%08x: %08x", executor_.pc(), instruction);
InstructionSet::ARM::execute<arm_model>(instruction, executor_);