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

Loop the ARM executor into the build.

Browse Source
This commit is contained in:
Thomas Harte 2024-03-04 12:08:46 -05:00
parent 6f0ad0ab71
commit 1f43047de8
1 changed files with 48 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,8 +14,53 @@
#include "../../ScanProducer.hpp" #include "../../ScanProducer.hpp"
#include "../../TimedMachine.hpp" #include "../../TimedMachine.hpp"
#include "../../../InstructionSets/ARM/Executor.hpp"
namespace Archimedes { namespace Archimedes {
struct Memory {
std::vector<uint8_t> rom;
template <typename IntT>
bool write(uint32_t address, IntT source, InstructionSet::ARM::Mode mode, bool trans) {
(void)mode;
(void)trans;
printf("W of %08x to %08x [%lu]\n", source, address, sizeof(IntT));
if(has_moved_rom_ && address < ram_.size()) {
*reinterpret_cast<IntT *>(&ram_[address]) = source;
}
return true;
}
template <typename IntT>
bool read(uint32_t address, IntT &source, InstructionSet::ARM::Mode mode, bool trans) {
(void)mode;
(void)trans;
if(address >= 0x3800000) {
has_moved_rom_ = true;
source = *reinterpret_cast<const IntT *>(&rom[address - 0x3800000]);
} else if(!has_moved_rom_) {
// TODO: this is true only very transiently.
source = *reinterpret_cast<const IntT *>(&rom[address]);
} else if(address < ram_.size()) {
source = *reinterpret_cast<const IntT *>(&ram_[address]);
} else {
source = 0;
printf("Unknown read from %08x [%lu]\n", address, sizeof(IntT));
}
return true;
}
private:
bool has_moved_rom_ = false;
std::array<uint8_t, 4*1024*1024> ram_{};
};
class ConcreteMachine: class ConcreteMachine:
public Machine, public Machine,
public MachineTypes::TimedMachine, public MachineTypes::TimedMachine,
@ -44,6 +89,9 @@ class ConcreteMachine:
void run_for(Cycles cycles) override { void run_for(Cycles cycles) override {
(void)cycles; (void)cycles;
} }
// MARK: - ARM execution
InstructionSet::ARM::Executor<InstructionSet::ARM::Model::ARMv2, Memory> executor_;
}; };
} }