No singletons

src/common/functions.hpp

@@ -84,11 +84,6 @@ T ceil_divide(T dividend, T divisor) {
     return (dividend + divisor - 1) / divisor;
 }
 
-template <typename T>
-T random() {
-    return rand() & all_ones<T>();
-}
-
 inline constexpr u32 make_magic4(const char c0, const char c1, const char c2,
                                  const char c3) {
     return static_cast<u32>(c0) | static_cast<u32>(c1) << 8 |

src/common/macros.hpp

@@ -21,22 +21,6 @@
 #define PASS(...) __VA_ARGS__
 #define PASS_VA_ARGS(...) , ##__VA_ARGS__
 
-#define SINGLETON_DEFINE_GET_INSTANCE(type, logging_class)                     \
-    static type* g_instance = nullptr;                                         \
-    type& type::GetInstance() {                                                \
-        ASSERT_DEBUG(g_instance, logging_class,                                \
-                     #type " hasn't been instantiated");                       \
-        return *g_instance;                                                    \
-    }
-
-#define SINGLETON_SET_INSTANCE(type, logging_class)                            \
-    {                                                                          \
-        ASSERT(!g_instance, logging_class, #type " already exists");           \
-        g_instance = this;                                                     \
-    }
-
-#define SINGLETON_UNSET_INSTANCE() g_instance = nullptr
-
 #define BIT(n) (1u << (n))
 #define BITL(n) (1ul << (n))
 

src/core/CMakeLists.txt

@@ -200,7 +200,6 @@ add_library(hydra-core
     horizon/services/am/global_state_controller.hpp
     horizon/services/am/application_creator.cpp
     horizon/services/am/application_creator.hpp
-    horizon/services/am/library_applet_controller.hpp
     horizon/services/am/library_applet_creator.cpp
     horizon/services/am/library_applet_creator.hpp
     horizon/services/am/library_applet_accessor.cpp
@@ -233,6 +232,7 @@ add_library(hydra-core
     horizon/services/am/storage_accessor.hpp
     horizon/services/am/session.cpp
     horizon/services/am/session.hpp
+    horizon/services/am/internal/library_applet_controller.hpp
     horizon/services/visrv/display_service_base.cpp
     horizon/services/visrv/display_service_base.hpp
     horizon/services/visrv/system_display_service.cpp
@@ -414,6 +414,8 @@ add_library(hydra-core
     horizon/services/ins/receiver_manager.hpp
     horizon/services/irsensor/ir_sensor_server.cpp
     horizon/services/irsensor/ir_sensor_server.hpp
+    horizon/services/irsensor/internal/ir_sensor_manager.cpp
+    horizon/services/irsensor/internal/ir_sensor_manager.hpp
     horizon/services/ro/detail/ro_interface.cpp
     horizon/services/ro/detail/ro_interface.hpp
     horizon/applets/const.hpp
@@ -450,7 +452,6 @@ add_library(hydra-core
     hw/tegra_x1/cpu/mmu.hpp
     hw/tegra_x1/cpu/thread.cpp
     hw/tegra_x1/cpu/thread.hpp
-    hw/tegra_x1/cpu/cpu.cpp
     hw/tegra_x1/cpu/cpu.hpp
     hw/tegra_x1/cpu/dynarmic/const.hpp
     hw/tegra_x1/cpu/dynarmic/memory.hpp
@@ -577,7 +578,7 @@ add_library(hydra-core
     hw/tegra_x1/gpu/renderer/pipeline_cache.hpp
     hw/tegra_x1/gpu/renderer/index_cache.cpp
     hw/tegra_x1/gpu/renderer/index_cache.hpp
-    hw/tegra_x1/gpu/renderer/renderer_base.hpp
+    hw/tegra_x1/gpu/renderer/renderer.hpp
     hw/tegra_x1/gpu/renderer/metal/const.hpp
     hw/tegra_x1/gpu/renderer/metal/maxwell_to_mtl.cpp
     hw/tegra_x1/gpu/renderer/metal/maxwell_to_mtl.hpp
@@ -635,8 +636,8 @@ add_library(hydra-core
     debugger/debugger.hpp
     debugger/debugger_manager.cpp
     debugger/debugger_manager.hpp
-    emulation_context.cpp
-    emulation_context.hpp
+    system.cpp
+    system.hpp
     title.hpp
     c_api.cpp
     c_api.h