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

Ensures that the 9918 admits that it is the source of interrupts.

Browse Source
This commit is contained in:
Thomas Harte 2017-11-29 21:33:43 -05:00
parent f0f149c018
commit ee84f33ab5
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Components/9918/9918.cpp
View File

@ -184,8 +184,8 @@ void TMS9918::run_for(const HalfCycles cycles) {
if(column_ == 342) { if(column_ == 342) {
access_pointer_ = column_ = output_column_ = 0; access_pointer_ = column_ = output_column_ = 0;
row_ = (row_ + 1) % frame_lines_; row_ = (row_ + 1) % frame_lines_;
if(row_ == 192) status_ |= 0x80;
// TODO: consider triggering an interrupt here.
screen_mode_ = next_screen_mode_; screen_mode_ = next_screen_mode_;
switch(screen_mode_) { switch(screen_mode_) {
// TODO: text mdoe. // TODO: text mdoe.
@ -232,6 +232,7 @@ void TMS9918::set_register(int address, uint8_t value) {
switch(value & 7) { switch(value & 7) {
case 0: case 0:
next_screen_mode_ = (next_screen_mode_ & 6) | ((low_write_ & 2) >> 1); next_screen_mode_ = (next_screen_mode_ & 6) | ((low_write_ & 2) >> 1);
printf("NSM: %02x\n", next_screen_mode_);
break; break;
case 1: case 1:
@ -240,7 +241,7 @@ void TMS9918::set_register(int address, uint8_t value) {
next_screen_mode_ = (screen_mode_ & 1) | ((low_write_ & 0x18) >> 3); next_screen_mode_ = (screen_mode_ & 1) | ((low_write_ & 0x18) >> 3);
sprites_16x16_ = !!(low_write_ & 0x02); sprites_16x16_ = !!(low_write_ & 0x02);
sprites_magnified_ = !!(low_write_ & 0x01); sprites_magnified_ = !!(low_write_ & 0x01);
reevaluate_interrupts(); printf("NSM: %02x\n", next_screen_mode_);
break; break;
case 2: case 2:
@ -293,15 +294,10 @@ uint8_t TMS9918::get_register(int address) {
// Reads from address 1 get the status register; // Reads from address 1 get the status register;
uint8_t result = status_; uint8_t result = status_;
status_ &= ~(0x80 | 0x20); status_ &= ~(0x80 | 0x20);
reevaluate_interrupts();
return result; return result;
} }
void TMS9918::reevaluate_interrupts() { HalfCycles TMS9918::get_time_until_interrupt() {
}
HalfCycles TMS9918::get_time_until_interrupt() {
if(!generate_interrupts_) return HalfCycles(-1); if(!generate_interrupts_) return HalfCycles(-1);
if(get_interrupt_line()) return HalfCycles(-1); if(get_interrupt_line()) return HalfCycles(-1);

2
Components/9918/9918.hpp
View File

@ -74,8 +74,6 @@ class TMS9918 {
uint8_t text_colour_ = 0; uint8_t text_colour_ = 0;
uint8_t background_colour_ = 0; uint8_t background_colour_ = 0;
void reevaluate_interrupts();
HalfCycles half_cycles_into_frame_; HalfCycles half_cycles_into_frame_;
int column_ = 0, row_ = 0, output_column_ = 0; int column_ = 0, row_ = 0, output_column_ = 0;
int cycles_error_ = 0; int cycles_error_ = 0;