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

Pulls out address reload as something I can position independently.

Browse Source 
Sadly receding it by 3 did not have the effect I was hoping for, of receding Enchanted Land's first register tweaking.
This commit is contained in:
Thomas Harte 2019-12-27 23:47:19 -05:00
parent 2757e5d600
commit a9d1f5d925
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -100,7 +100,7 @@ const int hsync_start = CYCLE(48); // Cycles before end of line when hsync star
const int hsync_end = CYCLE(8); // Cycles before end of line when hsync ends. const int hsync_end = CYCLE(8); // Cycles before end of line when hsync ends.
// "VSYNC starts 104 cycles after the start of the previous line's HSYNC, so that's 4 cycles before DE would be activated. "; // "VSYNC starts 104 cycles after the start of the previous line's HSYNC, so that's 4 cycles before DE would be activated. ";
// hsync is at -50, so that's +54 // hsync is at -50, so that's +54, or thereabouts.
} }
@ -246,6 +246,12 @@ void Video::advance(HalfCycles duration) {
} }
} }
// Check for address reload; this timing is _highly_ speculative on my part.
if(y_ == vertical_timings.height - 3 && x_ <= vsync_x_position && (x_ + run_length) > vsync_x_position) {
current_address_ = base_address_ >> 1;
reset_fifo(); // TODO: remove this, probably, once otherwise stable?
}
// Check for whether line length should have been latched during this run. // Check for whether line length should have been latched during this run.
if(x_ <= CYCLE(54) && (x_ + run_length) > CYCLE(54)) line_length_ = horizontal_timings.length; if(x_ <= CYCLE(54) && (x_ + run_length) > CYCLE(54)) line_length_ = horizontal_timings.length;
@ -271,9 +277,6 @@ void Video::advance(HalfCycles duration) {
} else if(y_ == 3) { } else if(y_ == 3) {
next_vertical_.sync_schedule = VerticalState::SyncSchedule::End; next_vertical_.sync_schedule = VerticalState::SyncSchedule::End;
current_address_ = base_address_ >> 1;
reset_fifo(); // TODO: remove this, I think, once otherwise stable.
// Consider a shout out to the range observer. // Consider a shout out to the range observer.
if(previous_base_address_ != base_address_) { if(previous_base_address_ != base_address_) {
previous_base_address_ = base_address_; previous_base_address_ = base_address_;
@ -486,6 +489,9 @@ void Video::update_output_mode() {
reset_fifo(); reset_fifo();
video_stream_.set_bpp(output_bpp_); video_stream_.set_bpp(output_bpp_);
} }
// const int freqs[] = {50, 60, 72};
// printf("%d, %d -> %d [%d %d]\n", x_ / 2, y_, freqs[int(field_frequency_)], horizontal_.enable, vertical_.enable);
} }
// MARK: - The shifter // MARK: - The shifter
@ -579,7 +585,7 @@ void Video::VideoStream::generate(int duration, OutputMode mode, bool is_termina
void Video::VideoStream::flush_border() { void Video::VideoStream::flush_border() {
// Output colour 0 for the entirety of duration_ (or black, if this is 1bpp mode). // Output colour 0 for the entirety of duration_ (or black, if this is 1bpp mode).
uint16_t *const colour_pointer = reinterpret_cast<uint16_t *>(crt_.begin_data(1)); uint16_t *const colour_pointer = reinterpret_cast<uint16_t *>(crt_.begin_data(1));
if(colour_pointer) *colour_pointer = (bpp_ != OutputBpp::One) ? palette_[0] : 0; if(colour_pointer) *colour_pointer = (bpp_ != OutputBpp::One) ? border_colour_ : 0;
crt_.output_level(duration_); crt_.output_level(duration_);
duration_ = 0; duration_ = 0;

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

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