From 7122a9ee167d68a69669ade49ff5c0f8f94e4309 Mon Sep 17 00:00:00 2001 From: Thomas Harte Date: Sun, 21 Jan 2024 21:08:04 -0500 Subject: [PATCH 1/3] Add missing include of cstdint. --- Machines/Apple/AppleIIgs/AppleIIgs.cpp | 14 +++++++------- Machines/Apple/AppleIIgs/MemoryMap.hpp | 1 + 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/Machines/Apple/AppleIIgs/AppleIIgs.cpp b/Machines/Apple/AppleIIgs/AppleIIgs.cpp index 06f48ad44..48558ba78 100644 --- a/Machines/Apple/AppleIIgs/AppleIIgs.cpp +++ b/Machines/Apple/AppleIIgs/AppleIIgs.cpp @@ -8,16 +8,18 @@ #include "AppleIIgs.hpp" -#include "../../../Activity/Source.hpp" -#include "../../MachineTypes.hpp" - -#include "../../../Analyser/Static/AppleIIgs/Target.hpp" - #include "ADB.hpp" #include "MemoryMap.hpp" #include "Video.hpp" #include "Sound.hpp" +#include "../AppleII/Joystick.hpp" + +#include "../../../Activity/Source.hpp" +#include "../../MachineTypes.hpp" + +#include "../../../Analyser/Static/AppleIIgs/Target.hpp" + #include "../../../Processors/65816/65816.hpp" #include "../../../Components/8530/z8530.hpp" #include "../../../Components/AppleClock/AppleClock.hpp" @@ -26,8 +28,6 @@ #include "../../../Components/DiskII/MacintoshDoubleDensityDrive.hpp" #include "../../../Components/DiskII/DiskIIDrive.hpp" -#include "../AppleII/Joystick.hpp" - #include "../../../Outputs/Speaker/Implementation/CompoundSource.hpp" #include "../../../Outputs/Speaker/Implementation/LowpassSpeaker.hpp" diff --git a/Machines/Apple/AppleIIgs/MemoryMap.hpp b/Machines/Apple/AppleIIgs/MemoryMap.hpp index 795cc9e27..ab5b01b0a 100644 --- a/Machines/Apple/AppleIIgs/MemoryMap.hpp +++ b/Machines/Apple/AppleIIgs/MemoryMap.hpp @@ -11,6 +11,7 @@ #include #include #include +#include #include #include "../AppleII/LanguageCardSwitches.hpp" From a6df20ff846264f019bb92526a5cbbd642427ae1 Mon Sep 17 00:00:00 2001 From: Thomas Harte Date: Sun, 21 Jan 2024 21:19:38 -0500 Subject: [PATCH 2/3] Eliminate printf. --- Machines/Amiga/Blitter.hpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/Machines/Amiga/Blitter.hpp b/Machines/Amiga/Blitter.hpp index ecd934143..b3db330af 100644 --- a/Machines/Amiga/Blitter.hpp +++ b/Machines/Amiga/Blitter.hpp @@ -28,9 +28,6 @@ template class Blitter: public DMADevice<4, 4> { using DMADevice::DMADevice; template void set_pointer(uint16_t value) { - if(get_status() & 0x4000) { - printf(">>>"); - } DMADevice<4, 4>::set_pointer(value); } From d3cea4a10f768c3245033314587475eb66141ecf Mon Sep 17 00:00:00 2001 From: Thomas Harte Date: Sun, 21 Jan 2024 21:19:51 -0500 Subject: [PATCH 3/3] Note that arguments may be unused. --- Machines/Apple/AppleIIgs/MemoryMap.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Machines/Apple/AppleIIgs/MemoryMap.cpp b/Machines/Apple/AppleIIgs/MemoryMap.cpp index 04a33caaa..0e3444eb8 100644 --- a/Machines/Apple/AppleIIgs/MemoryMap.cpp +++ b/Machines/Apple/AppleIIgs/MemoryMap.cpp @@ -208,7 +208,7 @@ void MemoryMap::access(uint16_t address, bool is_read) { if((address & 0xfff0) == 0xc080) language_card_.access(address, is_read); } -void MemoryMap::assert_is_region(uint8_t start, uint8_t end) { +void MemoryMap::assert_is_region([[maybe_unused]] uint8_t start, [[maybe_unused]] uint8_t end) { assert(region_map_[start] == region_map_[start-1]+1); assert(region_map_[end-1] == region_map_[start]); assert(region_map_[end] == region_map_[end-1]+1);