6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2025-01-26 15:32:04 +00:00
Code Issues Projects Releases Wiki Activity

Ensured that all relevant information is given to the tape class. Made an attempt not to write to a screen output buffer if we don't have one. Added some debug printing.

Browse Source
This commit is contained in:
Thomas Harte 2016-01-23 13:09:56 -05:00
parent 949c33774a
commit f4cd0aa38e
2 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Machines/Electron/Electron.cpp
View File

@ -104,10 +104,14 @@ unsigned int Machine::perform_bus_operation(CPU6502::BusOperation operation, uin
case 0x1:
break;
case 0x2:
printf("%02x to [2] mutates %04x ", *value, _startScreenAddress);
_startScreenAddress = (_startScreenAddress & 0xfe00) | (uint16_t)(((*value) & 0xe0) << 1);
printf("into %04x\n", _startScreenAddress);
break;
case 0x3:
printf("%02x to [3] mutates %04x ", *value, _startScreenAddress);
_startScreenAddress = (_startScreenAddress & 0x01ff) | (uint16_t)(((*value) & 0x3f) << 9);
printf("into %04x\n", _startScreenAddress);
break;
case 0x4:
if(isReadOperation(operation))
@ -117,8 +121,9 @@ unsigned int Machine::perform_bus_operation(CPU6502::BusOperation operation, uin
}
else
{
_tape.set_data_register(*value);
_tape.clear_interrupts(Interrupt::ReceiveDataFull);
}
// printf("Cassette\n");
break;
case 0x5:
if(!isReadOperation(operation))
@ -158,6 +163,7 @@ unsigned int Machine::perform_bus_operation(CPU6502::BusOperation operation, uin
{
update_audio();
_speaker.set_divider(*value);
_tape.set_counter(*value);
}
break;
case 0x7:
@ -185,10 +191,13 @@ unsigned int Machine::perform_bus_operation(CPU6502::BusOperation operation, uin
{
update_audio();
_speaker.set_is_enabled(new_speaker_is_enabled);
_tape.set_is_enabled(!new_speaker_is_enabled);
}
_tape.set_is_running(((*value)&0x40) ? true : false);
// TODO: tape mode, caps lock LED
_tape.set_is_in_input_mode(((*value)&0x04) ? false : true);
// TODO: caps lock LED
}
break;
default:
@ -450,7 +459,7 @@ inline void Machine::update_display()
uint8_t pixels = _ram[_currentScreenAddress];\
_currentScreenAddress = _currentScreenAddress+8
if(pixels_to_output)
if(pixels_to_output && _writePointer)
{
switch(_screenMode)
{
@ -511,7 +520,10 @@ inline void Machine::update_display()
else
_startLineAddress++;
_crt->output_data((unsigned int)((_writePointer - _currentLine) * _currentOutputDivider), _currentOutputDivider);
if(_writePointer)
_crt->output_data((unsigned int)((_writePointer - _currentLine) * _currentOutputDivider), _currentOutputDivider);
else
_crt->output_data(80 * crt_cycles_multiplier, _currentOutputDivider);
_crt->output_blank(24 * crt_cycles_multiplier);
_displayOutputPosition += 24;
_currentLine = nullptr;
@ -660,7 +672,7 @@ inline void Tape::clear_interrupts(uint8_t interrupts)
inline void Tape::run_for_cycles(unsigned int number_of_cycles)
{
if(_is_running && _tape != nullptr)
if(_is_running && _is_enabled && _tape != nullptr)
{
while(number_of_cycles--)
{

7
Machines/Electron/Electron.hpp
View File

@ -64,6 +64,8 @@ class Tape {
void set_tape(std::shared_ptr<Storage::Tape> tape);
inline uint8_t get_data_register() { return (uint8_t)(_data_register >> 2); }
inline void set_data_register(uint8_t value) {}
inline void set_counter(uint8_t value) {}
inline uint8_t get_interrupt_status() { return _interrupt_status; }
inline void clear_interrupts(uint8_t interrupts);
@ -76,7 +78,9 @@ class Tape {
inline void run_for_cycles(unsigned int number_of_cycles);
void set_is_running(bool is_running) { _is_running = is_running; }
inline void set_is_running(bool is_running) { _is_running = is_running; }
inline void set_is_enabled(bool is_enabled) { _is_enabled = is_enabled; }
inline void set_is_in_input_mode(bool is_in_input_mode) {}
private:
inline void push_tape_bit(uint16_t bit);
@ -89,6 +93,7 @@ class Tape {
uint32_t _time_into_pulse;
bool _is_running;
bool _is_enabled;
int _bits_since_start;
uint16_t _data_register;