From 9342c6005f561e91c9915ecdf70e4c40245bf42d Mon Sep 17 00:00:00 2001 From: Thomas Harte Date: Mon, 15 May 2023 10:09:39 -0400 Subject: [PATCH 1/3] Remove dead 68000 references. --- OSBindings/Qt/clksignal.pro | 3 --- OSBindings/SDL/SConstruct | 2 -- 2 files changed, 5 deletions(-) diff --git a/OSBindings/Qt/clksignal.pro b/OSBindings/Qt/clksignal.pro index cb1e865b2..e26e3e77b 100644 --- a/OSBindings/Qt/clksignal.pro +++ b/OSBindings/Qt/clksignal.pro @@ -113,8 +113,6 @@ SOURCES += \ $$SRC/Processors/6502/Implementation/*.cpp \ $$SRC/Processors/6502/State/*.cpp \ $$SRC/Processors/65816/Implementation/*.cpp \ - $$SRC/Processors/68000/Implementation/*.cpp \ - $$SRC/Processors/68000/State/*.cpp \ $$SRC/Processors/Z80/Implementation/*.cpp \ $$SRC/Processors/Z80/State/*.cpp \ \ @@ -259,7 +257,6 @@ HEADERS += \ $$SRC/Processors/65816/Implementation/*.hpp \ $$SRC/Processors/68000/*.hpp \ $$SRC/Processors/68000/Implementation/*.hpp \ - $$SRC/Processors/68000/State/*.hpp \ $$SRC/Processors/Z80/*.hpp \ $$SRC/Processors/Z80/Implementation/*.hpp \ $$SRC/Processors/Z80/State/*.hpp \ diff --git a/OSBindings/SDL/SConstruct b/OSBindings/SDL/SConstruct index 6b1e6e849..af2dd675c 100644 --- a/OSBindings/SDL/SConstruct +++ b/OSBindings/SDL/SConstruct @@ -100,8 +100,6 @@ SOURCES += glob.glob('../../Outputs/OpenGL/Primitives/*.cpp') SOURCES += glob.glob('../../Processors/6502/Implementation/*.cpp') SOURCES += glob.glob('../../Processors/6502/State/*.cpp') SOURCES += glob.glob('../../Processors/65816/Implementation/*.cpp') -SOURCES += glob.glob('../../Processors/68000/Implementation/*.cpp') -SOURCES += glob.glob('../../Processors/68000/State/*.cpp') SOURCES += glob.glob('../../Processors/Z80/Implementation/*.cpp') SOURCES += glob.glob('../../Processors/Z80/State/*.cpp') From a1a7c0e253a2e1487893b07d6625e7cf9c49124a Mon Sep 17 00:00:00 2001 From: Thomas Harte Date: Mon, 15 May 2023 10:17:04 -0400 Subject: [PATCH 2/3] Apply maybe_unused judiciously. --- Components/9918/Implementation/Draw.hpp | 6 ++--- Components/9918/Implementation/Fetch.hpp | 2 +- Components/Serial/Line.cpp | 2 +- Machines/MSX/MSX.cpp | 2 +- Machines/Sinclair/ZXSpectrum/ZXSpectrum.cpp | 2 +- .../Implementation/68000Implementation.hpp | 24 +++++++++---------- 6 files changed, 18 insertions(+), 20 deletions(-) diff --git a/Components/9918/Implementation/Draw.hpp b/Components/9918/Implementation/Draw.hpp index ee5dcb9cc..5bf4a5757 100644 --- a/Components/9918/Implementation/Draw.hpp +++ b/Components/9918/Implementation/Draw.hpp @@ -15,7 +15,7 @@ namespace TI::TMS { template template -void Base::draw_sprites(uint8_t y, int start, int end, const std::array &palette, int *colour_buffer) { +void Base::draw_sprites([[maybe_unused]] uint8_t y, int start, int end, const std::array &palette, int *colour_buffer) { if(!draw_line_buffer_->sprites) { return; } @@ -346,7 +346,7 @@ void Base::draw_tms_text(int start, int end) { // MARK: - Master System template -void Base::draw_sms(int start, int end, uint32_t cram_dot) { +void Base::draw_sms([[maybe_unused]] int start, [[maybe_unused]] int end, [[maybe_unused]] uint32_t cram_dot) { if constexpr (is_sega_vdp(personality)) { int colour_buffer[256]; auto &line_buffer = *draw_line_buffer_; @@ -451,7 +451,7 @@ void Base::draw_sms(int start, int end, uint32_t cram_dot) { template template void Base::draw_yamaha(uint8_t y, int start, int end) { - const auto active_palette = palette(); + [[maybe_unused]] const auto active_palette = palette(); const int sprite_start = start >> 2; const int sprite_end = end >> 2; auto &line_buffer = *draw_line_buffer_; diff --git a/Components/9918/Implementation/Fetch.hpp b/Components/9918/Implementation/Fetch.hpp index 7f7ea7fff..1b644c978 100644 --- a/Components/9918/Implementation/Fetch.hpp +++ b/Components/9918/Implementation/Fetch.hpp @@ -588,7 +588,7 @@ struct SMSSequencer { }; template -template void Base::fetch_sms(uint8_t y, int start, int end) { +template void Base::fetch_sms([[maybe_unused]] uint8_t y, [[maybe_unused]] int start, [[maybe_unused]] int end) { if constexpr (is_sega_vdp(personality)) { SMSSequencer sequencer(this, y); dispatch(sequencer, start, end); diff --git a/Components/Serial/Line.cpp b/Components/Serial/Line.cpp index 62ce110a0..d6eb875eb 100644 --- a/Components/Serial/Line.cpp +++ b/Components/Serial/Line.cpp @@ -129,7 +129,7 @@ bool Line::read() const { } template -void Line::set_read_delegate(ReadDelegate *delegate, Storage::Time bit_length) { +void Line::set_read_delegate(ReadDelegate *delegate, [[maybe_unused]] Storage::Time bit_length) { read_delegate_ = delegate; if constexpr (!include_clock) { assert(bit_length > Storage::Time(0)); diff --git a/Machines/MSX/MSX.cpp b/Machines/MSX/MSX.cpp index 7a5c3a7ca..cc5de7f72 100644 --- a/Machines/MSX/MSX.cpp +++ b/Machines/MSX/MSX.cpp @@ -228,7 +228,7 @@ class ConcreteMachine: uint8_t character_generator = 1; /* 0 = Japan, 1 = USA, etc, 2 = USSR */ uint8_t date_format = 1; /* 0 = Y/M/D, 1 = M/D/Y, 2 = D/M/Y */ uint8_t keyboard = 1; /* 0 = Japan, 1 = USA, 2 = France, 3 = UK, 4 = Germany, 5 = USSR, 6 = Spain */ - ROM::Name regional_bios_name; + [[maybe_unused]] ROM::Name regional_bios_name; switch(target.region) { default: diff --git a/Machines/Sinclair/ZXSpectrum/ZXSpectrum.cpp b/Machines/Sinclair/ZXSpectrum/ZXSpectrum.cpp index 2bbf4a405..4fcf507f9 100644 --- a/Machines/Sinclair/ZXSpectrum/ZXSpectrum.cpp +++ b/Machines/Sinclair/ZXSpectrum/ZXSpectrum.cpp @@ -523,7 +523,7 @@ template class ConcreteMachine: break; case PartialMachineCycle::Input: { - bool did_match = false; + [[maybe_unused]] bool did_match = false; *cycle.value = 0xff; if(!(address&32)) { diff --git a/Processors/68000/Implementation/68000Implementation.hpp b/Processors/68000/Implementation/68000Implementation.hpp index cd28afa2d..719c53d31 100644 --- a/Processors/68000/Implementation/68000Implementation.hpp +++ b/Processors/68000/Implementation/68000Implementation.hpp @@ -727,20 +727,18 @@ void Processor Date: Mon, 15 May 2023 10:17:27 -0400 Subject: [PATCH 3/3] Avoid BASIC 2.1 requirement when running 1.1. --- Machines/Enterprise/Enterprise.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Machines/Enterprise/Enterprise.cpp b/Machines/Enterprise/Enterprise.cpp index a361657e2..45cbea195 100644 --- a/Machines/Enterprise/Enterprise.cpp +++ b/Machines/Enterprise/Enterprise.cpp @@ -139,6 +139,7 @@ template class ConcreteMachine: ROM::Request(ROM::Name::EnterpriseBASIC11) || ROM::Request(ROM::Name::EnterpriseBASIC11Suffixed) ); + break; case Target::BASICVersion::v21: request = request && ROM::Request(ROM::Name::EnterpriseBASIC21); break; @@ -724,7 +725,7 @@ template class ConcreteMachine: EXDos exdos_; // MARK: - Activity Source - void set_activity_observer(Activity::Observer *observer) final { + void set_activity_observer([[maybe_unused]] Activity::Observer *observer) final { if constexpr (has_disk_controller) { exdos_.set_activity_observer(observer); }