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

Fix to make sure end of vertical sync is always correctly spotted as an event, rather than just happening off the books. So I can now watch Joust roll to its heart's content.

Browse Source
This commit is contained in:
Thomas Harte 2015-07-31 18:15:59 -04:00
parent 9c91f1a2eb
commit c1a12ad4df
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Outputs/CRT.cpp
View File

@ -108,7 +108,7 @@ CRT::~CRT()
#pragma mark - Sync loop #pragma mark - Sync loop
CRT::SyncEvent CRT::next_vertical_sync_event(bool vsync_is_charging, int cycles_to_run_for, int *cycles_advanced) CRT::SyncEvent CRT::get_next_vertical_sync_event(bool vsync_is_charging, int cycles_to_run_for, int *cycles_advanced)
{ {
SyncEvent proposedEvent = SyncEvent::None; SyncEvent proposedEvent = SyncEvent::None;
int proposedSyncTime = cycles_to_run_for; int proposedSyncTime = cycles_to_run_for;
@ -124,7 +124,7 @@ CRT::SyncEvent CRT::next_vertical_sync_event(bool vsync_is_charging, int cycles_
if (_sync_capacitor_charge_level < _sync_capacitor_charge_threshold && _sync_capacitor_charge_level + proposedSyncTime >= _sync_capacitor_charge_threshold) { if (_sync_capacitor_charge_level < _sync_capacitor_charge_threshold && _sync_capacitor_charge_level + proposedSyncTime >= _sync_capacitor_charge_threshold) {
uint32_t proposed_sync_y = _rasterPosition.y + (_sync_capacitor_charge_threshold - _sync_capacitor_charge_level) * _scanSpeed.y; uint32_t proposed_sync_y = _rasterPosition.y + (_sync_capacitor_charge_threshold - _sync_capacitor_charge_level) * _scanSpeed.y;
if(proposed_sync_y > (kCRTFixedPointRange * 15) >> 4) { if(proposed_sync_y >= (kCRTFixedPointRange * 15) >> 4) {
proposedSyncTime = _sync_capacitor_charge_threshold - _sync_capacitor_charge_level; proposedSyncTime = _sync_capacitor_charge_threshold - _sync_capacitor_charge_level;
proposedEvent = SyncEvent::StartVSync; proposedEvent = SyncEvent::StartVSync;
_did_detect_vsync = true; _did_detect_vsync = true;
@ -134,7 +134,7 @@ CRT::SyncEvent CRT::next_vertical_sync_event(bool vsync_is_charging, int cycles_
// will an ongoing vertical sync end? // will an ongoing vertical sync end?
if (_vretrace_counter > 0) { if (_vretrace_counter > 0) {
if (_vretrace_counter < proposedSyncTime) { if (_vretrace_counter <= proposedSyncTime) {
proposedSyncTime = _vretrace_counter; proposedSyncTime = _vretrace_counter;
proposedEvent = SyncEvent::EndVSync; proposedEvent = SyncEvent::EndVSync;
} }
@ -144,7 +144,7 @@ CRT::SyncEvent CRT::next_vertical_sync_event(bool vsync_is_charging, int cycles_
return proposedEvent; return proposedEvent;
} }
CRT::SyncEvent CRT::next_horizontal_sync_event(bool hsync_is_requested, int cycles_to_run_for, int *cycles_advanced) CRT::SyncEvent CRT::get_next_horizontal_sync_event(bool hsync_is_requested, int cycles_to_run_for, int *cycles_advanced)
{ {
// do we recognise this hsync, thereby adjusting future time expectations? // do we recognise this hsync, thereby adjusting future time expectations?
if(hsync_is_requested) { if(hsync_is_requested) {
@ -177,7 +177,6 @@ CRT::SyncEvent CRT::next_horizontal_sync_event(bool hsync_is_requested, int cycl
void CRT::advance_cycles(int number_of_cycles, bool hsync_requested, const bool vsync_charging, const Type type, const char *data_type) void CRT::advance_cycles(int number_of_cycles, bool hsync_requested, const bool vsync_charging, const Type type, const char *data_type)
{ {
number_of_cycles *= _time_multiplier; number_of_cycles *= _time_multiplier;
bool is_output_run = ((type == Type::Level) || (type == Type::Data)); bool is_output_run = ((type == Type::Level) || (type == Type::Data));
@ -192,8 +191,8 @@ void CRT::advance_cycles(int number_of_cycles, bool hsync_requested, const bool
while(number_of_cycles) { while(number_of_cycles) {
int time_until_vertical_sync_event, time_until_horizontal_sync_event; int time_until_vertical_sync_event, time_until_horizontal_sync_event;
SyncEvent next_vertical_sync_event = this->next_vertical_sync_event(vsync_charging, number_of_cycles, &time_until_vertical_sync_event); SyncEvent next_vertical_sync_event = this->get_next_vertical_sync_event(vsync_charging, number_of_cycles, &time_until_vertical_sync_event);
SyncEvent next_horizontal_sync_event = this->next_horizontal_sync_event(hsync_requested, time_until_vertical_sync_event, &time_until_horizontal_sync_event); SyncEvent next_horizontal_sync_event = this->get_next_horizontal_sync_event(hsync_requested, time_until_vertical_sync_event, &time_until_horizontal_sync_event);
hsync_requested = false; hsync_requested = false;
// get the next sync event and its timing; hsync request is instantaneous (being edge triggered) so // get the next sync event and its timing; hsync request is instantaneous (being edge triggered) so

4
Outputs/CRT.hpp
View File

@ -122,8 +122,8 @@ class CRT {
StartHSync, EndHSync, StartHSync, EndHSync,
StartVSync, EndVSync StartVSync, EndVSync
}; };
SyncEvent next_vertical_sync_event(bool vsync_is_charging, int cycles_to_run_for, int *cycles_advanced); SyncEvent get_next_vertical_sync_event(bool vsync_is_charging, int cycles_to_run_for, int *cycles_advanced);
SyncEvent next_horizontal_sync_event(bool hsync_is_requested, int cycles_to_run_for, int *cycles_advanced); SyncEvent get_next_horizontal_sync_event(bool hsync_is_requested, int cycles_to_run_for, int *cycles_advanced);
}; };
} }