Merge origin/master into performance_improvements: resolve conflicts, keep header-only core, align tests and CMake, remove legacy src/z80.cpp

Author: doraemoncito

include/z80_bus_interface.h

@@ -1,29 +1,15 @@
-#ifndef Z80_BUS_INTERFACE_HPP
-#define Z80_BUS_INTERFACE_HPP
+#ifndef Z80_BUS_INTERFACE_H
+#define Z80_BUS_INTERFACE_H
 
 #include <cstdint>
 
 #include "z80_types.h"
 
 // CRTP bus interface: TBusInterface must implement the *Impl methods.
 template <typename TBusInterface> class Z80BusInterface {
-  public:
-  private:
-    Z80BusInterface() = default;
-
   public:
     ~Z80BusInterface() = default;
-
-  private:
-    Z80BusInterface(const Z80BusInterface&) = default;
-
-  public:
     Z80BusInterface& operator=(const Z80BusInterface&) = default;
-
-  private:
-    Z80BusInterface(Z80BusInterface&&) = default;
-
-  public:
     Z80BusInterface& operator=(Z80BusInterface&&) = default;
 
     /* Read opcode from RAM */
@@ -88,11 +74,15 @@ template <typename TBusInterface> class Z80BusInterface {
 #endif
 
   private:
+    Z80BusInterface() = default;
+    Z80BusInterface(const Z80BusInterface&) = default;
+    Z80BusInterface(Z80BusInterface&&) = default;
+
     TBusInterface& derived() {
         return static_cast<TBusInterface&>(*this);
     }
 
     friend TBusInterface;
 };
 
-#endif // Z80_BUS_INTERFACE_HPP
+#endif // Z80_BUS_INTERFACE_H

include/z80_types.h

@@ -1,5 +1,5 @@
-#ifndef Z80_TYPES_HPP
-#define Z80_TYPES_HPP
+#ifndef Z80_TYPES_H
+#define Z80_TYPES_H
 
 #include <cstdint>
 
@@ -47,4 +47,4 @@ using RegisterPair = union {
     uint16_t word;
 };
 
-#endif // Z80_TYPES_HPP
+#endif // Z80_TYPES_H

tests/z80_sim_test.h

@@ -1,5 +1,5 @@
-#ifndef Z80_SIM_TEST_HPP
-#define Z80_SIM_TEST_HPP
+#ifndef Z80_SIM_TEST_H
+#define Z80_SIM_TEST_H
 
 #include <array>
 #include <chrono>
@@ -58,4 +58,4 @@ class Z80SimTest : public Z80BusInterface<Z80SimTest> {
     void runTest(std::ifstream* fileStream);
 };
 
-#endif // Z80_SIM_TEST_HPP
+#endif // Z80_SIM_TEST_H