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

Forces the MSX's perform_machine_cycle into the Z80.

Browse Source
This commit is contained in:
Thomas Harte 2018-02-19 19:54:42 -05:00
parent b215cf83d5
commit 270723ae72
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Machines/MSX/MSX.cpp
View File

@ -38,6 +38,7 @@
#include "../../Outputs/Speaker/Implementation/SampleSource.hpp" #include "../../Outputs/Speaker/Implementation/SampleSource.hpp"
#include "../../Configurable/StandardOptions.hpp" #include "../../Configurable/StandardOptions.hpp"
#include "../../ClockReceiver/ForceInline.hpp"
namespace MSX { namespace MSX {
@ -280,7 +281,7 @@ class ConcreteMachine:
} }
// MARK: Z80::BusHandler // MARK: Z80::BusHandler
HalfCycles perform_machine_cycle(const CPU::Z80::PartialMachineCycle &cycle) { forceinline HalfCycles perform_machine_cycle(const CPU::Z80::PartialMachineCycle &cycle) {
if(time_until_interrupt_ > 0) { if(time_until_interrupt_ > 0) {
time_until_interrupt_ -= cycle.length; time_until_interrupt_ -= cycle.length;
if(time_until_interrupt_ <= HalfCycles(0)) { if(time_until_interrupt_ <= HalfCycles(0)) {
@ -573,6 +574,7 @@ class ConcreteMachine:
// MARK: - Sleeper // MARK: - Sleeper
void set_component_is_sleeping(void *component, bool is_sleeping) override { void set_component_is_sleeping(void *component, bool is_sleeping) override {
tape_player_is_sleeping_ = tape_player_.is_sleeping(); tape_player_is_sleeping_ = tape_player_.is_sleeping();
set_use_fast_tape();
} }
private: private:
@ -639,7 +641,7 @@ class ConcreteMachine:
bool allow_fast_tape_ = false; bool allow_fast_tape_ = false;
bool use_fast_tape_ = false; bool use_fast_tape_ = false;
void set_use_fast_tape() { void set_use_fast_tape() {
use_fast_tape_ = allow_fast_tape_ && tape_player_.has_tape(); use_fast_tape_ = !tape_player_is_sleeping_ && allow_fast_tape_ && tape_player_.has_tape();
} }
i8255PortHandler i8255_port_handler_; i8255PortHandler i8255_port_handler_;