From 9ad4025138d5fa130dd0a3b34aa4e0f594f2a4f9 Mon Sep 17 00:00:00 2001 From: Thomas Harte Date: Sat, 21 Oct 2017 10:30:02 -0400 Subject: [PATCH] Relocates things that were in Machines/ for machine usage. Leaving only those things intended to be visible interface. --- Machines/AmstradCPC/AmstradCPC.cpp | 4 +-- Machines/AmstradCPC/CharacterMapper.hpp | 2 +- Machines/Commodore/Vic-20/Keyboard.hpp | 2 +- Machines/Electron/CharacterMapper.hpp | 2 +- Machines/Electron/Electron.cpp | 2 +- Machines/Oric/CharacterMapper.hpp | 2 +- Machines/Oric/Oric.cpp | 4 +-- Machines/{ => Utility}/MemoryFuzzer.cpp | 0 Machines/{ => Utility}/MemoryFuzzer.hpp | 0 Machines/{ => Utility}/Typer.cpp | 0 Machines/{ => Utility}/Typer.hpp | 4 +-- Machines/ZX8081/CharacterMapper.hpp | 2 +- Machines/ZX8081/ZX8081.cpp | 4 +-- .../Clock Signal.xcodeproj/project.pbxproj | 32 ++++++++++++------- 14 files changed, 34 insertions(+), 26 deletions(-) rename Machines/{ => Utility}/MemoryFuzzer.cpp (100%) rename Machines/{ => Utility}/MemoryFuzzer.hpp (100%) rename Machines/{ => Utility}/Typer.cpp (100%) rename Machines/{ => Utility}/Typer.hpp (97%) diff --git a/Machines/AmstradCPC/AmstradCPC.cpp b/Machines/AmstradCPC/AmstradCPC.cpp index 5d4052f8d..596c9c439 100644 --- a/Machines/AmstradCPC/AmstradCPC.cpp +++ b/Machines/AmstradCPC/AmstradCPC.cpp @@ -18,8 +18,8 @@ #include "../../Components/8272/i8272.hpp" #include "../../Components/AY38910/AY38910.hpp" -#include "../MemoryFuzzer.hpp" -#include "../Typer.hpp" +#include "../Utility/MemoryFuzzer.hpp" +#include "../Utility/Typer.hpp" #include "../../Storage/Tape/Tape.hpp" diff --git a/Machines/AmstradCPC/CharacterMapper.hpp b/Machines/AmstradCPC/CharacterMapper.hpp index 89f985ae2..3a7e418e3 100644 --- a/Machines/AmstradCPC/CharacterMapper.hpp +++ b/Machines/AmstradCPC/CharacterMapper.hpp @@ -9,7 +9,7 @@ #ifndef Machines_AmstradCPC_CharacterMapper_hpp #define Machines_AmstradCPC_CharacterMapper_hpp -#include "../Typer.hpp" +#include "../Utility/Typer.hpp" namespace AmstradCPC { diff --git a/Machines/Commodore/Vic-20/Keyboard.hpp b/Machines/Commodore/Vic-20/Keyboard.hpp index b9c3c0c29..0db843f30 100644 --- a/Machines/Commodore/Vic-20/Keyboard.hpp +++ b/Machines/Commodore/Vic-20/Keyboard.hpp @@ -10,7 +10,7 @@ #define Machines_Commodore_Vic20_Keyboard_hpp #include "../../KeyboardMachine.hpp" -#include "../../Typer.hpp" +#include "../../Utility/Typer.hpp" namespace Commodore { namespace Vic20 { diff --git a/Machines/Electron/CharacterMapper.hpp b/Machines/Electron/CharacterMapper.hpp index 2bb157736..d74a43ce6 100644 --- a/Machines/Electron/CharacterMapper.hpp +++ b/Machines/Electron/CharacterMapper.hpp @@ -9,7 +9,7 @@ #ifndef Machines_Electron_CharacterMapper_hpp #define Machines_Electron_CharacterMapper_hpp -#include "../Typer.hpp" +#include "../Utility/Typer.hpp" namespace Electron { diff --git a/Machines/Electron/Electron.cpp b/Machines/Electron/Electron.cpp index 2ca236611..5b8055edb 100644 --- a/Machines/Electron/Electron.cpp +++ b/Machines/Electron/Electron.cpp @@ -13,7 +13,7 @@ #include "../../ClockReceiver/ClockReceiver.hpp" #include "../../ClockReceiver/ForceInline.hpp" -#include "../Typer.hpp" +#include "../Utility/Typer.hpp" #include "CharacterMapper.hpp" #include "Interrupts.hpp" diff --git a/Machines/Oric/CharacterMapper.hpp b/Machines/Oric/CharacterMapper.hpp index 95d9f34aa..ca6a0641e 100644 --- a/Machines/Oric/CharacterMapper.hpp +++ b/Machines/Oric/CharacterMapper.hpp @@ -9,7 +9,7 @@ #ifndef Machines_Oric_CharacterMapper_hpp #define Machines_Oric_CharacterMapper_hpp -#include "../Typer.hpp" +#include "../Utility/Typer.hpp" namespace Oric { diff --git a/Machines/Oric/Oric.cpp b/Machines/Oric/Oric.cpp index 9f6f717f9..1c5ae8697 100644 --- a/Machines/Oric/Oric.cpp +++ b/Machines/Oric/Oric.cpp @@ -13,8 +13,8 @@ #include "Microdisc.hpp" #include "Video.hpp" -#include "../MemoryFuzzer.hpp" -#include "../Typer.hpp" +#include "../Utility/MemoryFuzzer.hpp" +#include "../Utility/Typer.hpp" #include "../../Processors/6502/6502.hpp" #include "../../Components/6522/6522.hpp" diff --git a/Machines/MemoryFuzzer.cpp b/Machines/Utility/MemoryFuzzer.cpp similarity index 100% rename from Machines/MemoryFuzzer.cpp rename to Machines/Utility/MemoryFuzzer.cpp diff --git a/Machines/MemoryFuzzer.hpp b/Machines/Utility/MemoryFuzzer.hpp similarity index 100% rename from Machines/MemoryFuzzer.hpp rename to Machines/Utility/MemoryFuzzer.hpp diff --git a/Machines/Typer.cpp b/Machines/Utility/Typer.cpp similarity index 100% rename from Machines/Typer.cpp rename to Machines/Utility/Typer.cpp diff --git a/Machines/Typer.hpp b/Machines/Utility/Typer.hpp similarity index 97% rename from Machines/Typer.hpp rename to Machines/Utility/Typer.hpp index 2c165a489..39570d0e4 100644 --- a/Machines/Typer.hpp +++ b/Machines/Utility/Typer.hpp @@ -10,8 +10,8 @@ #define Typer_hpp #include -#include "KeyboardMachine.hpp" -#include "../ClockReceiver/ClockReceiver.hpp" +#include "../KeyboardMachine.hpp" +#include "../../ClockReceiver/ClockReceiver.hpp" namespace Utility { diff --git a/Machines/ZX8081/CharacterMapper.hpp b/Machines/ZX8081/CharacterMapper.hpp index b78b66dfd..010b7a08d 100644 --- a/Machines/ZX8081/CharacterMapper.hpp +++ b/Machines/ZX8081/CharacterMapper.hpp @@ -9,7 +9,7 @@ #ifndef Machines_ZX8081_CharacterMapper_hpp #define Machines_ZX8081_CharacterMapper_hpp -#include "../Typer.hpp" +#include "../Utility/Typer.hpp" namespace ZX8081 { diff --git a/Machines/ZX8081/ZX8081.cpp b/Machines/ZX8081/ZX8081.cpp index 94a435b53..43f7d0ce1 100644 --- a/Machines/ZX8081/ZX8081.cpp +++ b/Machines/ZX8081/ZX8081.cpp @@ -14,8 +14,8 @@ #include "../../ClockReceiver/ForceInline.hpp" -#include "../MemoryFuzzer.hpp" -#include "../Typer.hpp" +#include "../Utility/MemoryFuzzer.hpp" +#include "../Utility/Typer.hpp" #include "CharacterMapper.hpp" #include "KeyboardMapper.hpp" diff --git a/OSBindings/Mac/Clock Signal.xcodeproj/project.pbxproj b/OSBindings/Mac/Clock Signal.xcodeproj/project.pbxproj index ff22b64e9..480495edf 100644 --- a/OSBindings/Mac/Clock Signal.xcodeproj/project.pbxproj +++ b/OSBindings/Mac/Clock Signal.xcodeproj/project.pbxproj @@ -23,10 +23,8 @@ 4B1497981EE4B97F00CE2596 /* ZX8081Options.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4B1497961EE4B97F00CE2596 /* ZX8081Options.xib */; }; 4B1558C01F844ECD006E9A97 /* BitReverse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B1558BE1F844ECD006E9A97 /* BitReverse.cpp */; }; 4B1D08061E0F7A1100763741 /* TimeTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4B1D08051E0F7A1100763741 /* TimeTests.mm */; }; - 4B1E85751D170228001EF87D /* Typer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B1E85731D170228001EF87D /* Typer.cpp */; }; 4B1E85811D176468001EF87D /* 6532Tests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B1E85801D176468001EF87D /* 6532Tests.swift */; }; 4B1EDB451E39A0AC009D6819 /* chip.png in Resources */ = {isa = PBXBuildFile; fileRef = 4B1EDB431E39A0AC009D6819 /* chip.png */; }; - 4B2A332A1DB8544D002876E3 /* MemoryFuzzer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B2A33281DB8544D002876E3 /* MemoryFuzzer.cpp */; }; 4B2A332D1DB86821002876E3 /* OricOptions.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4B2A332B1DB86821002876E3 /* OricOptions.xib */; }; 4B2A332F1DB86869002876E3 /* OricOptionsPanel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B2A332E1DB86869002876E3 /* OricOptionsPanel.swift */; }; 4B2A539F1D117D36003C6002 /* CSAudioQueue.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B2A53911D117D36003C6002 /* CSAudioQueue.m */; }; @@ -35,6 +33,8 @@ 4B2A53A21D117D36003C6002 /* CSElectron.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4B2A539C1D117D36003C6002 /* CSElectron.mm */; }; 4B2A53A31D117D36003C6002 /* CSVic20.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4B2A539E1D117D36003C6002 /* CSVic20.mm */; }; 4B2AF8691E513FC20027EE29 /* TIATests.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4B2AF8681E513FC20027EE29 /* TIATests.mm */; }; + 4B2B3A4B1F9B8FA70062DABF /* Typer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B2B3A471F9B8FA70062DABF /* Typer.cpp */; }; + 4B2B3A4C1F9B8FA70062DABF /* MemoryFuzzer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B2B3A481F9B8FA70062DABF /* MemoryFuzzer.cpp */; }; 4B2BFC5F1D613E0200BA3AA9 /* TapePRG.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B2BFC5D1D613E0200BA3AA9 /* TapePRG.cpp */; }; 4B2BFDB21DAEF5FF001A68B8 /* Video.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B2BFDB01DAEF5FF001A68B8 /* Video.cpp */; }; 4B2C45421E3C3896002A2389 /* cartridge.png in Resources */ = {isa = PBXBuildFile; fileRef = 4B2C45411E3C3896002A2389 /* cartridge.png */; }; @@ -513,15 +513,11 @@ 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 = ""; }; 4B1D08051E0F7A1100763741 /* TimeTests.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = TimeTests.mm; sourceTree = ""; }; - 4B1E85731D170228001EF87D /* Typer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Typer.cpp; sourceTree = ""; }; - 4B1E85741D170228001EF87D /* Typer.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = Typer.hpp; sourceTree = ""; }; 4B1E857B1D174DEC001EF87D /* 6532.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = 6532.hpp; sourceTree = ""; }; 4B1E85801D176468001EF87D /* 6532Tests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = 6532Tests.swift; sourceTree = ""; }; 4B1EDB431E39A0AC009D6819 /* chip.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = chip.png; sourceTree = ""; }; 4B2409541C45AB05004DA684 /* Speaker.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Speaker.hpp; path = ../../Outputs/Speaker.hpp; sourceTree = ""; }; 4B24095A1C45DF85004DA684 /* Stepper.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = Stepper.hpp; sourceTree = ""; }; - 4B2A33281DB8544D002876E3 /* MemoryFuzzer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MemoryFuzzer.cpp; sourceTree = ""; }; - 4B2A33291DB8544D002876E3 /* MemoryFuzzer.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = MemoryFuzzer.hpp; sourceTree = ""; }; 4B2A332C1DB86821002876E3 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = "Clock Signal/Base.lproj/OricOptions.xib"; sourceTree = SOURCE_ROOT; }; 4B2A332E1DB86869002876E3 /* OricOptionsPanel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OricOptionsPanel.swift; sourceTree = ""; }; 4B2A53901D117D36003C6002 /* CSAudioQueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSAudioQueue.h; sourceTree = ""; }; @@ -537,6 +533,10 @@ 4B2A539D1D117D36003C6002 /* CSVic20.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSVic20.h; sourceTree = ""; }; 4B2A539E1D117D36003C6002 /* CSVic20.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CSVic20.mm; sourceTree = ""; }; 4B2AF8681E513FC20027EE29 /* TIATests.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = TIATests.mm; sourceTree = ""; }; + 4B2B3A471F9B8FA70062DABF /* Typer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Typer.cpp; sourceTree = ""; }; + 4B2B3A481F9B8FA70062DABF /* MemoryFuzzer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MemoryFuzzer.cpp; sourceTree = ""; }; + 4B2B3A491F9B8FA70062DABF /* MemoryFuzzer.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = MemoryFuzzer.hpp; sourceTree = ""; }; + 4B2B3A4A1F9B8FA70062DABF /* Typer.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = Typer.hpp; sourceTree = ""; }; 4B2BFC5D1D613E0200BA3AA9 /* TapePRG.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TapePRG.cpp; sourceTree = ""; }; 4B2BFC5E1D613E0200BA3AA9 /* TapePRG.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = TapePRG.hpp; sourceTree = ""; }; 4B2BFDB01DAEF5FF001A68B8 /* Video.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Video.cpp; path = Oric/Video.cpp; sourceTree = ""; }; @@ -1311,6 +1311,17 @@ path = Wrappers; sourceTree = ""; }; + 4B2B3A461F9B8FA70062DABF /* Utility */ = { + isa = PBXGroup; + children = ( + 4B2B3A471F9B8FA70062DABF /* Typer.cpp */, + 4B2B3A481F9B8FA70062DABF /* MemoryFuzzer.cpp */, + 4B2B3A491F9B8FA70062DABF /* MemoryFuzzer.hpp */, + 4B2B3A4A1F9B8FA70062DABF /* Typer.hpp */, + ); + path = Utility; + sourceTree = ""; + }; 4B2E2D961C3A06EC00138695 /* Atari2600 */ = { isa = PBXGroup; children = ( @@ -2193,19 +2204,16 @@ isa = PBXGroup; children = ( 4B54C0BB1F8D8E790050900F /* KeyboardMachine.cpp */, - 4B2A33281DB8544D002876E3 /* MemoryFuzzer.cpp */, - 4B1E85731D170228001EF87D /* Typer.cpp */, 4BA9C3CF1D8164A9002DDB61 /* ConfigurationTarget.hpp */, 4B046DC31CFE651500E9E45E /* CRTMachine.hpp */, 4B7041271F92C26900735E45 /* JoystickMachine.hpp */, 4B8E4ECD1DCE483D003716C3 /* KeyboardMachine.hpp */, - 4B2A33291DB8544D002876E3 /* MemoryFuzzer.hpp */, - 4B1E85741D170228001EF87D /* Typer.hpp */, 4B38F3491F2EC12000D9235D /* AmstradCPC */, 4B2E2D961C3A06EC00138695 /* Atari2600 */, 4B4DC81D1D2C2425003C5BF8 /* Commodore */, 4B2E2D9E1C3A070900138695 /* Electron */, 4BCF1FA51DADC3E10039D2E7 /* Oric */, + 4B2B3A461F9B8FA70062DABF /* Utility */, 4B1497931EE4B5AC00CE2596 /* ZX8081 */, ); name = Machines; @@ -2973,10 +2981,10 @@ 4BBF99181C8FBA6F0075DAFB /* TextureTarget.cpp in Sources */, 4BC76E691C98E31700E6EF73 /* FIRFilter.cpp in Sources */, 4B3BF5B01F146265005B6C36 /* CSW.cpp in Sources */, - 4B2A332A1DB8544D002876E3 /* MemoryFuzzer.cpp in Sources */, 4B4518A51F75FD1C00926311 /* SSD.cpp in Sources */, 4B55CE5F1C3B7D960093A61B /* MachineDocument.swift in Sources */, 4B2A332F1DB86869002876E3 /* OricOptionsPanel.swift in Sources */, + 4B2B3A4C1F9B8FA70062DABF /* MemoryFuzzer.cpp in Sources */, 4B7913CC1DFCD80E00175A82 /* Video.cpp in Sources */, 4B4518831F75E91A00926311 /* PCMTrack.cpp in Sources */, 4B45189F1F75FD1C00926311 /* AcornADF.cpp in Sources */, @@ -3007,9 +3015,9 @@ 4B643F3A1D77AD1900D431D6 /* CSStaticAnalyser.mm in Sources */, 4B1497881EE4A1DA00CE2596 /* ZX80O81P.cpp in Sources */, 4B5A12571DD55862007A2231 /* Disassembler6502.cpp in Sources */, + 4B2B3A4B1F9B8FA70062DABF /* Typer.cpp in Sources */, 4B4518821F75E91A00926311 /* PCMSegment.cpp in Sources */, 4BE7C9181E3D397100A5496D /* TIA.cpp in Sources */, - 4B1E85751D170228001EF87D /* Typer.cpp in Sources */, 4B80AD001F85CACA00176895 /* BestEffortUpdater.cpp in Sources */, 4B2E2D9D1C3A070400138695 /* Electron.cpp in Sources */, 4B3940E71DA83C8300427841 /* AsyncTaskQueue.cpp in Sources */,