Removed Aliases.h

dirkwhoffmann · Jun 4, 2024 · 15d6d02 · 15d6d02
1 parent cc5eafa
commit 15d6d02
Show file tree

Hide file tree

Showing 63 changed files with 141 additions and 120 deletions.
diff --git a/Emulator/Base/Aliases.h b/Emulator/Base/Aliases.h
diff --git a/Emulator/Base/CmdQueueTypes.h b/Emulator/Base/CmdQueueTypes.h
@@ -13,7 +13,6 @@
 
 #pragma once
 
-#include "Aliases.h"
 #include "JoystickTypes.h"
 #include "Reflection.h"
 #include "Option.h"

diff --git a/Emulator/Base/Colors.h b/Emulator/Base/Colors.h
@@ -12,7 +12,7 @@
 
 #pragma once
 
-#include "Aliases.h"
+#include "Types.h"
 
 namespace vc64 {
 

diff --git a/Emulator/Base/Constants.h b/Emulator/Base/Constants.h
@@ -13,7 +13,7 @@
 ///
 #pragma once
 
-#include "Aliases.h"
+#include "Types.h"
 
 /** VirtualC64 project namespace
  */

diff --git a/Emulator/Base/Error.cpp b/Emulator/Base/Error.cpp
@@ -12,6 +12,7 @@
 
 #include "config.h"
 #include "Error.h"
+#include "Macros.h"
 
 namespace vc64 {
 

diff --git a/Emulator/Base/ErrorTypes.h b/Emulator/Base/ErrorTypes.h
@@ -13,7 +13,6 @@
 
 #pragma once
 
-#include "Aliases.h"
 #include "Reflection.h"
 
 namespace vc64 {

diff --git a/Emulator/Base/MsgQueueTypes.h b/Emulator/Base/MsgQueueTypes.h
@@ -13,7 +13,6 @@
 
 #pragma once
 
-#include "Aliases.h"
 #include "Reflection.h"
 
 namespace vc64 {

diff --git a/Emulator/Base/OptionTypes.h b/Emulator/Base/OptionTypes.h
@@ -13,7 +13,6 @@
 
 #pragma once
 
-#include "Aliases.h"
 #include "Reflection.h"
 
 namespace vc64 {

diff --git a/Emulator/Base/ThreadTypes.h b/Emulator/Base/ThreadTypes.h
@@ -13,7 +13,6 @@
 
 #pragma once
 
-#include "Aliases.h"
 #include "Reflection.h"
 
 namespace vc64 {

diff --git a/Emulator/CMakeLists.txt b/Emulator/CMakeLists.txt
@@ -46,7 +46,6 @@ target_include_directories(vc64Core PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 
 # Add sub directories
 add_subdirectory(Base)
-add_subdirectory(Cartridges)
 add_subdirectory(Components)
 add_subdirectory(FileSystems)
 add_subdirectory(Media)

diff --git a/Emulator/Components/C64.cpp b/Emulator/Components/C64.cpp
@@ -1230,7 +1230,7 @@ C64::scheduleNextSNPEvent()
     auto delay = emulator.get(OPT_EMU_SNAPSHOT_DELAY);
 
     if (snapshots) {
-        scheduleRel<SLOT_SNP>(SEC(double(delay)), SNP_TAKE);
+        scheduleRel<SLOT_SNP>(C64::sec(double(delay)), SNP_TAKE);
     } else {
         cancel<SLOT_SNP>();
     }

diff --git a/Emulator/Components/C64.h b/Emulator/Components/C64.h
@@ -275,6 +275,18 @@ class C64 final : public CoreComponent, public Inspectable<C64Info> {
     void initialize();
 
 
+    //
+    // Static methods
+    //
+
+public:
+
+    // Converts a time span to an (approximate) cycle count
+    static Cycle usec(isize delay) { return Cycle(delay * 1LL); }
+    static Cycle msec(isize delay) { return Cycle(delay * 1000LL); }
+    static Cycle sec(double delay) { return (Cycle)(delay * 1000000LL); }
+
+
     //
     // Methods from CoreComponent
     //

diff --git a/Emulator/Components/C64Types.h b/Emulator/Components/C64Types.h
@@ -13,11 +13,17 @@
 
 #pragma once
 
-#include "Aliases.h"
 #include "Reflection.h"
 
 namespace vc64 {
 
+//
+// Type aliases
+//
+
+typedef i64 Cycle;
+
+
 //
 // Enumerations
 //

diff --git a/Emulator/Components/CIA/CIATypes.h b/Emulator/Components/CIA/CIATypes.h
@@ -13,8 +13,8 @@
 
 #pragma once
 
-#include "Aliases.h"
 #include "Reflection.h"
+#include "C64Types.h"
 #include "TODTypes.h"
 
 namespace vc64 {

diff --git a/Emulator/Components/CIA/TODTypes.h b/Emulator/Components/CIA/TODTypes.h
@@ -12,7 +12,7 @@
 
 #pragma once
 
-#include "Aliases.h"
+#include "Types.h"
 
 //
 // Structures

diff --git a/Emulator/Components/CPU/CPUTypes.h b/Emulator/Components/CPU/CPUTypes.h
@@ -12,7 +12,6 @@
 
 #pragma once
 
-#include "Aliases.h"
 #include "Reflection.h"
 #include "PeddleTypes.h"
 

diff --git a/Emulator/Components/Emulator.cpp b/Emulator/Components/Emulator.cpp
@@ -670,7 +670,7 @@ Emulator::update()
 bool
 Emulator::shouldWarp()
 {
-    if (main.cpu.clock < SEC(config.warpBoot)) {
+    if (main.cpu.clock < C64::sec(config.warpBoot)) {
 
         return true;
 

diff --git a/Emulator/Components/EmulatorTypes.h b/Emulator/Components/EmulatorTypes.h
@@ -13,9 +13,9 @@
 
 #pragma once
 
-#include "Aliases.h"
 #include "Reflection.h"
 #include "ThreadTypes.h"
+#include "C64Types.h"
 
 namespace vc64 {
 

diff --git a/Emulator/Components/Memory/MemoryTypes.h b/Emulator/Components/Memory/MemoryTypes.h
@@ -13,7 +13,6 @@
 
 #pragma once
 
-#include "Aliases.h"
 #include "Reflection.h"
 
 namespace vc64 {

diff --git a/Emulator/Components/Ports/AudioPortTypes.h b/Emulator/Components/Ports/AudioPortTypes.h
@@ -13,7 +13,7 @@
 
 #pragma once
 
-#include "Aliases.h"
+#include "Types.h"
 
 namespace vc64 {
 

diff --git a/Emulator/Components/Ports/ControlPortTypes.h b/Emulator/Components/Ports/ControlPortTypes.h
@@ -13,7 +13,6 @@
 
 #pragma once
 
-#include "Aliases.h"
 #include "Reflection.h"
 
 namespace vc64 {

diff --git a/Emulator/Components/Ports/ExpansionPortTypes.h b/Emulator/Components/Ports/ExpansionPortTypes.h
@@ -13,7 +13,6 @@
 
 #pragma once
 
-#include "Aliases.h"
 #include "Reflection.h"
 
 namespace vc64 {

diff --git a/Emulator/Components/Ports/PowerPortTypes.h b/Emulator/Components/Ports/PowerPortTypes.h
@@ -13,7 +13,6 @@
 
 #pragma once
 
-#include "Aliases.h"
 #include "Reflection.h"
 
 namespace vc64 {

diff --git a/Emulator/Components/Ports/SerialPortTypes.h b/Emulator/Components/Ports/SerialPortTypes.h
@@ -13,7 +13,6 @@
 
 #pragma once
 
-#include "Aliases.h"
 #include "Reflection.h"
 
 namespace vc64 {

diff --git a/Emulator/Components/Ports/VideoPortTypes.h b/Emulator/Components/Ports/VideoPortTypes.h
@@ -13,7 +13,7 @@
 
 #pragma once
 
-#include "Aliases.h"
+#include "Types.h"
 
 namespace vc64 {
 

diff --git a/Emulator/Components/SID/SID.h b/Emulator/Components/SID/SID.h
@@ -13,6 +13,7 @@
 #pragma once
 
 #include "SIDTypes.h"
+#include "C64Types.h"
 #include "ReSID.h"
 
 namespace vc64 {

diff --git a/Emulator/Components/SID/SIDTypes.h b/Emulator/Components/SID/SIDTypes.h
@@ -13,7 +13,6 @@
 
 #pragma once
 
-#include "Aliases.h"
 #include "Reflection.h"
 #include "RingBuffer.h"
 

diff --git a/Emulator/Components/SID/Volume.h b/Emulator/Components/SID/Volume.h
@@ -10,7 +10,6 @@
 // SPDX-License-Identifier: GPL-3.0-or-later OR MPL-2.0
 // -----------------------------------------------------------------------------
 
-#include "Aliases.h"
 #include "Serializable.h"
 
 #pragma once

diff --git a/Emulator/Components/VICII/BusTypes.h b/Emulator/Components/VICII/BusTypes.h
@@ -13,7 +13,6 @@
 
 #pragma once
 
-#include "Aliases.h"
 #include "Reflection.h"
 
 namespace vc64 {

diff --git a/Emulator/Components/VICII/DmaDebuggerTypes.h b/Emulator/Components/VICII/DmaDebuggerTypes.h
@@ -13,7 +13,6 @@
 
 #pragma once
 
-#include "Aliases.h"
 #include "Reflection.h"
 #include "BusTypes.h"
 

diff --git a/Emulator/Components/VICII/VICIITypes.h b/Emulator/Components/VICII/VICIITypes.h
@@ -13,7 +13,6 @@
 
 #pragma once
 
-#include "Aliases.h"
 #include "Reflection.h"
 #include "Serializable.h"
 #include "BusTypes.h"

diff --git a/Emulator/FileSystems/FSDirEntry.h b/Emulator/FileSystems/FSDirEntry.h
@@ -12,7 +12,6 @@
 
 #pragma once
 
-#include "Aliases.h"
 #include "FSTypes.h"
 #include "PETName.h"
 

diff --git a/Emulator/FileSystems/FSTypes.h b/Emulator/FileSystems/FSTypes.h
@@ -13,8 +13,8 @@
 
 #pragma once
 
-#include "Aliases.h"
 #include "Reflection.h"
+#include "DriveTypes.h"
 
 namespace vc64 {
 

diff --git a/Emulator/Media/AnyCollection.cpp b/Emulator/Media/AnyCollection.cpp
@@ -12,6 +12,7 @@
 
 #include "config.h"
 #include "AnyCollection.h"
+#include "Macros.h"
 
 namespace vc64 {
 

diff --git a/Emulator/Media/CMakeLists.txt b/Emulator/Media/CMakeLists.txt
@@ -17,3 +17,5 @@ Folder.cpp
 Script.cpp
 
 )
+
+add_subdirectory(Cartridges)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -17,3 +17,5 @@ Folder.cpp
		Script.cpp

		)

		add_subdirectory(Cartridges)