6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2025-02-18 01:30:56 +00:00
Code Issues Projects Releases Wiki Activity

Up clock rate to 24Mhz.

Browse Source
This commit is contained in:
Thomas Harte 2024-03-07 22:16:58 -05:00
parent 9bb5dc3c2b
commit a46ec4cffb
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -289,6 +289,11 @@ struct Memory {
bool write(uint32_t address, IntT source, InstructionSet::ARM::Mode mode, bool trans) { bool write(uint32_t address, IntT source, InstructionSet::ARM::Mode mode, bool trans) {
(void)trans; (void)trans;
// if(address == 0x0200002c && address < 0x04000000) {
// if(address == 0x02000074) {
// printf("%08x <- %08x\n", address, source);
// }
//
switch (write_zones_[(address >> 21) & 31]) { switch (write_zones_[(address >> 21) & 31]) {
case Zone::DMAAndMEMC: case Zone::DMAAndMEMC:
// if(mode != InstructionSet::ARM::Mode::Supervisor) return false; // if(mode != InstructionSet::ARM::Mode::Supervisor) return false;
@ -434,7 +439,12 @@ struct Memory {
template <typename IntT> template <typename IntT>
IntT &physical_ram(uint32_t address) { IntT &physical_ram(uint32_t address) {
return *reinterpret_cast<IntT *>(&ram_[address & (ram_.size() - 1)]); address &= ram_.size() - 1;
if(address == (0x02000074 & (ram_.size() - 1))) {
printf("%08x\n", address);
}
return *reinterpret_cast<IntT *>(&ram_[address]);
} }
template <typename IntT> template <typename IntT>
@ -641,8 +651,8 @@ class ConcreteMachine:
public MachineTypes::TimedMachine, public MachineTypes::TimedMachine,
public MachineTypes::ScanProducer public MachineTypes::ScanProducer
{ {
// TODO: pick a sensible clock rate; this is just code for '20 MIPS, please'. // TODO: pick a sensible clock rate; this is just code for '24 MIPS, please'.
static constexpr int ClockRate = 20'000'000; static constexpr int ClockRate = 24'000'000;
// Timers tick at 2Mhz, so figure out the proper divider for that. // Timers tick at 2Mhz, so figure out the proper divider for that.
static constexpr int TimerTarget = ClockRate / 2'000'000; static constexpr int TimerTarget = ClockRate / 2'000'000;
@ -706,11 +716,11 @@ class ConcreteMachine:
static bool log = false; static bool log = false;
// if(executor_.pc() == 0x02000058) { if(executor_.pc() == 0x03801a1c) {
// printf(""); printf("");
// } }
// log |= (executor_.pc() == 0x02000054); // log |= (executor_.pc() > 0 && executor_.pc() < 0x03800000);
// log = (executor_.pc() == 0x038019dc); log |= (executor_.pc() == 0x038019e0);
if(log) { if(log) {
logger.info().append("%08x: %08x prior:[r0:%08x r1:%08x r4:%08x r10:%08x r14:%08x]", logger.info().append("%08x: %08x prior:[r0:%08x r1:%08x r4:%08x r10:%08x r14:%08x]",