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

Merge pull request #1036 from TomHarte/InMacintosh

Browse Source 
Switch the Macintosh to the newer 68000.
This commit is contained in:
Thomas Harte 2022-06-03 20:22:27 -04:00 committed by GitHub
commit 7eb00c131f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
Machines/Apple/Macintosh/Macintosh.cpp
View File

@ -50,6 +50,7 @@
namespace { namespace {
constexpr int CLOCK_RATE = 7833600; constexpr int CLOCK_RATE = 7833600;
constexpr auto KEYBOARD_CLOCK_RATE = HalfCycles(CLOCK_RATE / 100000);
// Former default PRAM: // Former default PRAM:
@ -73,7 +74,7 @@ template <Analyser::Static::Macintosh::Target::Model model> class ConcreteMachin
public MachineTypes::MediaTarget, public MachineTypes::MediaTarget,
public MachineTypes::MouseMachine, public MachineTypes::MouseMachine,
public MachineTypes::MappedKeyboardMachine, public MachineTypes::MappedKeyboardMachine,
public CPU::MC68000::BusHandler, public CPU::MC68000Mk2::BusHandler,
public Zilog::SCC::z8530::Delegate, public Zilog::SCC::z8530::Delegate,
public Activity::Source, public Activity::Source,
public Configurable::Device, public Configurable::Device,
@ -191,9 +192,9 @@ template <Analyser::Static::Macintosh::Target::Model model> class ConcreteMachin
mc68000_.run_for(cycles); mc68000_.run_for(cycles);
} }
using Microcycle = CPU::MC68000::Microcycle; using Microcycle = CPU::MC68000Mk2::Microcycle;
forceinline HalfCycles perform_bus_operation(const Microcycle &cycle, int) { HalfCycles perform_bus_operation(const Microcycle &cycle, int) {
// Advance time. // Advance time.
advance_time(cycle.length); advance_time(cycle.length);
@ -204,6 +205,10 @@ template <Analyser::Static::Macintosh::Target::Model model> class ConcreteMachin
auto address = cycle.host_endian_byte_address(); auto address = cycle.host_endian_byte_address();
// Everything above E0 0000 is signalled as being on the peripheral bus. // Everything above E0 0000 is signalled as being on the peripheral bus.
//
// This will also act to autovector interrupts, since an interrupt acknowledge
// cycle posts an address with all the higher-order bits set, and VPA doubles
// as the input to request an autovector.
mc68000_.set_is_peripheral_address(address >= 0xe0'0000); mc68000_.set_is_peripheral_address(address >= 0xe0'0000);
// All code below deals only with reads and writes — cycles in which a // All code below deals only with reads and writes — cycles in which a
@ -235,21 +240,17 @@ template <Analyser::Static::Macintosh::Target::Model model> class ConcreteMachin
// VIA accesses are via address 0xefe1fe + register*512, // VIA accesses are via address 0xefe1fe + register*512,
// which at word precision is 0x77f0ff + register*256. // which at word precision is 0x77f0ff + register*256.
if(cycle.operation & Microcycle::Read) { if(cycle.operation & Microcycle::Read) {
cycle.value->halves.low = via_.read(register_address); cycle.set_value8_high(via_.read(register_address));
} else { } else {
via_.write(register_address, cycle.value->halves.low); via_.write(register_address, cycle.value8_high());
} }
if(cycle.operation & Microcycle::SelectWord) cycle.value->halves.high = 0xff;
} }
} return delay; } return delay;
case BusDevice::PhaseRead: { case BusDevice::PhaseRead: {
if(cycle.operation & Microcycle::Read) { if(cycle.operation & Microcycle::Read) {
cycle.value->halves.low = phase_ & 7; cycle.set_value8_low(phase_ & 7);
} }
if(cycle.operation & Microcycle::SelectWord) cycle.value->halves.high = 0xff;
} return delay; } return delay;
case BusDevice::IWM: { case BusDevice::IWM: {
@ -258,12 +259,10 @@ template <Analyser::Static::Macintosh::Target::Model model> class ConcreteMachin
// The IWM; this is a purely polled device, so can be run on demand. // The IWM; this is a purely polled device, so can be run on demand.
if(cycle.operation & Microcycle::Read) { if(cycle.operation & Microcycle::Read) {
cycle.value->halves.low = iwm_->read(register_address); cycle.set_value8_low(iwm_->read(register_address));
} else { } else {
iwm_->write(register_address, cycle.value->halves.low); iwm_->write(register_address, cycle.value8_low());
} }
if(cycle.operation & Microcycle::SelectWord) cycle.value->halves.high = 0xff;
} else { } else {
fill_unmapped(cycle); fill_unmapped(cycle);
} }
@ -279,22 +278,12 @@ template <Analyser::Static::Macintosh::Target::Model model> class ConcreteMachin
if(cycle.operation & Microcycle::Read) { if(cycle.operation & Microcycle::Read) {
scsi_.write(register_address, 0xff, dma_acknowledge); scsi_.write(register_address, 0xff, dma_acknowledge);
} else { } else {
if(cycle.operation & Microcycle::SelectWord) { scsi_.write(register_address, cycle.value8_high());
scsi_.write(register_address, cycle.value->halves.high, dma_acknowledge);
} else {
scsi_.write(register_address, cycle.value->halves.low, dma_acknowledge);
}
} }
} else { } else {
// Even access => this is a read. // Even access => this is a read.
if(cycle.operation & Microcycle::Read) { if(cycle.operation & Microcycle::Read) {
const auto result = scsi_.read(register_address, dma_acknowledge); cycle.set_value8_high(scsi_.read(register_address, dma_acknowledge));
if(cycle.operation & Microcycle::SelectWord) {
// Data is loaded on the top part of the bus only.
cycle.value->full = uint16_t((result << 8) | 0xff);
} else {
cycle.value->halves.low = result;
}
} }
} }
} return delay; } return delay;
@ -309,12 +298,12 @@ template <Analyser::Static::Macintosh::Target::Model model> class ConcreteMachin
scc_.reset(); scc_.reset();
if(cycle.operation & Microcycle::Read) { if(cycle.operation & Microcycle::Read) {
cycle.value->halves.low = 0xff; cycle.set_value16(0xffff);
} }
} else { } else {
const auto read = scc_.read(int(address >> 1)); const auto read = scc_.read(int(address >> 1));
if(cycle.operation & Microcycle::Read) { if(cycle.operation & Microcycle::Read) {
cycle.value->halves.low = read; cycle.set_value8_high(read);
} }
} }
} }
@ -325,12 +314,14 @@ template <Analyser::Static::Macintosh::Target::Model model> class ConcreteMachin
if(cycle.operation & Microcycle::SelectWord) { if(cycle.operation & Microcycle::SelectWord) {
adjust_phase(); adjust_phase();
} else { } else {
// This is definitely a byte access; either it's to an odd address, in which
// case it will reach the SCC, or it isn't, in which case it won't.
if(*cycle.address & 1) { if(*cycle.address & 1) {
if(cycle.operation & Microcycle::Read) { if(cycle.operation & Microcycle::Read) {
scc_.write(int(address >> 1), 0xff); scc_.write(int(address >> 1), 0xff);
cycle.value->halves.low = 0xff; cycle.value->b = 0xff;
} else { } else {
scc_.write(int(address >> 1), cycle.value->halves.low); scc_.write(int(address >> 1), cycle.value->b);
} }
} else { } else {
fill_unmapped(cycle); fill_unmapped(cycle);
@ -368,23 +359,8 @@ template <Analyser::Static::Macintosh::Target::Model model> class ConcreteMachin
} }
// If control has fallen through to here, the access is either a read from ROM, or a read or write to RAM. // If control has fallen through to here, the access is either a read from ROM, or a read or write to RAM.
switch(cycle.operation & (Microcycle::SelectWord | Microcycle::SelectByte | Microcycle::Read)) { // Potential writes to ROM and all hardware accesses have already been weeded out.
default: cycle.apply(&memory_base[address]);
break;
case Microcycle::SelectWord | Microcycle::Read:
cycle.value->full = *reinterpret_cast<uint16_t *>(&memory_base[address]);
break;
case Microcycle::SelectByte | Microcycle::Read:
cycle.value->halves.low = memory_base[address];
break;
case Microcycle::SelectWord:
*reinterpret_cast<uint16_t *>(&memory_base[address]) = cycle.value->full;
break;
case Microcycle::SelectByte:
memory_base[address] = cycle.value->halves.low;
break;
}
return delay; return delay;
} }
@ -582,6 +558,7 @@ template <Analyser::Static::Macintosh::Target::Model model> class ConcreteMachin
// The VIA runs at one-tenth of the 68000's clock speed, in sync with the E clock. // The VIA runs at one-tenth of the 68000's clock speed, in sync with the E clock.
// See: Guide to the Macintosh Hardware Family p149 (PDF p188). Some extra division // See: Guide to the Macintosh Hardware Family p149 (PDF p188). Some extra division
// may occur here in order to provide VSYNC at a proper moment. // may occur here in order to provide VSYNC at a proper moment.
// Possibly route vsync. // Possibly route vsync.
if(time_since_video_update_ < time_until_video_event_) { if(time_since_video_update_ < time_until_video_event_) {
via_clock_ += duration; via_clock_ += duration;
@ -611,8 +588,8 @@ template <Analyser::Static::Macintosh::Target::Model model> class ConcreteMachin
// The keyboard also has a clock, albeit a very slow one — 100,000 cycles/second. // The keyboard also has a clock, albeit a very slow one — 100,000 cycles/second.
// Its clock and data lines are connected to the VIA. // Its clock and data lines are connected to the VIA.
keyboard_clock_ += duration; keyboard_clock_ += duration;
const auto keyboard_ticks = keyboard_clock_.divide(HalfCycles(CLOCK_RATE / 100000)); if(keyboard_clock_ >= KEYBOARD_CLOCK_RATE) {
if(keyboard_ticks > HalfCycles(0)) { const auto keyboard_ticks = keyboard_clock_.divide(KEYBOARD_CLOCK_RATE);
keyboard_.run_for(keyboard_ticks); keyboard_.run_for(keyboard_ticks);
via_.set_control_line_input(MOS::MOS6522::Port::B, MOS::MOS6522::Line::Two, keyboard_.get_data()); via_.set_control_line_input(MOS::MOS6522::Port::B, MOS::MOS6522::Line::Two, keyboard_.get_data());
via_.set_control_line_input(MOS::MOS6522::Port::B, MOS::MOS6522::Line::One, keyboard_.get_clock()); via_.set_control_line_input(MOS::MOS6522::Port::B, MOS::MOS6522::Line::One, keyboard_.get_clock());
@ -771,7 +748,7 @@ template <Analyser::Static::Macintosh::Target::Model model> class ConcreteMachin
Inputs::QuadratureMouse &mouse_; Inputs::QuadratureMouse &mouse_;
}; };
CPU::MC68000::Processor<ConcreteMachine, true> mc68000_; CPU::MC68000Mk2::Processor<ConcreteMachine, true, true> mc68000_;
DriveSpeedAccumulator drive_speed_accumulator_; DriveSpeedAccumulator drive_speed_accumulator_;
IWMActor iwm_; IWMActor iwm_;

4
Processors/68000Mk2/Implementation/68000Mk2Implementation.hpp
View File

@ -318,9 +318,9 @@ void Processor<BusHandler, dtack_is_implicit, permit_overrun, signal_will_perfor
// Reads one futher word from the program counter and inserts it into // Reads one futher word from the program counter and inserts it into
// the prefetch queue. // the prefetch queue.
#define Prefetch() \ #define Prefetch() \
captured_interrupt_level_ = bus_interrupt_level_; \
prefetch_.high = prefetch_.low; \ prefetch_.high = prefetch_.low; \
ReadProgramWord(prefetch_.low) ReadProgramWord(prefetch_.low) \
captured_interrupt_level_ = bus_interrupt_level_;
// Raises the exception with integer vector x — x is the vector identifier, // Raises the exception with integer vector x — x is the vector identifier,
// not its address. // not its address.