6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2025-08-13 00:25:26 +00:00
Code Issues Projects Releases Wiki Activity

Switches to just-in-time video, for easy access to a clock divider.

Browse Source
This commit is contained in:
Thomas Harte
2020-11-07 19:40:26 -05:00
parent 613d4b7c8b
commit 699fb0aa4b
3 changed files with 54 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ClockReceiver/JustInTime.hpp
View File

@@ -70,6 +70,16 @@ template <class T, int multiplier = 1, int divider = 1, class LocalTimeScale = H
} }
} }
/// Flushes only if the @c threshold (measured in LocalTimeScale) has been crossed.
template<int threshold> forceinline bool check_flush_threshold() {
if(time_since_update_.as_integral() >= threshold) {
flush();
return true;
} else {
return false;
}
}
private: private:
T object_; T object_;
LocalTimeScale time_since_update_; LocalTimeScale time_since_update_;

63
Machines/Apple/AppleIIgs/AppleIIgs.cpp
View File

@@ -23,6 +23,8 @@
#include "../../Utility/MemoryFuzzer.hpp" #include "../../Utility/MemoryFuzzer.hpp"
#include "../../../ClockReceiver/JustInTime.hpp"
#include <cassert> #include <cassert>
#include <array> #include <array>
@@ -61,14 +63,14 @@ class ConcreteMachine:
rom_descriptions.emplace_back(machine_name, "the Apple IIgs ROM03", "apple2gs.rom2", 256*1024, 0xde7ddf29); rom_descriptions.emplace_back(machine_name, "the Apple IIgs ROM03", "apple2gs.rom2", 256*1024, 0xde7ddf29);
break; break;
} }
rom_descriptions.push_back(video_.rom_description(Video::VideoBase::CharacterROM::EnhancedIIe)); rom_descriptions.push_back(video_->rom_description(Video::VideoBase::CharacterROM::EnhancedIIe));
const auto roms = rom_fetcher(rom_descriptions); const auto roms = rom_fetcher(rom_descriptions);
if(!roms[0] || !roms[1]) { if(!roms[0] || !roms[1]) {
throw ROMMachine::Error::MissingROMs; throw ROMMachine::Error::MissingROMs;
} }
rom_ = *roms[0]; rom_ = *roms[0];
video_.set_character_rom(*roms[1]); video_->set_character_rom(*roms[1]);
size_t ram_size = 0; size_t ram_size = 0;
switch(target.memory_model) { switch(target.memory_model) {
@@ -87,7 +89,7 @@ class ConcreteMachine:
ram_.resize(ram_size * 1024); ram_.resize(ram_size * 1024);
memory_.set_storage(ram_, rom_); memory_.set_storage(ram_, rom_);
video_.set_internal_ram(&ram_[ram_.size() - 128*1024]); video_->set_internal_ram(&ram_[ram_.size() - 128*1024]);
// TODO: enable once machine is otherwise sane. // TODO: enable once machine is otherwise sane.
// Memory::Fuzz(ram_); // Memory::Fuzz(ram_);
@@ -122,9 +124,9 @@ class ConcreteMachine:
// New video register. // New video register.
case 0xc029: case 0xc029:
if(is_read) { if(is_read) {
*value = video_.get_new_video();; *value = video_->get_new_video();;
} else { } else {
video_.set_new_video(*value); video_->set_new_video(*value);
// TODO: I think bits 7 and 0 might also affect the memory map. // TODO: I think bits 7 and 0 might also affect the memory map.
// The descripton isn't especially clear — P.90 of the Hardware Reference. // The descripton isn't especially clear — P.90 of the Hardware Reference.
@@ -135,16 +137,16 @@ class ConcreteMachine:
// Video [and clock] interrupt register. // Video [and clock] interrupt register.
case 0xc023: case 0xc023:
if(is_read) { if(is_read) {
*value = video_.get_interrupt_register(); *value = video_->get_interrupt_register();
} else { } else {
video_.set_interrupt_register(*value); video_->set_interrupt_register(*value);
} }
break; break;
// Video onterrupt-clear register. // Video onterrupt-clear register.
case 0xc032: case 0xc032:
if(!is_read) { if(!is_read) {
video_.clear_interrupts(*value); video_->clear_interrupts(*value);
} }
break; break;
@@ -201,7 +203,7 @@ class ConcreteMachine:
#define SwitchRead(s) if(is_read) *value = memory_.s ? 0x80 : 0x00 #define SwitchRead(s) if(is_read) *value = memory_.s ? 0x80 : 0x00
#define LanguageRead(s) SwitchRead(language_card_switches().state().s) #define LanguageRead(s) SwitchRead(language_card_switches().state().s)
#define AuxiliaryRead(s) SwitchRead(auxiliary_switches().switches().s) #define AuxiliaryRead(s) SwitchRead(auxiliary_switches().switches().s)
#define VideoRead(s) if(is_read) *value = video_.s ? 0x80 : 0x00 #define VideoRead(s) if(is_read) *value = video_->s ? 0x80 : 0x00
case 0xc011: LanguageRead(bank1); break; case 0xc011: LanguageRead(bank1); break;
case 0xc012: LanguageRead(read); break; case 0xc012: LanguageRead(read); break;
case 0xc013: AuxiliaryRead(read_auxiliary_memory); break; case 0xc013: AuxiliaryRead(read_auxiliary_memory); break;
@@ -225,16 +227,16 @@ class ConcreteMachine:
// Video switches (and annunciators). // Video switches (and annunciators).
case 0xc050: case 0xc051: case 0xc050: case 0xc051:
video_.set_text(address & 1); video_->set_text(address & 1);
break; break;
case 0xc052: case 0xc053: case 0xc052: case 0xc053:
video_.set_mixed(address & 1); video_->set_mixed(address & 1);
break; break;
case 0xc054: case 0xc055: case 0xc054: case 0xc055:
video_.set_page2(address&1); video_->set_page2(address&1);
break; break;
case 0xc056: case 0xc057: case 0xc056: case 0xc057:
video_.set_high_resolution(address&1); video_->set_high_resolution(address&1);
break; break;
case 0xc058: case 0xc059: case 0xc058: case 0xc059:
case 0xc05a: case 0xc05b: case 0xc05a: case 0xc05b:
@@ -242,16 +244,16 @@ class ConcreteMachine:
// Annunciators 0, 1 and 2. // Annunciators 0, 1 and 2.
break; break;
case 0xc05e: case 0xc05f: case 0xc05e: case 0xc05f:
video_.set_annunciator_3(!(address&1)); video_->set_annunciator_3(!(address&1));
break; break;
case 0xc001: /* 0xc000 is dealt with in the ADB section. */ case 0xc001: /* 0xc000 is dealt with in the ADB section. */
if(!is_read) video_.set_80_store(true); if(!is_read) video_->set_80_store(true);
break; break;
case 0xc00c: case 0xc00d: case 0xc00c: case 0xc00d:
if(!is_read) video_.set_80_columns(address & 1); if(!is_read) video_->set_80_columns(address & 1);
break; break;
case 0xc00e: case 0xc00f: case 0xc00e: case 0xc00f:
if(!is_read) video_.set_alternative_character_set(address & 1); if(!is_read) video_->set_alternative_character_set(address & 1);
break; break;
// ADB and keyboard. // ADB and keyboard.
@@ -259,7 +261,7 @@ class ConcreteMachine:
if(is_read) { if(is_read) {
*value = adb_glu_.get_keyboard_data(); *value = adb_glu_.get_keyboard_data();
} else { } else {
video_.set_80_store(false); video_->set_80_store(false);
} }
break; break;
case 0xc010: case 0xc010:
@@ -453,6 +455,12 @@ class ConcreteMachine:
if(isReadOperation(operation)) { if(isReadOperation(operation)) {
MemoryMapRead(region, address, value); MemoryMapRead(region, address, value);
} else { } else {
// Use a very broad test for flushing video: any write to $e0 or $e1, or any write that is shadowed.
// TODO: at least restrict the e0/e1 test to possible video buffers!
if((address >= 0xe00000 && address < 0xe1000000) || region.flags & MemoryMap::Region::IsShadowed) {
video_.flush();
}
MemoryMapWrite(memory_, region, address, value); MemoryMapWrite(memory_, region, address, value);
} }
} }
@@ -498,18 +506,25 @@ class ConcreteMachine:
auto ticks = cycles_since_clock_tick_.divide(Cycles(CLOCK_RATE)).as_integral(); auto ticks = cycles_since_clock_tick_.divide(Cycles(CLOCK_RATE)).as_integral();
while(ticks--) { while(ticks--) {
clock_.update(); clock_.update();
video_.notify_clock_tick(); // The video controller marshalls the one-second interrupt. video_.last_valid()->notify_clock_tick(); // The video controller marshalls the one-second interrupt.
update_interrupts();
} }
video_.run_for(duration); video_ += duration;
// Update the interrupt line. TODO: should include the sound GLU too.
m65816_.set_irq_line(video_.get_interrupt_register() & 0x80);
// Ensure no more than a single line is enqueued for just-in-time video purposes.
if(video_.check_flush_threshold<131>()) {
update_interrupts();
}
return duration; return duration;
} }
void update_interrupts() {
// Update the interrupt line. TODO: should include the sound GLU too.
m65816_.set_irq_line(video_.last_valid()->get_interrupt_register() & 0x80);
}
private: private:
CPU::WDC65816::Processor<ConcreteMachine, false> m65816_; CPU::WDC65816::Processor<ConcreteMachine, false> m65816_;
MemoryMap memory_; MemoryMap memory_;
@@ -529,7 +544,7 @@ class ConcreteMachine:
// MARK: - Other components. // MARK: - Other components.
Apple::Clock::ParallelClock clock_; Apple::Clock::ParallelClock clock_;
Apple::IIgs::Video::Video video_; JustInTimeActor<Apple::IIgs::Video::Video, 1, 7, Cycles> video_; // i.e. run video at twice the 1Mhz clock.
Apple::IIgs::ADB::GLU adb_glu_; Apple::IIgs::ADB::GLU adb_glu_;
Apple::IIgs::Sound::GLU sound_glu_; Apple::IIgs::Sound::GLU sound_glu_;
Zilog::SCC::z8530 scc_; Zilog::SCC::z8530 scc_;

5
Machines/Apple/AppleIIgs/Video.hpp
View File

@@ -16,6 +16,11 @@ namespace Apple {
namespace IIgs { namespace IIgs {
namespace Video { namespace Video {
/*!
Provides IIgs video output; assumed clocking here is twice the usual Apple II clock.
So it'll produce a single line of video every 131 cycles — 65*2 + 1, allowing for the
stretched cycle.
*/
class VideoBase: public Apple::II::VideoSwitches<Cycles> { class VideoBase: public Apple::II::VideoSwitches<Cycles> {
public: public:
VideoBase(); VideoBase();