From b63ca16ce2de686216f9db5dafe74fcea3997531 Mon Sep 17 00:00:00 2001 From: Thomas Harte Date: Wed, 17 Mar 2021 22:40:29 -0400 Subject: [PATCH] Attempts to hatch a Sinclair namespace. --- Analyser/Static/ZXSpectrum/StaticAnalyser.cpp | 2 +- Machines/{ => Sinclair}/ZX8081/Keyboard.cpp | 0 Machines/{ => Sinclair}/ZX8081/Keyboard.hpp | 0 Machines/{ => Sinclair}/ZX8081/Video.cpp | 0 Machines/{ => Sinclair}/ZX8081/Video.hpp | 0 Machines/{ => Sinclair}/ZX8081/ZX8081.cpp | 30 +++++----- Machines/{ => Sinclair}/ZX8081/ZX8081.hpp | 10 ++-- Machines/Utility/MachineForTarget.cpp | 6 +- .../Clock Signal.xcodeproj/project.pbxproj | 60 +++++++++---------- .../Clock Signal/Machine/Wrappers/CSZX8081.mm | 4 +- OSBindings/Qt/ClockSignal.pro | 5 +- OSBindings/SDL/SConstruct | 3 +- 12 files changed, 61 insertions(+), 59 deletions(-) rename Machines/{ => Sinclair}/ZX8081/Keyboard.cpp (100%) rename Machines/{ => Sinclair}/ZX8081/Keyboard.hpp (100%) rename Machines/{ => Sinclair}/ZX8081/Video.cpp (100%) rename Machines/{ => Sinclair}/ZX8081/Video.hpp (100%) rename Machines/{ => Sinclair}/ZX8081/ZX8081.cpp (95%) rename Machines/{ => Sinclair}/ZX8081/ZX8081.hpp (84%) diff --git a/Analyser/Static/ZXSpectrum/StaticAnalyser.cpp b/Analyser/Static/ZXSpectrum/StaticAnalyser.cpp index 16b772740..82456be58 100644 --- a/Analyser/Static/ZXSpectrum/StaticAnalyser.cpp +++ b/Analyser/Static/ZXSpectrum/StaticAnalyser.cpp @@ -33,7 +33,7 @@ bool IsSpectrumTape(const std::shared_ptr &tape) { Analyser::Static::TargetList Analyser::Static::ZXSpectrum::GetTargets(const Media &media, const std::string &, TargetPlatform::IntType) { TargetList destination; - auto target = std::make_unique(); + auto target = std::make_unique(Machine::ZXSpectrum); target->confidence = 0.5; if(!media.tapes.empty()) { diff --git a/Machines/ZX8081/Keyboard.cpp b/Machines/Sinclair/ZX8081/Keyboard.cpp similarity index 100% rename from Machines/ZX8081/Keyboard.cpp rename to Machines/Sinclair/ZX8081/Keyboard.cpp diff --git a/Machines/ZX8081/Keyboard.hpp b/Machines/Sinclair/ZX8081/Keyboard.hpp similarity index 100% rename from Machines/ZX8081/Keyboard.hpp rename to Machines/Sinclair/ZX8081/Keyboard.hpp diff --git a/Machines/ZX8081/Video.cpp b/Machines/Sinclair/ZX8081/Video.cpp similarity index 100% rename from Machines/ZX8081/Video.cpp rename to Machines/Sinclair/ZX8081/Video.cpp diff --git a/Machines/ZX8081/Video.hpp b/Machines/Sinclair/ZX8081/Video.hpp similarity index 100% rename from Machines/ZX8081/Video.hpp rename to Machines/Sinclair/ZX8081/Video.hpp diff --git a/Machines/ZX8081/ZX8081.cpp b/Machines/Sinclair/ZX8081/ZX8081.cpp similarity index 95% rename from Machines/ZX8081/ZX8081.cpp rename to Machines/Sinclair/ZX8081/ZX8081.cpp index be604d1be..6c3526b3b 100644 --- a/Machines/ZX8081/ZX8081.cpp +++ b/Machines/Sinclair/ZX8081/ZX8081.cpp @@ -8,21 +8,21 @@ #include "ZX8081.hpp" -#include "../MachineTypes.hpp" +#include "../../MachineTypes.hpp" -#include "../../Components/AY38910/AY38910.hpp" -#include "../../Processors/Z80/Z80.hpp" -#include "../../Storage/Tape/Tape.hpp" -#include "../../Storage/Tape/Parsers/ZX8081.hpp" +#include "../../../Components/AY38910/AY38910.hpp" +#include "../../../Processors/Z80/Z80.hpp" +#include "../../../Storage/Tape/Tape.hpp" +#include "../../../Storage/Tape/Parsers/ZX8081.hpp" -#include "../../ClockReceiver/ForceInline.hpp" +#include "../../../ClockReceiver/ForceInline.hpp" -#include "../Utility/MemoryFuzzer.hpp" -#include "../Utility/Typer.hpp" +#include "../../Utility/MemoryFuzzer.hpp" +#include "../../Utility/Typer.hpp" -#include "../../Outputs/Speaker/Implementation/LowpassSpeaker.hpp" +#include "../../../Outputs/Speaker/Implementation/LowpassSpeaker.hpp" -#include "../../Analyser/Static/ZX8081/Target.hpp" +#include "../../../Analyser/Static/ZX8081/Target.hpp" #include "Keyboard.hpp" #include "Video.hpp" @@ -42,6 +42,7 @@ namespace { // 7FFFh.W PSG index // 7FFEh.R/W PSG data +namespace Sinclair{ namespace ZX8081 { enum ROMType: uint8_t { @@ -515,17 +516,18 @@ template class ConcreteMachine: } }; +} } -using namespace ZX8081; +using namespace Sinclair::ZX8081; // See header; constructs and returns an instance of the ZX80 or 81. Machine *Machine::ZX8081(const Analyser::Static::Target *target, const ROMMachine::ROMFetcher &rom_fetcher) { - const Analyser::Static::ZX8081::Target *const zx_target = dynamic_cast(target); + const auto zx_target = dynamic_cast(target); // Instantiate the correct type of machine. - if(zx_target->is_ZX81) return new ZX8081::ConcreteMachine(*zx_target, rom_fetcher); - else return new ZX8081::ConcreteMachine(*zx_target, rom_fetcher); + if(zx_target->is_ZX81) return new ConcreteMachine(*zx_target, rom_fetcher); + else return new ConcreteMachine(*zx_target, rom_fetcher); } Machine::~Machine() {} diff --git a/Machines/ZX8081/ZX8081.hpp b/Machines/Sinclair/ZX8081/ZX8081.hpp similarity index 84% rename from Machines/ZX8081/ZX8081.hpp rename to Machines/Sinclair/ZX8081/ZX8081.hpp index 5fff0ffe8..6a177cfbe 100644 --- a/Machines/ZX8081/ZX8081.hpp +++ b/Machines/Sinclair/ZX8081/ZX8081.hpp @@ -9,13 +9,14 @@ #ifndef ZX8081_hpp #define ZX8081_hpp -#include "../../Configurable/Configurable.hpp" -#include "../../Configurable/StandardOptions.hpp" -#include "../../Analyser/Static/StaticAnalyser.hpp" -#include "../ROMMachine.hpp" +#include "../../../Configurable/Configurable.hpp" +#include "../../../Configurable/StandardOptions.hpp" +#include "../../../Analyser/Static/StaticAnalyser.hpp" +#include "../../ROMMachine.hpp" #include +namespace Sinclair { namespace ZX8081 { /// The ZX80/81 machine. @@ -47,6 +48,7 @@ class Machine { }; }; +} } #endif /* ZX8081_hpp */ diff --git a/Machines/Utility/MachineForTarget.cpp b/Machines/Utility/MachineForTarget.cpp index c0712421b..58f436db3 100644 --- a/Machines/Utility/MachineForTarget.cpp +++ b/Machines/Utility/MachineForTarget.cpp @@ -23,7 +23,7 @@ #include "../MasterSystem/MasterSystem.hpp" #include "../MSX/MSX.hpp" #include "../Oric/Oric.hpp" -#include "../ZX8081/ZX8081.hpp" +#include "../Sinclair/ZX8081/ZX8081.hpp" // Sources for construction options. #include "../../Analyser/Static/Acorn/Target.hpp" @@ -62,7 +62,7 @@ Machine::DynamicMachine *Machine::MachineForTarget(const Analyser::Static::Targe Bind(MSX) Bind(Oric) BindD(Sega::MasterSystem, MasterSystem) - Bind(ZX8081) + BindD(Sinclair::ZX8081, ZX8081) default: error = Machine::Error::UnknownMachine; @@ -200,7 +200,7 @@ std::map> Machine::AllOptionsBy Emplace(MSX, MSX::Machine); Emplace(Oric, Oric::Machine); Emplace(Vic20, Commodore::Vic20::Machine); - Emplace(ZX8081, ZX8081::Machine); + Emplace(ZX8081, Sinclair::ZX8081::Machine); #undef Emplace diff --git a/OSBindings/Mac/Clock Signal.xcodeproj/project.pbxproj b/OSBindings/Mac/Clock Signal.xcodeproj/project.pbxproj index 601686dfa..6a1cb8115 100644 --- a/OSBindings/Mac/Clock Signal.xcodeproj/project.pbxproj +++ b/OSBindings/Mac/Clock Signal.xcodeproj/project.pbxproj @@ -81,9 +81,6 @@ 4B055AD41FAE9B0B0060FFFF /* Oric.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BCF1FA21DADC3DD0039D2E7 /* Oric.cpp */; }; 4B055AD51FAE9B0B0060FFFF /* Video.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B2BFDB01DAEF5FF001A68B8 /* Video.cpp */; }; 4B055AD61FAE9B130060FFFF /* MemoryFuzzer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B2B3A481F9B8FA70062DABF /* MemoryFuzzer.cpp */; }; - 4B055AD71FAE9B180060FFFF /* Keyboard.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B54C0CA1F8D92580050900F /* Keyboard.cpp */; }; - 4B055AD81FAE9B180060FFFF /* Video.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BD3A3091EE755C800B5B501 /* Video.cpp */; }; - 4B055AD91FAE9B180060FFFF /* ZX8081.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B1497901EE4B5A800CE2596 /* ZX8081.cpp */; }; 4B055ADA1FAE9B460060FFFF /* 1770.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BD468F51D8DF41D0084958B /* 1770.cpp */; }; 4B055ADB1FAE9B460060FFFF /* 6560.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BC9DF4D1D04691600F44158 /* 6560.cpp */; }; 4B055ADC1FAE9B460060FFFF /* AY38910.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B4A762E1DB1A3FA007AAE2E /* AY38910.cpp */; }; @@ -135,7 +132,6 @@ 4B1414601B58885000E04248 /* WolfgangLorenzTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B14145F1B58885000E04248 /* WolfgangLorenzTests.swift */; }; 4B1414621B58888700E04248 /* KlausDormannTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B1414611B58888700E04248 /* KlausDormannTests.swift */; }; 4B1497881EE4A1DA00CE2596 /* ZX80O81P.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B1497861EE4A1DA00CE2596 /* ZX80O81P.cpp */; }; - 4B1497921EE4B5A800CE2596 /* ZX8081.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B1497901EE4B5A800CE2596 /* ZX8081.cpp */; }; 4B1497981EE4B97F00CE2596 /* ZX8081Options.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4B1497961EE4B97F00CE2596 /* ZX8081Options.xib */; }; 4B1558C01F844ECD006E9A97 /* BitReverse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B1558BE1F844ECD006E9A97 /* BitReverse.cpp */; }; 4B15A9FC208249BB005E6C8D /* StaticAnalyser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B15A9FA208249BB005E6C8D /* StaticAnalyser.cpp */; }; @@ -237,7 +233,6 @@ 4B54C0C21F8D91CD0050900F /* Keyboard.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B54C0C11F8D91CD0050900F /* Keyboard.cpp */; }; 4B54C0C51F8D91D90050900F /* Keyboard.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B54C0C41F8D91D90050900F /* Keyboard.cpp */; }; 4B54C0C81F8D91E50050900F /* Keyboard.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B54C0C61F8D91E50050900F /* Keyboard.cpp */; }; - 4B54C0CB1F8D92590050900F /* Keyboard.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B54C0CA1F8D92580050900F /* Keyboard.cpp */; }; 4B55CE5F1C3B7D960093A61B /* MachineDocument.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B55CE5E1C3B7D960093A61B /* MachineDocument.swift */; }; 4B55DD8320DF06680043F2E5 /* MachinePicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B55DD8020DF06680043F2E5 /* MachinePicker.swift */; }; 4B55DD8420DF06680043F2E5 /* MachinePicker.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4B55DD8120DF06680043F2E5 /* MachinePicker.xib */; }; @@ -894,7 +889,6 @@ 4BD0FBC3233706A200148981 /* CSApplication.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BD0FBC2233706A200148981 /* CSApplication.m */; }; 4BD191F52191180E0042E144 /* ScanTarget.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BD191F22191180E0042E144 /* ScanTarget.cpp */; }; 4BD388882239E198002D14B5 /* 68000Tests.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4BD388872239E198002D14B5 /* 68000Tests.mm */; }; - 4BD3A30B1EE755C800B5B501 /* Video.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BD3A3091EE755C800B5B501 /* Video.cpp */; }; 4BD424E02193B5340097291A /* TextureTarget.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BD424DD2193B5340097291A /* TextureTarget.cpp */; }; 4BD424E62193B5830097291A /* Shader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BD424E12193B5820097291A /* Shader.cpp */; }; 4BD424E82193B5830097291A /* Rectangle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BD424E22193B5820097291A /* Rectangle.cpp */; }; @@ -1059,6 +1053,12 @@ 4B0E61061FF34737002A9DBD /* MSX.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = MSX.hpp; path = Parsers/MSX.hpp; sourceTree = ""; }; 4B0F1BB02602645900B85C66 /* StaticAnalyser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StaticAnalyser.cpp; sourceTree = ""; }; 4B0F1BB12602645900B85C66 /* StaticAnalyser.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = StaticAnalyser.hpp; sourceTree = ""; }; + 4B0F1BCB2602F17B00B85C66 /* Keyboard.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = Keyboard.hpp; sourceTree = ""; }; + 4B0F1BCC2602F17B00B85C66 /* ZX8081.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = ZX8081.cpp; sourceTree = ""; }; + 4B0F1BCD2602F17B00B85C66 /* Video.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = Video.cpp; sourceTree = ""; }; + 4B0F1BCE2602F17B00B85C66 /* Video.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = Video.hpp; sourceTree = ""; }; + 4B0F1BCF2602F17B00B85C66 /* Keyboard.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = Keyboard.cpp; sourceTree = ""; }; + 4B0F1BD02602F17B00B85C66 /* ZX8081.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = ZX8081.hpp; sourceTree = ""; }; 4B0F94FC208C1A1600FE41D9 /* NIB.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = NIB.cpp; sourceTree = ""; }; 4B0F94FD208C1A1600FE41D9 /* NIB.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = NIB.hpp; sourceTree = ""; }; 4B0F9500208C42A300FE41D9 /* Target.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = Target.hpp; path = AppleII/Target.hpp; sourceTree = ""; }; @@ -1072,8 +1072,6 @@ 4B1497871EE4A1DA00CE2596 /* ZX80O81P.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = ZX80O81P.hpp; sourceTree = ""; }; 4B14978D1EE4B4D200CE2596 /* CSZX8081.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSZX8081.h; sourceTree = ""; }; 4B14978E1EE4B4D200CE2596 /* CSZX8081.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CSZX8081.mm; sourceTree = ""; }; - 4B1497901EE4B5A800CE2596 /* ZX8081.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ZX8081.cpp; path = ZX8081/ZX8081.cpp; sourceTree = ""; }; - 4B1497911EE4B5A800CE2596 /* ZX8081.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = ZX8081.hpp; path = ZX8081/ZX8081.hpp; sourceTree = ""; }; 4B1497971EE4B97F00CE2596 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = "Clock Signal/Base.lproj/ZX8081Options.xib"; sourceTree = SOURCE_ROOT; }; 4B1558BE1F844ECD006E9A97 /* BitReverse.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = BitReverse.cpp; path = Data/BitReverse.cpp; sourceTree = ""; }; 4B1558BF1F844ECD006E9A97 /* BitReverse.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = BitReverse.hpp; path = Data/BitReverse.hpp; sourceTree = ""; }; @@ -1247,8 +1245,6 @@ 4B54C0C41F8D91D90050900F /* Keyboard.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Keyboard.cpp; sourceTree = ""; }; 4B54C0C61F8D91E50050900F /* Keyboard.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Keyboard.cpp; path = Electron/Keyboard.cpp; sourceTree = ""; }; 4B54C0C71F8D91E50050900F /* Keyboard.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Keyboard.hpp; path = Electron/Keyboard.hpp; sourceTree = ""; }; - 4B54C0C91F8D92580050900F /* Keyboard.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Keyboard.hpp; path = ZX8081/Keyboard.hpp; sourceTree = ""; }; - 4B54C0CA1F8D92580050900F /* Keyboard.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Keyboard.cpp; path = ZX8081/Keyboard.cpp; sourceTree = ""; }; 4B55CE5E1C3B7D960093A61B /* MachineDocument.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MachineDocument.swift; sourceTree = ""; }; 4B55DD8020DF06680043F2E5 /* MachinePicker.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MachinePicker.swift; sourceTree = ""; }; 4B55DD8220DF06680043F2E5 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MachinePicker.xib; sourceTree = ""; }; @@ -1898,8 +1894,6 @@ 4BD191F32191180E0042E144 /* ScanTarget.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = ScanTarget.hpp; sourceTree = ""; }; 4BD388411FE34E010042B588 /* 9918Base.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = 9918Base.hpp; path = 9918/Implementation/9918Base.hpp; sourceTree = ""; }; 4BD388872239E198002D14B5 /* 68000Tests.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = 68000Tests.mm; sourceTree = ""; }; - 4BD3A3091EE755C800B5B501 /* Video.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Video.cpp; path = ZX8081/Video.cpp; sourceTree = ""; }; - 4BD3A30A1EE755C800B5B501 /* Video.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Video.hpp; path = ZX8081/Video.hpp; sourceTree = ""; }; 4BD424DD2193B5340097291A /* TextureTarget.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TextureTarget.cpp; sourceTree = ""; }; 4BD424DE2193B5340097291A /* TextureTarget.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = TextureTarget.hpp; sourceTree = ""; }; 4BD424E12193B5820097291A /* Shader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Shader.cpp; sourceTree = ""; }; @@ -2167,6 +2161,27 @@ path = ZXSpectrum; sourceTree = ""; }; + 4B0F1BC92602F17B00B85C66 /* Sinclair */ = { + isa = PBXGroup; + children = ( + 4B0F1BCA2602F17B00B85C66 /* ZX8081 */, + ); + path = Sinclair; + sourceTree = ""; + }; + 4B0F1BCA2602F17B00B85C66 /* ZX8081 */ = { + isa = PBXGroup; + children = ( + 4B0F1BCB2602F17B00B85C66 /* Keyboard.hpp */, + 4B0F1BCC2602F17B00B85C66 /* ZX8081.cpp */, + 4B0F1BCD2602F17B00B85C66 /* Video.cpp */, + 4B0F1BCE2602F17B00B85C66 /* Video.hpp */, + 4B0F1BCF2602F17B00B85C66 /* Keyboard.cpp */, + 4B0F1BD02602F17B00B85C66 /* ZX8081.hpp */, + ); + path = ZX8081; + sourceTree = ""; + }; 4B1414561B58879D00E04248 /* 6502 */ = { isa = PBXGroup; children = ( @@ -2204,19 +2219,6 @@ name = "Test Binaries"; sourceTree = ""; }; - 4B1497931EE4B5AC00CE2596 /* ZX8081 */ = { - isa = PBXGroup; - children = ( - 4B54C0CA1F8D92580050900F /* Keyboard.cpp */, - 4BD3A3091EE755C800B5B501 /* Video.cpp */, - 4B1497901EE4B5A800CE2596 /* ZX8081.cpp */, - 4B54C0C91F8D92580050900F /* Keyboard.hpp */, - 4BD3A30A1EE755C800B5B501 /* Video.hpp */, - 4B1497911EE4B5A800CE2596 /* ZX8081.hpp */, - ); - name = ZX8081; - sourceTree = ""; - }; 4B15A9FE20824C9F005E6C8D /* AppleII */ = { isa = PBXGroup; children = ( @@ -3980,8 +3982,8 @@ 4B7F188B2154825D00388727 /* MasterSystem */, 4B79A4FC1FC8FF9800EEDAD5 /* MSX */, 4BCF1FA51DADC3E10039D2E7 /* Oric */, + 4B0F1BC92602F17B00B85C66 /* Sinclair */, 4B2B3A461F9B8FA70062DABF /* Utility */, - 4B1497931EE4B5AC00CE2596 /* ZX8081 */, ); name = Machines; path = ../../Machines; @@ -5069,7 +5071,6 @@ 4BBB70A9202014E2002FE009 /* MultiProducer.cpp in Sources */, 4B2E86BF25D74F160024F1E9 /* Mouse.cpp in Sources */, 4B6ED2F1208E2F8A0047B343 /* WOZ.cpp in Sources */, - 4B055AD81FAE9B180060FFFF /* Video.cpp in Sources */, 4B5D5C9825F56FC7001B4623 /* Spectrum.cpp in Sources */, 4B2E86D025D8D8C70024F1E9 /* Keyboard.cpp in Sources */, 4B89452F201967B4007DE474 /* StaticAnalyser.cpp in Sources */, @@ -5086,7 +5087,6 @@ 4B055ADA1FAE9B460060FFFF /* 1770.cpp in Sources */, 4B80CD77256CA16600176FCC /* 2MG.cpp in Sources */, 4B055ADC1FAE9B460060FFFF /* AY38910.cpp in Sources */, - 4B055AD71FAE9B180060FFFF /* Keyboard.cpp in Sources */, 4BD67DCC209BE4D700AB2146 /* StaticAnalyser.cpp in Sources */, 4B055AB61FAE860F0060FFFF /* TapeUEF.cpp in Sources */, 4B055A9D1FAE85DA0060FFFF /* D64.cpp in Sources */, @@ -5240,7 +5240,6 @@ 4B89452D201967B4007DE474 /* Tape.cpp in Sources */, 4B055AD61FAE9B130060FFFF /* MemoryFuzzer.cpp in Sources */, 4B055AC21FAE9AE30060FFFF /* KeyboardMachine.cpp in Sources */, - 4B055AD91FAE9B180060FFFF /* ZX8081.cpp in Sources */, 4B89453B201967B4007DE474 /* StaticAnalyser.cpp in Sources */, 4B055AEB1FAE9BA20060FFFF /* PartialMachineCycle.cpp in Sources */, ); @@ -5287,7 +5286,6 @@ 4BB4BFB922A4372F0069048D /* StaticAnalyser.cpp in Sources */, 4B9BE400203A0C0600FFAE60 /* MultiSpeaker.cpp in Sources */, 4B894538201967B4007DE474 /* Tape.cpp in Sources */, - 4B54C0CB1F8D92590050900F /* Keyboard.cpp in Sources */, 4BEDA43025B3C700000C2DBD /* Executor.cpp in Sources */, 4B1B58F6246CC4E8009C171E /* State.cpp in Sources */, 4BEA525E1DF33323007E74F2 /* Tape.cpp in Sources */, @@ -5297,7 +5295,6 @@ 4BEDA40C25B2844B000C2DBD /* Decoder.cpp in Sources */, 4B89453C201967B4007DE474 /* StaticAnalyser.cpp in Sources */, 4B595FAD2086DFBA0083CAA8 /* AudioToggle.cpp in Sources */, - 4B1497921EE4B5A800CE2596 /* ZX8081.cpp in Sources */, 4B2E86BE25D74F160024F1E9 /* Mouse.cpp in Sources */, 4B643F3F1D77B88000D431D6 /* DocumentController.swift in Sources */, 4BDA00E422E663B900AC3CD0 /* NSData+CRC32.m in Sources */, @@ -5388,7 +5385,6 @@ 4BD468F71D8DF41D0084958B /* 1770.cpp in Sources */, 4B7F1897215486A200388727 /* StaticAnalyser.cpp in Sources */, 4B47F6C5241C87A100ED06F7 /* Struct.cpp in Sources */, - 4BD3A30B1EE755C800B5B501 /* Video.cpp in Sources */, 4B5FADBA1DE3151600AEC565 /* FileHolder.cpp in Sources */, 4B643F3A1D77AD1900D431D6 /* CSStaticAnalyser.mm in Sources */, 4B622AE5222E0AD5008B59F2 /* DisplayMetrics.cpp in Sources */, diff --git a/OSBindings/Mac/Clock Signal/Machine/Wrappers/CSZX8081.mm b/OSBindings/Mac/Clock Signal/Machine/Wrappers/CSZX8081.mm index 80b8fb822..cba3ec1fa 100644 --- a/OSBindings/Mac/Clock Signal/Machine/Wrappers/CSZX8081.mm +++ b/OSBindings/Mac/Clock Signal/Machine/Wrappers/CSZX8081.mm @@ -11,14 +11,14 @@ #include "ZX8081.hpp" @implementation CSZX8081 { - ZX8081::Machine *_zx8081; + Sinclair::ZX8081::Machine *_zx8081; __weak CSMachine *_machine; } - (instancetype)initWithZX8081:(void *)zx8081 owner:(CSMachine *)machine { self = [super init]; if(self) { - _zx8081 = (ZX8081::Machine *)zx8081; + _zx8081 = (Sinclair::ZX8081::Machine *)zx8081; _machine = machine; } return self; diff --git a/OSBindings/Qt/ClockSignal.pro b/OSBindings/Qt/ClockSignal.pro index 07f407684..b4901282e 100644 --- a/OSBindings/Qt/ClockSignal.pro +++ b/OSBindings/Qt/ClockSignal.pro @@ -45,6 +45,7 @@ SOURCES += \ $$SRC/Analyser/Static/Oric/*.cpp \ $$SRC/Analyser/Static/Sega/*.cpp \ $$SRC/Analyser/Static/ZX8081/*.cpp \ + $$SRC/Analyser/Static/ZXSpectrum/*.cpp \ \ $$SRC/Components/1770/*.cpp \ $$SRC/Components/5380/*.cpp \ @@ -88,7 +89,7 @@ SOURCES += \ $$SRC/Machines/MSX/*.cpp \ $$SRC/Machines/Oric/*.cpp \ $$SRC/Machines/Utility/*.cpp \ - $$SRC/Machines/ZX8081/*.cpp \ + $$SRC/Machines/Sinclair/ZX8081/*.cpp \ \ $$SRC/Outputs/*.cpp \ $$SRC/Outputs/CRT/*.cpp \ @@ -213,7 +214,7 @@ HEADERS += \ $$SRC/Machines/MSX/*.hpp \ $$SRC/Machines/Oric/*.hpp \ $$SRC/Machines/Utility/*.hpp \ - $$SRC/Machines/ZX8081/*.hpp \ + $$SRC/Machines/Sinclair/ZX8081/*.hpp \ \ $$SRC/Numeric/*.hpp \ \ diff --git a/OSBindings/SDL/SConstruct b/OSBindings/SDL/SConstruct index a9cb456b1..f05458c17 100644 --- a/OSBindings/SDL/SConstruct +++ b/OSBindings/SDL/SConstruct @@ -36,6 +36,7 @@ SOURCES += glob.glob('../../Analyser/Static/MSX/*.cpp') SOURCES += glob.glob('../../Analyser/Static/Oric/*.cpp') SOURCES += glob.glob('../../Analyser/Static/Sega/*.cpp') SOURCES += glob.glob('../../Analyser/Static/ZX8081/*.cpp') +SOURCES += glob.glob('../../Analyser/Static/ZXSpectrum/*.cpp') SOURCES += glob.glob('../../Components/1770/*.cpp') SOURCES += glob.glob('../../Components/5380/*.cpp') @@ -82,7 +83,7 @@ SOURCES += glob.glob('../../Machines/MasterSystem/*.cpp') SOURCES += glob.glob('../../Machines/MSX/*.cpp') SOURCES += glob.glob('../../Machines/Oric/*.cpp') SOURCES += glob.glob('../../Machines/Utility/*.cpp') -SOURCES += glob.glob('../../Machines/ZX8081/*.cpp') +SOURCES += glob.glob('../../Machines/Sinclair/ZX8081/*.cpp') SOURCES += glob.glob('../../Outputs/*.cpp') SOURCES += glob.glob('../../Outputs/CRT/*.cpp')