From 5758693b7d6ae3139278ebfddbf8d5eb4bf63e5d Mon Sep 17 00:00:00 2001 From: "C.W. Betts" Date: Fri, 19 Mar 2021 02:19:49 -0600 Subject: [PATCH 1/4] Minor pokes to the test files code. --- OSBindings/Mac/Clock SignalTests/68000ComparativeTests.mm | 2 +- OSBindings/Mac/Clock SignalTests/EmuTOSTests.mm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/OSBindings/Mac/Clock SignalTests/68000ComparativeTests.mm b/OSBindings/Mac/Clock SignalTests/68000ComparativeTests.mm index 2f555f34c..cec3017f1 100644 --- a/OSBindings/Mac/Clock SignalTests/68000ComparativeTests.mm +++ b/OSBindings/Mac/Clock SignalTests/68000ComparativeTests.mm @@ -43,7 +43,7 @@ // Issue each test file. for(NSURL *url in tests) { // Compare against a file set if one has been supplied. - if(_fileSet && ![_fileSet containsObject:[[url path] lastPathComponent]]) continue; + if(_fileSet && ![_fileSet containsObject:[url lastPathComponent]]) continue; NSLog(@"Testing %@", url); [self testJSONAtURL:url]; } diff --git a/OSBindings/Mac/Clock SignalTests/EmuTOSTests.mm b/OSBindings/Mac/Clock SignalTests/EmuTOSTests.mm index ad5dbb163..9c50a04a5 100644 --- a/OSBindings/Mac/Clock SignalTests/EmuTOSTests.mm +++ b/OSBindings/Mac/Clock SignalTests/EmuTOSTests.mm @@ -107,7 +107,7 @@ class EmuTOS: public ComparativeBusHandler { const std::vector rom_names = {{"AtariST", "", image.UTF8String, 0, 0 }}; const auto roms = CSROMFetcher()(rom_names); NSString *const traceLocation = [[NSBundle bundleForClass:[self class]] pathForResource:trace ofType:@"trace.txt.gz"]; - _machine = std::make_unique(*roms[0], traceLocation.UTF8String); + _machine = std::make_unique(*roms[0], traceLocation.fileSystemRepresentation); _machine->run_for(HalfCycles(length)); } From 650b9a139b0cd34fc01683853490897f24128ad0 Mon Sep 17 00:00:00 2001 From: Thomas Harte Date: Fri, 19 Mar 2021 08:38:21 -0400 Subject: [PATCH 2/4] Tweak Master System blue scale. --- Components/9918/Implementation/9918Base.hpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/Components/9918/Implementation/9918Base.hpp b/Components/9918/Implementation/9918Base.hpp index 9ecea6943..c0bb8c86d 100644 --- a/Components/9918/Implementation/9918Base.hpp +++ b/Components/9918/Implementation/9918Base.hpp @@ -350,11 +350,14 @@ class Base { case MemoryAccess::Write: if(master_system_.cram_is_selected) { - // Adjust the palette. + // Adjust the palette. In a Master System blue has a slightly different + // scale; cf. https://www.retrorgb.com/sega-master-system-non-linear-blue-channel-findings.html + constexpr uint8_t rg_scale[] = {0, 85, 170, 255}; + constexpr uint8_t b_scale[] = {0, 104, 170, 255}; master_system_.colour_ram[ram_pointer_ & 0x1f] = palette_pack( - uint8_t(((read_ahead_buffer_ >> 0) & 3) * 255 / 3), - uint8_t(((read_ahead_buffer_ >> 2) & 3) * 255 / 3), - uint8_t(((read_ahead_buffer_ >> 4) & 3) * 255 / 3) + rg_scale[(read_ahead_buffer_ >> 0) & 3], + rg_scale[(read_ahead_buffer_ >> 2) & 3], + b_scale[(read_ahead_buffer_ >> 4) & 3] ); // Schedule a CRAM dot; this is scheduled for wherever it should appear From 0f9ab53ea0184922fa311c4937ff6f7c3de10ae8 Mon Sep 17 00:00:00 2001 From: Thomas Harte Date: Sun, 21 Mar 2021 22:25:14 -0400 Subject: [PATCH 3/4] Resolves GCC warnings from dangling Apple IIgs work. --- Machines/Apple/AppleII/AuxiliaryMemorySwitches.hpp | 2 +- Machines/Apple/AppleIIgs/AppleIIgs.cpp | 4 ++-- Machines/Apple/AppleIIgs/MemoryMap.hpp | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Machines/Apple/AppleII/AuxiliaryMemorySwitches.hpp b/Machines/Apple/AppleII/AuxiliaryMemorySwitches.hpp index f4ae901d8..9dc5b56fb 100644 --- a/Machines/Apple/AppleII/AuxiliaryMemorySwitches.hpp +++ b/Machines/Apple/AppleII/AuxiliaryMemorySwitches.hpp @@ -200,7 +200,7 @@ template class AuxiliaryMemorySwitches { } /// @returns @c true if the alternative zero page should be used; @c false otherwise. - const ZeroState zero_state() const { + ZeroState zero_state() const { return switches_.alternative_zero_page; } diff --git a/Machines/Apple/AppleIIgs/AppleIIgs.cpp b/Machines/Apple/AppleIIgs/AppleIIgs.cpp index 831104b65..7c0d8ccc5 100644 --- a/Machines/Apple/AppleIIgs/AppleIIgs.cpp +++ b/Machines/Apple/AppleIIgs/AppleIIgs.cpp @@ -107,8 +107,8 @@ class MemManagerChecker { return true; } - bool has_seen_valid_memory_ = false; - bool should_validate_ = false; +// bool has_seen_valid_memory_ = false; +// bool should_validate_ = false; public: bool validate_memory_manager(const Apple::IIgs::MemoryMap &memory, bool print) { diff --git a/Machines/Apple/AppleIIgs/MemoryMap.hpp b/Machines/Apple/AppleIIgs/MemoryMap.hpp index afa8fbb72..af0d9d5cd 100644 --- a/Machines/Apple/AppleIIgs/MemoryMap.hpp +++ b/Machines/Apple/AppleIIgs/MemoryMap.hpp @@ -35,7 +35,7 @@ class MemoryMap { // Establish bank mapping. uint8_t next_region = 0; auto region = [&next_region, this]() -> uint8_t { - assert(next_region != regions.size()); + assert(next_region != this->regions.size()); return next_region++; }; auto set_region = [this](uint8_t bank, uint16_t start, uint16_t end, uint8_t region) { @@ -49,7 +49,7 @@ class MemoryMap { ++target; } }; - auto set_regions = [this, set_region, region](uint8_t bank, std::initializer_list addresses, std::vector allocated_regions = {}) { + auto set_regions = [set_region, region](uint8_t bank, std::initializer_list addresses, std::vector allocated_regions = {}) { uint16_t previous = 0x0000; auto next_region = allocated_regions.begin(); for(uint16_t address: addresses) { From c097ed348a4fd7237c23059f46af469136b9eb62 Mon Sep 17 00:00:00 2001 From: Thomas Harte Date: Sun, 21 Mar 2021 22:38:50 -0400 Subject: [PATCH 4/4] Ensures no signalling to wait by a ZX80, ever. --- Machines/ZX8081/ZX8081.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Machines/ZX8081/ZX8081.cpp b/Machines/ZX8081/ZX8081.cpp index be604d1be..0bf86af7d 100644 --- a/Machines/ZX8081/ZX8081.cpp +++ b/Machines/ZX8081/ZX8081.cpp @@ -165,7 +165,7 @@ template class ConcreteMachine: } if(!(address & 2)) nmi_is_enabled_ = false; if(!(address & 1)) nmi_is_enabled_ = is_zx81; - if(!nmi_is_enabled_) z80_.set_wait_line(false); + if(is_zx81 && !nmi_is_enabled_) z80_.set_wait_line(false); // The below emulates the ZonX AY expansion device. if constexpr (is_zx81) {