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

Disabled my various bits of rate interchange debugging; improved test for when to call update_display due to a RAM write.

Browse Source
This commit is contained in:
Thomas Harte 2016-01-21 22:16:52 -05:00
parent 82cb1c365c
commit 0efe4b312c
3 changed files with 34 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Machines/Electron/Electron.cpp
View File

@ -17,6 +17,8 @@ static const unsigned int cycles_per_frame = 312*cycles_per_line;
static const unsigned int crt_cycles_multiplier = 8;
static const unsigned int crt_cycles_per_line = crt_cycles_multiplier * cycles_per_line;
const int first_graphics_line = 28;
Machine::Machine() :
_interruptControl(0),
_frameCycles(0),
@ -52,20 +54,28 @@ unsigned int Machine::perform_bus_operation(CPU6502::BusOperation operation, uin
}
else
{
// TODO: range check on address; a lot of the time the machine will be running code outside of
// the screen area, meaning that no update is required.
update_display();
// If we're still before the display will start to be painted, or the address is
// less than both the current line address and 0x3000, (the minimum screen mode
// base address) then there's no way this write can affect the current frame. Sp
// no need to flush the display. Otherwise, output up until now so that any
// write doesn't have retroactive effect on the video output.
if(!(
(_frameCycles < first_graphics_line * cycles_per_line) ||
(address < _startLineAddress && address < 0x3000)
))
update_display();
_ram[address] = *value;
}
// TODO: RAM timing for Modes 0–3
// for the entire frame, RAM is accessible only on odd cycles; in modes below 4
// it's also accessible only outside of the pixel regions
cycles += (_frameCycles&1)^1;
if(_screenMode < 4)
{
const int current_line = _frameCycles >> 7;
const int line_position = _frameCycles & 127;
if(current_line >= 28 && current_line < 28+256 && line_position >= 24 && line_position < 104)
if(current_line >= first_graphics_line && current_line < first_graphics_line+256 && line_position >= 24 && line_position < 104)
cycles = (unsigned int)(104 - line_position);
}
}
@ -410,7 +420,6 @@ inline void Machine::update_display()
{
const int lines_of_hsync = 3;
const int end_of_hsync = lines_of_hsync * cycles_per_line;
const int first_graphics_line = 28;
if(_frameCycles >= end_of_hsync)
{

8
OSBindings/Mac/Clock Signal/Wrappers/CSElectron.mm
View File

@ -15,12 +15,12 @@
@implementation CSElectron {
Electron::Machine _electron;
NSTimeInterval _periodicStart;
int _numberOfCycles;
// NSTimeInterval _periodicStart;
// int _numberOfCycles;
}
- (void)doRunForNumberOfCycles:(int)numberOfCycles {
_numberOfCycles += numberOfCycles;
/* _numberOfCycles += numberOfCycles;
NSTimeInterval timeNow = [NSDate timeIntervalSinceReferenceDate];
NSTimeInterval difference = timeNow - _periodicStart;
if(difference > 1.0)
@ -28,7 +28,7 @@
NSLog(@"cycles: %0.0f", (double)_numberOfCycles / difference);
_periodicStart = timeNow;
_numberOfCycles = 0;
}
}*/
_electron.run_for_cycles(numberOfCycles);
}

30
Outputs/Speaker.hpp
View File

@ -77,16 +77,16 @@ template <class T> class Filter: public Speaker {
{
if(_coefficients_are_dirty) update_filter_coefficients();
_periodic_cycles += input_cycles;
time_t time_now = time(nullptr);
if(time_now > _periodic_start)
{
printf("input audio samples: %d\n", _periodic_cycles);
printf("output audio samples: %d\n", _periodic_output);
_periodic_cycles = 0;
_periodic_output = 0;
_periodic_start = time_now;
}
// _periodic_cycles += input_cycles;
// time_t time_now = time(nullptr);
// if(time_now > _periodic_start)
// {
// printf("input audio samples: %d\n", _periodic_cycles);
// printf("output audio samples: %d\n", _periodic_output);
// _periodic_cycles = 0;
// _periodic_output = 0;
// _periodic_start = time_now;
// }
// point sample for now, as a temporary measure
input_cycles += _input_cycles_carry;
@ -111,17 +111,17 @@ template <class T> class Filter: public Speaker {
if(steps > 1)
static_cast<T *>(this)->skip_samples((unsigned int)(steps-1));
input_cycles -= steps;
_periodic_output ++;
// _periodic_output ++;
}
_input_cycles_carry = input_cycles;
}
Filter() : _periodic_cycles(0), _periodic_start(0) {}
Filter() {} // _periodic_cycles(0), _periodic_start(0)
private:
time_t _periodic_start;
int _periodic_cycles;
int _periodic_output;
// time_t _periodic_start;
// int _periodic_cycles;
// int _periodic_output;
SignalProcessing::Stepper *_stepper;
int _input_cycles_carry;