2026-09-26 06:34:09

Signed-off-by: lizzie <lizzie@eden-emu.dev>

src/core/hle/service/glue/arp.cpp

@@ -167,11 +167,7 @@ public:
         : ServiceFramework{system_, "IRegistrar"}, issue_process_id{std::move(issuer)} {}
 
     FunctionInfoBase const* FindRequest(u32 key) override {
-        return HandlerTableGenerateWithFind(key,
-            FunctionInfo{0, &IRegistrar::Issue, "Issue"},
-            FunctionInfo{1, &IRegistrar::SetApplicationLaunchProperty, "SetApplicationLaunchProperty"},
-            FunctionInfo{2, &IRegistrar::SetApplicationControlProperty, "SetApplicationControlProperty"}
-        );
+        return HandlerTableGenerateWithFind(key, functions);
     }
 
 private:
@@ -236,6 +232,11 @@ private:
         rb.Push(ResultSuccess);
     }
 
+    static constexpr auto functions = CreateStaticMap(
+        FunctionInfo{0, &IRegistrar::Issue, "Issue"},
+        FunctionInfo{1, &IRegistrar::SetApplicationLaunchProperty, "SetApplicationLaunchProperty"},
+        FunctionInfo{2, &IRegistrar::SetApplicationControlProperty, "SetApplicationControlProperty"}
+    );
     IssuerFn issue_process_id;
     bool issued = false;
     ApplicationLaunchProperty launch{};

src/core/hle/service/glue/ectx.cpp

@@ -15,9 +15,7 @@ public:
     IContextRegistrar(Core::System& system_) : ServiceFramework{system_, "IContextRegistrar"} {}
 
     FunctionInfoBase const* FindRequest(u32 key) override {
-        return HandlerTableGenerateWithFind(key,
-            FunctionInfo{0, &IContextRegistrar::Complete, "Complete"}
-        );
+        return HandlerTableGenerateWithFind(key, functions);
     }
 
     ~IContextRegistrar() override = default;
@@ -39,6 +37,10 @@ private:
         rb.Push(ResultSuccess);
         rb.Push(0);
     }
+
+    static constexpr auto functions = CreateStaticMap(
+        FunctionInfo{0, &IContextRegistrar::Complete, "Complete"}
+    );
 };
 
 ECTX_W::ECTX_W(Core::System& system_) : ServiceFramework{system_, "ectx:w"} {

src/core/hle/service/glue/notif.cpp

@@ -184,9 +184,7 @@ public:
     }
 
     FunctionInfoBase const* FindRequest(u32 key) override {
-        return HandlerTableGenerateWithFind(key,
-            FunctionInfo{0, D<&INotificationSystemEventAccessor::GetSystemEvent>, "GetSystemEvent"}
-        );
+        return HandlerTableGenerateWithFind(key, functions);
     }
 
     ~INotificationSystemEventAccessor() {
@@ -201,6 +199,9 @@ private:
         R_SUCCEED();
     }
 
+    static constexpr auto functions = CreateStaticMap(
+        FunctionInfo{0, D<&INotificationSystemEventAccessor::GetSystemEvent>, "GetSystemEvent"}
+    );
     KernelHelpers::ServiceContext service_context;
     Kernel::KEvent* notification_event;
 };