ldr_ro: convert to ServiceFramework

src/core/hle/service/ldr_ro/ldr_ro.cpp

@@ -9,10 +9,8 @@
 #include "core/core.h"
 #include "core/hle/ipc_helpers.h"
 #include "core/hle/kernel/process.h"
-#include "core/hle/kernel/vm_manager.h"
 #include "core/hle/service/ldr_ro/cro_helper.h"
 #include "core/hle/service/ldr_ro/ldr_ro.h"
-#include "core/hle/service/ldr_ro/memory_synchronizer.h"
 
 namespace Service {
 namespace LDR {
@@ -42,11 +40,6 @@ static const ResultCode ERROR_NOT_LOADED = // 0xD8A12C0D
     ResultCode(static_cast<ErrorDescription>(13), ErrorModule::RO, ErrorSummary::InvalidState,
                ErrorLevel::Permanent);
 
-static MemorySynchronizer memory_synchronizer;
-
-// TODO(wwylele): this should be in the per-client storage when we implement multi-process
-static VAddr loaded_crs; ///< the virtual address of the static module
-
 static bool VerifyBufferState(VAddr buffer_ptr, u32 size) {
     auto vma = Kernel::g_current_process->vm_manager.FindVMA(buffer_ptr);
     return vma != Kernel::g_current_process->vm_manager.vma_map.end() &&
@@ -55,32 +48,18 @@ static bool VerifyBufferState(VAddr buffer_ptr, u32 size) {
            vma->second.meminfo_state == Kernel::MemoryState::Private;
 }
 
-/**
+void RO::Initialize(Kernel::HLERequestContext& ctx) {
- * LDR_RO::Initialize service function
+    IPC::RequestParser rp(ctx, 0x01, 3, 2);
- *  Inputs:
- *      0 : 0x000100C2
- *      1 : CRS buffer pointer
- *      2 : CRS Size
- *      3 : Process memory address where the CRS will be mapped
- *      4 : handle translation descriptor (zero)
- *      5 : KProcess handle
- *  Outputs:
- *      0 : Return header
- *      1 : Result of function, 0 on success, otherwise error code
- */
-static void Initialize(Interface* self) {
-    IPC::RequestParser rp(Kernel::GetCommandBuffer(), 0x01, 3, 2);
     VAddr crs_buffer_ptr = rp.Pop<u32>();
     u32 crs_size = rp.Pop<u32>();
     VAddr crs_address = rp.Pop<u32>();
     // TODO (wwylele): RO service checks the descriptor here and return error 0xD9001830 for
     // incorrect descriptor. This error return should be probably built in IPC::RequestParser.
     // All other service functions below have the same issue.
-    Kernel::Handle process = rp.PopHandle();
+    auto process = rp.PopObject<Kernel::Process>();
 
-    LOG_DEBUG(Service_LDR,
+    LOG_DEBUG(Service_LDR, "called, crs_buffer_ptr=0x%08X, crs_address=0x%08X, crs_size=0x%X",
-              "called, crs_buffer_ptr=0x%08X, crs_address=0x%08X, crs_size=0x%X, process=0x%08X",
+              crs_buffer_ptr, crs_address, crs_size);
-              crs_buffer_ptr, crs_address, crs_size, process);
 
     IPC::RequestBuilder rb = rp.MakeBuilder(1, 0);
 
@@ -176,83 +155,32 @@ static void Initialize(Interface* self) {
     rb.Push(RESULT_SUCCESS);
 }
 
-/**
+void RO::LoadCRR(Kernel::HLERequestContext& ctx) {
- * LDR_RO::LoadCRR service function
+    IPC::RequestParser rp(ctx, 0x02, 2, 2);
- *  Inputs:
- *      0 : 0x00020082
- *      1 : CRR buffer pointer
- *      2 : CRR Size
- *      3 : handle translation descriptor (zero)
- *      4 : KProcess handle
- *  Outputs:
- *      0 : Return header
- *      1 : Result of function, 0 on success, otherwise error code
- */
-static void LoadCRR(Interface* self) {
-    IPC::RequestParser rp(Kernel::GetCommandBuffer(), 0x02, 2, 2);
     VAddr crr_buffer_ptr = rp.Pop<u32>();
     u32 crr_size = rp.Pop<u32>();
-    Kernel::Handle process = rp.PopHandle();
+    auto process = rp.PopObject<Kernel::Process>();
 
     IPC::RequestBuilder rb = rp.MakeBuilder(1, 0);
     rb.Push(RESULT_SUCCESS);
 
-    LOG_WARNING(Service_LDR,
+    LOG_WARNING(Service_LDR, "(STUBBED) called, crr_buffer_ptr=0x%08X, crr_size=0x%08X",
-                "(STUBBED) called, crr_buffer_ptr=0x%08X, crr_size=0x%08X, process=0x%08X",
+                crr_buffer_ptr, crr_size);
-                crr_buffer_ptr, crr_size, process);
 }
 
-/**
+void RO::UnloadCRR(Kernel::HLERequestContext& ctx) {
- * LDR_RO::UnloadCRR service function
+    IPC::RequestParser rp(ctx, 0x03, 1, 2);
- *  Inputs:
- *      0 : 0x00030042
- *      1 : CRR buffer pointer
- *      2 : handle translation descriptor (zero)
- *      3 : KProcess handle
- *  Outputs:
- *      0 : Return header
- *      1 : Result of function, 0 on success, otherwise error code
- */
-static void UnloadCRR(Interface* self) {
-    IPC::RequestParser rp(Kernel::GetCommandBuffer(), 0x03, 1, 2);
     u32 crr_buffer_ptr = rp.Pop<u32>();
-    Kernel::Handle process = rp.PopHandle();
+    auto process = rp.PopObject<Kernel::Process>();
 
     IPC::RequestBuilder rb = rp.MakeBuilder(1, 0);
     rb.Push(RESULT_SUCCESS);
 
-    LOG_WARNING(Service_LDR, "(STUBBED) called, crr_buffer_ptr=0x%08X, process=0x%08X",
+    LOG_WARNING(Service_LDR, "(STUBBED) called, crr_buffer_ptr=0x%08X", crr_buffer_ptr);
-                crr_buffer_ptr, process);
 }
 
-/**
+void RO::LoadCRO(Kernel::HLERequestContext& ctx, bool link_on_load_bug_fix) {
- * LDR_RO::LoadCRO service function
+    IPC::RequestParser rp(ctx, link_on_load_bug_fix ? 0x09 : 0x04, 11, 2);
- *  Inputs:
- *      0 : 0x000402C2 (old) / 0x000902C2 (new)
- *      1 : CRO buffer pointer
- *      2 : memory address where the CRO will be mapped
- *      3 : CRO Size
- *      4 : .data segment buffer pointer
- *      5 : must be zero
- *      6 : .data segment buffer size
- *      7 : .bss segment buffer pointer
- *      8 : .bss segment buffer size
- *      9 : (bool) register CRO as auto-link module
- *     10 : fix level
- *     11 : CRR address (zero if use loaded CRR)
- *     12 : handle translation descriptor (zero)
- *     13 : KProcess handle
- *  Outputs:
- *      0 : Return header
- *      1 : Result of function, 0 on success, otherwise error code
- *      2 : CRO fixed size
- *  Note:
- *      This service function has two versions. The function defined here is a
- *      unified one of two, with an additional parameter link_on_load_bug_fix.
- *      There is a dispatcher template below.
- */
-static void LoadCRO(Interface* self, bool link_on_load_bug_fix) {
-    IPC::RequestParser rp(Kernel::GetCommandBuffer(), link_on_load_bug_fix ? 0x09 : 0x04, 11, 2);
     VAddr cro_buffer_ptr = rp.Pop<u32>();
     VAddr cro_address = rp.Pop<u32>();
     u32 cro_size = rp.Pop<u32>();
@@ -264,15 +192,15 @@ static void LoadCRO(Interface* self, bool link_on_load_bug_fix) {
     bool auto_link = rp.Pop<bool>();
     u32 fix_level = rp.Pop<u32>();
     VAddr crr_address = rp.Pop<u32>();
-    Kernel::Handle process = rp.PopHandle();
+    auto process = rp.PopObject<Kernel::Process>();
 
     LOG_DEBUG(Service_LDR, "called (%s), cro_buffer_ptr=0x%08X, cro_address=0x%08X, cro_size=0x%X, "
                            "data_segment_address=0x%08X, zero=%d, data_segment_size=0x%X, "
                            "bss_segment_address=0x%08X, bss_segment_size=0x%X, auto_link=%s, "
-                           "fix_level=%d, crr_address=0x%08X, process=0x%08X",
+                           "fix_level=%d, crr_address=0x%08X",
               link_on_load_bug_fix ? "new" : "old", cro_buffer_ptr, cro_address, cro_size,
               data_segment_address, zero, data_segment_size, bss_segment_address, bss_segment_size,
-              auto_link ? "true" : "false", fix_level, crr_address, process);
+              auto_link ? "true" : "false", fix_level, crr_address);
 
     IPC::RequestBuilder rb = rp.MakeBuilder(2, 0);
 
@@ -447,34 +375,15 @@ static void LoadCRO(Interface* self, bool link_on_load_bug_fix) {
     rb.Push(RESULT_SUCCESS, fix_size);
 }
 
-template <bool link_on_load_bug_fix>
+void RO::UnloadCRO(Kernel::HLERequestContext& ctx) {
-static void LoadCRO(Interface* self) {
+    IPC::RequestParser rp(ctx, 0x05, 3, 2);
-    LoadCRO(self, link_on_load_bug_fix);
-}
-
-/**
- * LDR_RO::UnloadCRO service function
- *  Inputs:
- *      0 : 0x000500C2
- *      1 : mapped CRO pointer
- *      2 : zero? (RO service doesn't care)
- *      3 : original CRO pointer
- *      4 : handle translation descriptor (zero)
- *      5 : KProcess handle
- *  Outputs:
- *      0 : Return header
- *      1 : Result of function, 0 on success, otherwise error code
- */
-static void UnloadCRO(Interface* self) {
-    IPC::RequestParser rp(Kernel::GetCommandBuffer(), 0x05, 3, 2);
     VAddr cro_address = rp.Pop<u32>();
     u32 zero = rp.Pop<u32>();
     VAddr cro_buffer_ptr = rp.Pop<u32>();
-    Kernel::Handle process = rp.PopHandle();
+    auto process = rp.PopObject<Kernel::Process>();
 
-    LOG_DEBUG(Service_LDR,
+    LOG_DEBUG(Service_LDR, "called, cro_address=0x%08X, zero=%d, cro_buffer_ptr=0x%08X",
-              "called, cro_address=0x%08X, zero=%d, cro_buffer_ptr=0x%08X, process=0x%08X",
+              cro_address, zero, cro_buffer_ptr);
-              cro_address, zero, cro_buffer_ptr, process);
 
     CROHelper cro(cro_address);
 
@@ -540,23 +449,12 @@ static void UnloadCRO(Interface* self) {
     rb.Push(result);
 }
 
-/**
+void RO::LinkCRO(Kernel::HLERequestContext& ctx) {
- * LDR_RO::LinkCRO service function
+    IPC::RequestParser rp(ctx, 0x06, 1, 2);
- *  Inputs:
- *      0 : 0x00060042
- *      1 : mapped CRO pointer
- *      2 : handle translation descriptor (zero)
- *      3 : KProcess handle
- *  Outputs:
- *      0 : Return header
- *      1 : Result of function, 0 on success, otherwise error code
- */
-static void LinkCRO(Interface* self) {
-    IPC::RequestParser rp(Kernel::GetCommandBuffer(), 0x06, 1, 2);
     VAddr cro_address = rp.Pop<u32>();
-    Kernel::Handle process = rp.PopHandle();
+    auto process = rp.PopObject<Kernel::Process>();
 
-    LOG_DEBUG(Service_LDR, "called, cro_address=0x%08X, process=0x%08X", cro_address, process);
+    LOG_DEBUG(Service_LDR, "called, cro_address=0x%08X", cro_address);
 
     CROHelper cro(cro_address);
 
@@ -592,23 +490,12 @@ static void LinkCRO(Interface* self) {
     rb.Push(result);
 }
 
-/**
+void RO::UnlinkCRO(Kernel::HLERequestContext& ctx) {
- * LDR_RO::UnlinkCRO service function
+    IPC::RequestParser rp(ctx, 0x07, 1, 2);
- *  Inputs:
- *      0 : 0x00070042
- *      1 : mapped CRO pointer
- *      2 : handle translation descriptor (zero)
- *      3 : KProcess handle
- *  Outputs:
- *      0 : Return header
- *      1 : Result of function, 0 on success, otherwise error code
- */
-static void UnlinkCRO(Interface* self) {
-    IPC::RequestParser rp(Kernel::GetCommandBuffer(), 0x07, 1, 2);
     VAddr cro_address = rp.Pop<u32>();
-    Kernel::Handle process = rp.PopHandle();
+    auto process = rp.PopObject<Kernel::Process>();
 
-    LOG_DEBUG(Service_LDR, "called, cro_address=0x%08X, process=0x%08X", cro_address, process);
+    LOG_DEBUG(Service_LDR, "called, cro_address=0x%08X", cro_address);
 
     CROHelper cro(cro_address);
 
@@ -644,24 +531,12 @@ static void UnlinkCRO(Interface* self) {
     rb.Push(result);
 }
 
-/**
+void RO::Shutdown(Kernel::HLERequestContext& ctx) {
- * LDR_RO::Shutdown service function
+    IPC::RequestParser rp(ctx, 0x08, 1, 2);
- *  Inputs:
- *      0 : 0x00080042
- *      1 : original CRS buffer pointer
- *      2 : handle translation descriptor (zero)
- *      3 : KProcess handle
- *  Outputs:
- *      0 : Return header
- *      1 : Result of function, 0 on success, otherwise error code
- */
-static void Shutdown(Interface* self) {
-    IPC::RequestParser rp(Kernel::GetCommandBuffer(), 0x08, 1, 2);
     VAddr crs_buffer_ptr = rp.Pop<u32>();
-    Kernel::Handle process = rp.PopHandle();
+    auto process = rp.PopObject<Kernel::Process>();
 
-    LOG_DEBUG(Service_LDR, "called, crs_buffer_ptr=0x%08X, process=0x%08X", crs_buffer_ptr,
+    LOG_DEBUG(Service_LDR, "called, crs_buffer_ptr=0x%08X", crs_buffer_ptr);
-              process);
 
     IPC::RequestBuilder rb = rp.MakeBuilder(1, 0);
 
@@ -691,25 +566,23 @@ static void Shutdown(Interface* self) {
     rb.Push(result);
 }
 
-const Interface::FunctionInfo FunctionTable[] = {
+RO::RO() : ServiceFramework("ldr:ro", 2) {
-    // clang-format off
+    static const FunctionInfo functions[] = {
-    {0x000100C2, Initialize, "Initialize"},
+        {0x000100C2, &RO::Initialize, "Initialize"},
-    {0x00020082, LoadCRR, "LoadCRR"},
+        {0x00020082, &RO::LoadCRR, "LoadCRR"},
-    {0x00030042, UnloadCRR, "UnloadCRR"},
+        {0x00030042, &RO::UnloadCRR, "UnloadCRR"},
-    {0x000402C2, LoadCRO<false>, "LoadCRO"},
+        {0x000402C2, &RO::LoadCRO<false>, "LoadCRO"},
-    {0x000500C2, UnloadCRO, "UnloadCRO"},
+        {0x000500C2, &RO::UnloadCRO, "UnloadCRO"},
-    {0x00060042, LinkCRO, "LinkCRO"},
+        {0x00060042, &RO::LinkCRO, "LinkCRO"},
-    {0x00070042, UnlinkCRO, "UnlinkCRO"},
+        {0x00070042, &RO::UnlinkCRO, "UnlinkCRO"},
-    {0x00080042, Shutdown, "Shutdown"},
+        {0x00080042, &RO::Shutdown, "Shutdown"},
-    {0x000902C2, LoadCRO<true>, "LoadCRO_New"},
+        {0x000902C2, &RO::LoadCRO<true>, "LoadCRO_New"},
-    // clang-format on
+    };
-};
+    RegisterHandlers(functions);
+}
 
-LDR_RO::LDR_RO() {
+void InstallInterfaces(SM::ServiceManager& service_manager) {
-    Register(FunctionTable);
+    std::make_shared<RO>()->InstallAsService(service_manager);
-
-    loaded_crs = 0;
-    memory_synchronizer.Clear();
 }
 
 } // namespace LDR

src/core/hle/service/ldr_ro/ldr_ro.h

@@ -4,19 +4,151 @@
 
 #pragma once
 
+#include "core/hle/service/ldr_ro/memory_synchronizer.h"
 #include "core/hle/service/service.h"
 
 namespace Service {
 namespace LDR {
 
-class LDR_RO final : public Interface {
+class RO final : public ServiceFramework<RO> {
 public:
-    LDR_RO();
+    RO();
 
-    std::string GetPortName() const override {
+private:
-        return "ldr:ro";
+    /**
+     * RO::Initialize service function
+     *  Inputs:
+     *      0 : 0x000100C2
+     *      1 : CRS buffer pointer
+     *      2 : CRS Size
+     *      3 : Process memory address where the CRS will be mapped
+     *      4 : handle translation descriptor (zero)
+     *      5 : KProcess handle
+     *  Outputs:
+     *      0 : Return header
+     *      1 : Result of function, 0 on success, otherwise error code
+     */
+    void Initialize(Kernel::HLERequestContext& ctx);
+
+    /**
+     * RO::LoadCRR service function
+     *  Inputs:
+     *      0 : 0x00020082
+     *      1 : CRR buffer pointer
+     *      2 : CRR Size
+     *      3 : handle translation descriptor (zero)
+     *      4 : KProcess handle
+     *  Outputs:
+     *      0 : Return header
+     *      1 : Result of function, 0 on success, otherwise error code
+     */
+    void LoadCRR(Kernel::HLERequestContext& ctx);
+
+    /**
+     * RO::UnloadCRR service function
+     *  Inputs:
+     *      0 : 0x00030042
+     *      1 : CRR buffer pointer
+     *      2 : handle translation descriptor (zero)
+     *      3 : KProcess handle
+     *  Outputs:
+     *      0 : Return header
+     *      1 : Result of function, 0 on success, otherwise error code
+     */
+    void UnloadCRR(Kernel::HLERequestContext& ctx);
+
+    /**
+     * RO::LoadCRO service function
+     *  Inputs:
+     *      0 : 0x000402C2 (old) / 0x000902C2 (new)
+     *      1 : CRO buffer pointer
+     *      2 : memory address where the CRO will be mapped
+     *      3 : CRO Size
+     *      4 : .data segment buffer pointer
+     *      5 : must be zero
+     *      6 : .data segment buffer size
+     *      7 : .bss segment buffer pointer
+     *      8 : .bss segment buffer size
+     *      9 : (bool) register CRO as auto-link module
+     *     10 : fix level
+     *     11 : CRR address (zero if use loaded CRR)
+     *     12 : handle translation descriptor (zero)
+     *     13 : KProcess handle
+     *  Outputs:
+     *      0 : Return header
+     *      1 : Result of function, 0 on success, otherwise error code
+     *      2 : CRO fixed size
+     *  Note:
+     *      This service function has two versions. The function defined here is a
+     *      unified one of two, with an additional parameter link_on_load_bug_fix.
+     *      There is a dispatcher template below.
+     */
+    void LoadCRO(Kernel::HLERequestContext& ctx, bool link_on_load_bug_fix);
+
+    template <bool link_on_load_bug_fix>
+    void LoadCRO(Kernel::HLERequestContext& ctx) {
+        LoadCRO(ctx, link_on_load_bug_fix);
     }
+
+    /**
+     * RO::UnloadCRO service function
+     *  Inputs:
+     *      0 : 0x000500C2
+     *      1 : mapped CRO pointer
+     *      2 : zero? (RO service doesn't care)
+     *      3 : original CRO pointer
+     *      4 : handle translation descriptor (zero)
+     *      5 : KProcess handle
+     *  Outputs:
+     *      0 : Return header
+     *      1 : Result of function, 0 on success, otherwise error code
+     */
+    void UnloadCRO(Kernel::HLERequestContext& self);
+
+    /**
+     * RO::LinkCRO service function
+     *  Inputs:
+     *      0 : 0x00060042
+     *      1 : mapped CRO pointer
+     *      2 : handle translation descriptor (zero)
+     *      3 : KProcess handle
+     *  Outputs:
+     *      0 : Return header
+     *      1 : Result of function, 0 on success, otherwise error code
+     */
+    void LinkCRO(Kernel::HLERequestContext& self);
+
+    /**
+     * RO::UnlinkCRO service function
+     *  Inputs:
+     *      0 : 0x00070042
+     *      1 : mapped CRO pointer
+     *      2 : handle translation descriptor (zero)
+     *      3 : KProcess handle
+     *  Outputs:
+     *      0 : Return header
+     *      1 : Result of function, 0 on success, otherwise error code
+     */
+    void UnlinkCRO(Kernel::HLERequestContext& self);
+
+    /**
+     * RO::Shutdown service function
+     *  Inputs:
+     *      0 : 0x00080042
+     *      1 : original CRS buffer pointer
+     *      2 : handle translation descriptor (zero)
+     *      3 : KProcess handle
+     *  Outputs:
+     *      0 : Return header
+     *      1 : Result of function, 0 on success, otherwise error code
+     */
+    void Shutdown(Kernel::HLERequestContext& self);
+
+    MemorySynchronizer memory_synchronizer;
+    VAddr loaded_crs = 0; ///< the virtual address of the static module
 };
 
+void InstallInterfaces(SM::ServiceManager& service_manager);
+
 } // namespace LDR
 } // namespace Service

src/core/hle/service/service.cpp

@@ -261,6 +261,7 @@ void Init() {
 
     NS::InstallInterfaces(*SM::g_service_manager);
     AC::InstallInterfaces(*SM::g_service_manager);
+    LDR::InstallInterfaces(*SM::g_service_manager);
 
     FS::ArchiveInit();
     ACT::Init();
@@ -288,7 +289,6 @@ void Init() {
     AddService(new GSP::GSP_GPU);
     AddService(new GSP::GSP_LCD);
     AddService(new HTTP::HTTP_C);
-    AddService(new LDR::LDR_RO);
     AddService(new MIC::MIC_U);
     AddService(new PM::PM_APP);
     AddService(new SOC::SOC_U);