6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-12-27 01:31:42 +00:00
Code Issues Projects Releases Wiki Activity

Pretending the Disk II is an IWM doesn't seem to achieve much.

Browse Source
This commit is contained in:
Thomas Harte 2019-05-05 18:12:25 -04:00
parent a99ebda513
commit 407bbfb379
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,6 +16,7 @@
#include "../../../Processors/68000/68000.hpp" #include "../../../Processors/68000/68000.hpp"
#include "../../../Components/6522/6522.hpp" #include "../../../Components/6522/6522.hpp"
#include "../../../Components/DiskII/DiskII.hpp"
#include "../../Utility/MemoryPacker.hpp" #include "../../Utility/MemoryPacker.hpp"
@ -31,7 +32,8 @@ class ConcreteMachine:
mc68000_(*this), mc68000_(*this),
video_(ram_.data()), video_(ram_.data()),
via_(via_port_handler_), via_(via_port_handler_),
via_port_handler_(*this) { via_port_handler_(*this),
iwm_(7833600) {
// Grab a copy of the ROM and convert it into big-endian data. // Grab a copy of the ROM and convert it into big-endian data.
const auto roms = rom_fetcher("Macintosh", { "mac128k.rom" }); const auto roms = rom_fetcher("Macintosh", { "mac128k.rom" });
@ -69,6 +71,9 @@ class ConcreteMachine:
// SCC is a divide-by-two. // SCC is a divide-by-two.
// The IWM runs at the native rate. (TODO: almost everything here).
iwm_.run_for(cycle.length.cycles());
// A null cycle leaves nothing else to do. // A null cycle leaves nothing else to do.
if(cycle.operation) { if(cycle.operation) {
auto word_address = cycle.word_address(); auto word_address = cycle.word_address();
@ -86,7 +91,6 @@ class ConcreteMachine:
case 0x77f0ff: case 0x77f0ff:
// 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.
// printf("VIA");
if(cycle.operation & Microcycle::Read) { if(cycle.operation & Microcycle::Read) {
cycle.value->halves.low = via_.get_register(register_address); cycle.value->halves.low = via_.get_register(register_address);
if(cycle.operation & Microcycle::SelectWord) cycle.value->halves.high = 0xff; if(cycle.operation & Microcycle::SelectWord) cycle.value->halves.high = 0xff;
@ -97,7 +101,12 @@ class ConcreteMachine:
case 0x6ff0ff: case 0x6ff0ff:
// IWM // IWM
// printf("IWM %d", register_address & 0xf); if(cycle.operation & Microcycle::Read) {
cycle.value->halves.low = iwm_.read_address(register_address);
if(cycle.operation & Microcycle::SelectWord) cycle.value->halves.high = 0xff;
} else {
iwm_.set_data_input(cycle.value->halves.low);
}
break; break;
} }
@ -252,6 +261,9 @@ class ConcreteMachine:
MOS::MOS6522::MOS6522<VIAPortHandler> via_; MOS::MOS6522::MOS6522<VIAPortHandler> via_;
VIAPortHandler via_port_handler_; VIAPortHandler via_port_handler_;
Apple::DiskII iwm_;
HalfCycles via_clock_; HalfCycles via_clock_;
HalfCycles time_since_video_update_; HalfCycles time_since_video_update_;