6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-07-17 13:29:02 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'Vic20Tests'

Browse Source
This commit is contained in:
Thomas Harte 2020-09-22 22:08:29 -04:00
commit c0b1308dfd
2 changed files with 33 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Components/6522/Implementation/6522Implementation.hpp
View File

@ -86,7 +86,7 @@ template <typename T> void MOS6522<T>::write(int address, uint8_t value) {
timer_is_running_[0] = true; timer_is_running_[0] = true;
// If PB7 output mode is active, set it low. // If PB7 output mode is active, set it low.
if(registers_.auxiliary_control & 0x80) { if(timer1_is_controlling_pb7()) {
registers_.timer_port_b_output &= 0x7f; registers_.timer_port_b_output &= 0x7f;
evaluate_port_b_output(); evaluate_port_b_output();
} }
@ -120,9 +120,11 @@ template <typename T> void MOS6522<T>::write(int address, uint8_t value) {
registers_.auxiliary_control = value; registers_.auxiliary_control = value;
evaluate_cb2_output(); evaluate_cb2_output();
printf("Shift mode: %d\n", shift_mode());
// This is a bit of a guess: reset the timer-based PB7 output to its default high level // This is a bit of a guess: reset the timer-based PB7 output to its default high level
// any timer that timer-linked PB7 output is disabled. // any timer that timer-linked PB7 output is disabled.
if(!(registers_.auxiliary_control & 0x80)) { if(!timer1_is_controlling_pb7()) {
registers_.timer_port_b_output |= 0x80; registers_.timer_port_b_output |= 0x80;
} }
evaluate_port_b_output(); evaluate_port_b_output();
@ -308,9 +310,9 @@ template <typename T> void MOS6522<T>::do_phase2() {
} }
// Count down timer 2 if it is in timed interrupt mode (i.e. auxiliary control bit 5 is clear). // Count down timer 2 if it is in timed interrupt mode (i.e. auxiliary control bit 5 is clear).
// TODO: implement count down on PB6 if this bit isn't set. registers_.timer[1] -= timer2_clock_decrement();
registers_.timer[1] -= 1 ^ ((registers_.auxiliary_control >> 5)&1);
// TODO: can eliminate conditional branches here.
if(registers_.next_timer[0] >= 0) { if(registers_.next_timer[0] >= 0) {
registers_.timer[0] = uint16_t(registers_.next_timer[0]); registers_.timer[0] = uint16_t(registers_.next_timer[0]);
registers_.next_timer[0] = -1; registers_.next_timer[0] = -1;
@ -361,13 +363,13 @@ template <typename T> void MOS6522<T>::do_phase1() {
reevaluate_interrupts(); reevaluate_interrupts();
// Determine whether to reload. // Determine whether to reload.
if(registers_.auxiliary_control&0x40) if(timer1_is_continuous())
registers_.timer_needs_reload = true; registers_.timer_needs_reload = true;
else else
timer_is_running_[0] = false; timer_is_running_[0] = false;
// Determine whether to toggle PB7. // Determine whether to toggle PB7.
if(registers_.auxiliary_control&0x80) { if(timer1_is_controlling_pb7()) {
registers_.timer_port_b_output ^= 0x80; registers_.timer_port_b_output ^= 0x80;
bus_handler_.run_for(time_since_bus_handler_call_.flush<HalfCycles>()); bus_handler_.run_for(time_since_bus_handler_call_.flush<HalfCycles>());
evaluate_port_b_output(); evaluate_port_b_output();
@ -478,10 +480,11 @@ template <typename T> void MOS6522<T>::shift_in() {
} }
template <typename T> void MOS6522<T>::shift_out() { template <typename T> void MOS6522<T>::shift_out() {
// When shifting out, the shift register rotates rather than strictly shifts. const bool is_free_running = shift_mode() == ShiftMode::OutUnderT2FreeRunning;
// TODO: is that true for all modes? if(is_free_running || shift_bits_remaining_) {
if(shift_mode() == ShiftMode::OutUnderT2FreeRunning || shift_bits_remaining_) { // Recirculate bits only if in free-running mode (?)
registers_.shift = uint8_t((registers_.shift << 1) | (registers_.shift >> 7)); const uint8_t incoming_bit = (registers_.shift >> 7) * is_free_running;
registers_.shift = uint8_t(registers_.shift << 1) | incoming_bit;
evaluate_cb2_output(); evaluate_cb2_output();
--shift_bits_remaining_; --shift_bits_remaining_;

22
Components/6522/Implementation/6522Storage.hpp
View File

@ -81,12 +81,30 @@ class MOS6522Storage {
OutUnderPhase2 = 6, OutUnderPhase2 = 6,
OutUnderCB1 = 7 OutUnderCB1 = 7
}; };
ShiftMode shift_mode() const { bool timer1_is_controlling_pb7() const {
return ShiftMode((registers_.auxiliary_control >> 2) & 7); return registers_.auxiliary_control & 0x80;
}
bool timer1_is_continuous() const {
return registers_.auxiliary_control & 0x40;
} }
bool is_shifting_out() const { bool is_shifting_out() const {
return registers_.auxiliary_control & 0x10; return registers_.auxiliary_control & 0x10;
} }
int timer2_clock_decrement() const {
return 1 ^ ((registers_.auxiliary_control >> 5)&1);
}
int timer2_pb6_decrement() const {
return (registers_.auxiliary_control >> 5)&1;
}
ShiftMode shift_mode() const {
return ShiftMode((registers_.auxiliary_control >> 2) & 7);
}
bool portb_is_latched() const {
return registers_.auxiliary_control & 0x02;
}
bool port1_is_latched() const {
return registers_.auxiliary_control & 0x01;
}
}; };
} }