Ensure compile-time initialization of static objects in sysmodule

averne · May 22, 2024 · 8fe69b0 · 8fe69b0
1 parent 5c49c21
commit 8fe69b0
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 19 deletions.
diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-export FZ_VERSION =    2.5.0
+export FZ_VERSION =    2.5.1
 export FZ_COMMIT  =    $(shell git rev-parse --short HEAD)
 export FZ_TID     =    0100000000000F12
 

diff --git a/sysmodule/src/context.hpp b/sysmodule/src/context.hpp
@@ -30,15 +30,40 @@ enum FizeauProfileState: std::uint32_t {
     Night,
 };
 
-struct Context {
-    bool is_lite = false;
+constexpr FizeauSettings default_settings = {
+    .temperature = DEFAULT_TEMP,
+    .gamma       = DEFAULT_GAMMA,
+    .saturation  = DEFAULT_SAT,
+    .luminance   = DEFAULT_LUMA,
+    .range       = DEFAULT_RANGE,
+    .filter      = ColorFilter_None,
+};
 
-    bool is_active = false;
+struct Context {
+    bool is_lite = false, is_active = false;
 
     FizeauProfileId internal_profile = FizeauProfileId_Invalid,
         external_profile = FizeauProfileId_Invalid;
 
-    std::array<FizeauProfile,      FizeauProfileId_Total> profiles       = {};
+    std::array<FizeauProfile, FizeauProfileId_Total> profiles = {
+        FizeauProfile{
+            .day_settings   = default_settings,
+            .night_settings = default_settings,
+        },
+        FizeauProfile{
+            .day_settings   = default_settings,
+            .night_settings = default_settings,
+        },
+        FizeauProfile{
+            .day_settings   = default_settings,
+            .night_settings = default_settings,
+        },
+        FizeauProfile{
+            .day_settings   = default_settings,
+            .night_settings = default_settings,
+        },
+    };
+
     std::array<FizeauProfileState, FizeauProfileId_Total> profile_states = {};
 
     DisplayController::Csc saved_internal_csc = {},

diff --git a/sysmodule/src/main.cpp b/sysmodule/src/main.cpp
@@ -118,10 +118,10 @@ extern "C" void __appExit(void) {
 
 } // extern "C"
 
-static fz::Context           context = {};
-static fz::DisplayController disp    = {};
-static fz::ProfileManager    profile(context, disp);
-static fz::Server            server (context, profile);
+static constinit fz::Context           context = {};
+static constinit fz::DisplayController disp    = {};
+static constinit fz::ProfileManager    profile(context, disp);
+static constinit fz::Server            server (context, profile);
 
 void delete_chainloader() {
     auto rc = fsInitialize();

diff --git a/sysmodule/src/profile.hpp b/sysmodule/src/profile.hpp
@@ -31,7 +31,7 @@ constexpr float dimmed_luma_internal = -0.1f, dimmed_luma_external = -0.7f; // O
 
 class ProfileManager {
     public:
-        ProfileManager(Context &context, DisplayController &disp): context(context), disp(disp) { }
+        constexpr ProfileManager(Context &context, DisplayController &disp): context(context), disp(disp) { }
 
         Result initialize();
         Result finalize();
@@ -48,19 +48,19 @@ class ProfileManager {
         DisplayController &disp;
 
         UEvent thread_exit_event = {};
-        Thread transition_thread, event_monitor_thread;
-        std::uint8_t transition_thread_stack[0x2000] alignas(0x1000),
-            event_monitor_thread_stack[0x1000] alignas(0x1000);
+        Thread transition_thread = {}, event_monitor_thread = {};
+        std::uint8_t transition_thread_stack[0x2000] alignas(0x1000) = {},
+            event_monitor_thread_stack[0x1000] alignas(0x1000) = {};
 
-        PscPmModule psc_module;
+        PscPmModule psc_module = {};
         bool mmio_available = true;
         std::uint64_t disp_va_base = 0;
 
-        Event operation_mode_event;
-        AppletOperationMode operation_mode;
+        Event operation_mode_event = {};
+        AppletOperationMode operation_mode = {};
 
-        Event activity_event;
-        std::uint64_t activity_tick;
+        Event activity_event = {};
+        std::uint64_t activity_tick = {};
         bool is_dimming = false;
 
         Mutex commit_mutex = {};

diff --git a/sysmodule/src/server.hpp b/sysmodule/src/server.hpp
@@ -29,7 +29,7 @@ class Server: public IpcServer {
         constexpr static inline int ServiceNumSessions = 2;
 
     public:
-        Server(Context &context, ProfileManager &profile): context(context), profile(profile) { }
+        constexpr Server(Context &context, ProfileManager &profile): IpcServer(), context(context), profile(profile) { }
 
         Result initialize() {
             return ipcServerInit(this, Server::ServiceName.data(), Server::ServiceNumSessions);