Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Replace Electron graphics generation with FPGA transcription. #1399

Merged
merged 13 commits into from
Sep 9, 2024
Merged

Replace Electron graphics generation with FPGA transcription. #1399

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
aab2dd6
Substitute in a real-time video generator.
TomHarte Sep 7, 2024
59530a1
Sub in basic transliteration of hoglet's FPGA.
TomHarte Sep 7, 2024
5ca1659
Do just enough to get 1bpp fixed-palette pixels.
TomHarte Sep 7, 2024
88248d7
Fix base address, delays.
TomHarte Sep 7, 2024
f10702b
Edge towards proper serialisation.
TomHarte Sep 7, 2024
d8b6d87
Attempt colour.
TomHarte Sep 7, 2024
b8f4385
Fix palette generation.
TomHarte Sep 7, 2024
8feb8aa
Reintroduce cropping, even if faulty.
TomHarte Sep 7, 2024
2a9e1ea
Use normal member naming convention.
TomHarte Sep 9, 2024
75db001
Add note on provenance.
TomHarte Sep 9, 2024
0efe649
Post pixel clock.
TomHarte Sep 9, 2024
51c8396
Fix faulty centring.
TomHarte Sep 9, 2024
b7f069e
Add a colour burst.
TomHarte Sep 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
90 changes: 43 additions & 47 deletions Machines/Acorn/Electron/Electron.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,21 +213,48 @@ template <bool has_scsi_bus> class ConcreteMachine:
}

forceinline Cycles perform_bus_operation(CPU::MOS6502::BusOperation operation, uint16_t address, uint8_t *value) {
unsigned int cycles = 1;
Cycles cycles{1};

if(address < 0x8000) {
cycles = video_.ram_delay();
} else {
if((address & 0xff00) == 0xfe00) {
cycles = video_.io_delay();
}
}

if(const auto video_interrupts = video_.run_for(cycles); video_interrupts) {
signal_interrupt(video_interrupts);
}

cycles_since_audio_update_ += cycles;
if(cycles_since_audio_update_ > Cycles(16384)) update_audio();
tape_.run_for(cycles);

if(typer_) typer_->run_for(cycles);
if(plus3_) plus3_->run_for(cycles * 4);
if(shift_restart_counter_) {
shift_restart_counter_ -= cycles.as<int>();
if(shift_restart_counter_ <= 0) {
shift_restart_counter_ = 0;
m6502_.set_power_on(true);
set_key_state(KeyShift, true);
is_holding_shift_ = true;
}
}

if constexpr (has_scsi_bus) {
if(scsi_is_clocked_) {
scsi_bus_.run_for(cycles);
}
}

if(address < 0x8000) {
if(isReadOperation(operation)) {
*value = ram_[address];
} else {
if(address >= video_access_range_.low_address && address <= video_access_range_.high_address) {
video_.flush();
}
ram_[address] = *value;
}

// 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 += video_.last_valid()->get_cycles_until_next_ram_availability(video_.time_since_flush().template as<int>() + 1);
} else {
switch(address & 0xff0f) {
case 0xfe00:
Expand Down Expand Up @@ -265,8 +292,7 @@ template <bool has_scsi_bus> class ConcreteMachine:
case 0xfe08: case 0xfe09: case 0xfe0a: case 0xfe0b:
case 0xfe0c: case 0xfe0d: case 0xfe0e: case 0xfe0f:
if(!isReadOperation(operation)) {
video_->write(address, *value);
video_access_range_ = video_.last_valid()->get_memory_access_range();
video_.write(address, *value);
}
break;
case 0xfe04:
Expand Down Expand Up @@ -472,59 +498,30 @@ template <bool has_scsi_bus> class ConcreteMachine:
}
}

if(video_ += Cycles(int(cycles))) {
signal_interrupt(video_.last_valid()->get_interrupts());
}

cycles_since_audio_update_ += Cycles(int(cycles));
if(cycles_since_audio_update_ > Cycles(16384)) update_audio();
tape_.run_for(Cycles(int(cycles)));

if(typer_) typer_->run_for(Cycles(int(cycles)));
if(plus3_) plus3_->run_for(Cycles(4*int(cycles)));
if(shift_restart_counter_) {
shift_restart_counter_ -= cycles;
if(shift_restart_counter_ <= 0) {
shift_restart_counter_ = 0;
m6502_.set_power_on(true);
set_key_state(KeyShift, true);
is_holding_shift_ = true;
}
}

if constexpr (has_scsi_bus) {
if(scsi_is_clocked_) {
scsi_bus_.run_for(Cycles(int(cycles)));
}
}

return Cycles(int(cycles));
return cycles;
}

void flush_output(int outputs) final {
if(outputs & Output::Video) {
video_.flush();
}
if(outputs & Output::Audio) {
update_audio();
audio_queue_.perform();
}
}

void set_scan_target(Outputs::Display::ScanTarget *scan_target) final {
video_.last_valid()->set_scan_target(scan_target);
video_.set_scan_target(scan_target);
}

Outputs::Display::ScanStatus get_scaled_scan_status() const final {
return video_.last_valid()->get_scaled_scan_status();
return video_.get_scaled_scan_status();
}

void set_display_type(Outputs::Display::DisplayType display_type) final {
video_.last_valid()->set_display_type(display_type);
video_.set_display_type(display_type);
}

Outputs::Display::DisplayType get_display_type() const final {
return video_.last_valid()->get_display_type();
return video_.get_display_type();
}

Outputs::Speaker::Speaker *get_speaker() final {
Expand Down Expand Up @@ -686,7 +683,7 @@ template <bool has_scsi_bus> class ConcreteMachine:
speaker_.run_for(audio_queue_, cycles_since_audio_update_.divide(Cycles(SoundGenerator::clock_rate_divider)));
}

inline void signal_interrupt(Interrupt interrupt) {
inline void signal_interrupt(uint8_t interrupt) {
if(!interrupt) {
return;
}
Expand Down Expand Up @@ -735,7 +732,6 @@ template <bool has_scsi_bus> class ConcreteMachine:

// Counters related to simultaneous subsystems
Cycles cycles_since_audio_update_ = 0;
VideoOutput::Range video_access_range_ = {0, 0xffff};

// Tape
Tape tape_;
Expand Down Expand Up @@ -771,7 +767,7 @@ template <bool has_scsi_bus> class ConcreteMachine:
}

// Outputs
JustInTimeActor<VideoOutput, Cycles> video_;
VideoOutput video_;

Concurrency::AsyncTaskQueue<false> audio_queue_;
SoundGenerator sound_generator_;
Expand Down
Loading
Loading