6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-11-26 23:52:26 +00:00
Code Issues Projects Releases Wiki Activity

Corrects pending_events_ test for sequence points.

Browse Source 
Simplifies around as possible.
This commit is contained in:
Thomas Harte 2019-12-29 21:53:45 -05:00
parent c8fe66092b
commit 6449403f6a
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Machines/Atari/ST/Video.cpp
View File

@ -400,7 +400,7 @@ HalfCycles Video::get_next_sequence_point() {
// If any events are pending, give the first of those the chance to be next. // If any events are pending, give the first of those the chance to be next.
if(!pending_events_.empty()) { if(!pending_events_.empty()) {
event_time = std::min(event_time, x_ + event_time); event_time = std::min(event_time, x_ + pending_events_.front().delay);
} }
// If this is a vertically-enabled line, check for the display enable boundaries, + the standard delay. // If this is a vertically-enabled line, check for the display enable boundaries, + the standard delay.
@ -418,17 +418,14 @@ HalfCycles Video::get_next_sequence_point() {
event_time = std::min(event_time, vsync_x_position); event_time = std::min(event_time, vsync_x_position);
} }
// Test for beginning and end of horizontal sync, and the times when those will actually be communicated. // Test for beginning and end of horizontal sync.
if(x_ < line_length_ - hsync_start) { if(x_ < line_length_ - hsync_start + hsync_delay_period) {
event_time = std::min(line_length_ - hsync_start, event_time);
} else if(x_ < line_length_ - hsync_start + hsync_delay_period) {
event_time = std::min(line_length_ - hsync_start + hsync_delay_period, event_time); event_time = std::min(line_length_ - hsync_start + hsync_delay_period, event_time);
} else if(x_ < line_length_ - hsync_end) {
event_time = std::min(line_length_ - hsync_end, event_time);
} }
/* Assumed: hsync end will become visible at end of line. */ /* Hereby assumed: hsync end will be communicated at end of line: */
static_assert(hsync_end == hsync_delay_period);
// It wasn't any of those, so as a temporary expedient, just supply end of line. // It wasn't any of those, just supply end of line. That's when the static_assert above assumes a visible hsync transition.
return HalfCycles(event_time - x_); return HalfCycles(event_time - x_);
} }

2
OSBindings/Mac/Clock Signal.xcodeproj/xcshareddata/xcschemes/Clock Signal.xcscheme
View File

@ -67,7 +67,7 @@
</Testables> </Testables>
</TestAction> </TestAction>
<LaunchAction <LaunchAction
buildConfiguration = "Release" buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
enableASanStackUseAfterReturn = "YES" enableASanStackUseAfterReturn = "YES"