Diamond75/Panda3DS
1
0
Fork 0
mirror of https://github.com/wheremyfoodat/Panda3DS.git synced 2025-04-09 15:45:40 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add kernel member, stub UnloadCRO

Browse source
This commit is contained in:
Nomi 2023-09-07 20:17:55 +02:00
parent d50c94cbdc
commit d452caa976
3 changed files with 24 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/services/ldr_ro.hpp
View file

@ -5,9 +5,12 @@
#include "memory.hpp"
#include "result/result.hpp"
class Kernel;
class LDRService {
Handle handle = KernelHandles::LDR_RO;
Memory& mem;
Kernel& kernel;
MAKE_LOG_FUNCTION(log, ldrLogger)
u32 loadedCRS;
@ -16,9 +19,10 @@ class LDRService {
void initialize(u32 messagePointer);
void loadCRR(u32 messagePointer);
void loadCRONew(u32 messagePointer);
void unloadCRO(u32 messagePointer);
public:
LDRService(Memory& mem) : mem(mem) {}
LDRService(Memory& mem, Kernel& kernel) : mem(mem), kernel(kernel) {}
void reset();
void handleSyncRequest(u32 messagePointer);
};

18
src/core/services/ldr_ro.cpp
View file

@ -1,5 +1,6 @@
#include "services/ldr_ro.hpp"
#include "ipc.hpp"
#include "kernel.hpp"
#include <cstdio>
#include <string>
@ -8,6 +9,7 @@ namespace LDRCommands {
enum : u32 {
Initialize = 0x000100C2,
LoadCRR = 0x00020082,
UnloadCRO = 0x000500C2,
LoadCRONew = 0x000902C2,
};
}
@ -654,6 +656,7 @@ void LDRService::handleSyncRequest(u32 messagePointer) {
switch (command) {
case LDRCommands::Initialize: initialize(messagePointer); break;
case LDRCommands::LoadCRR: loadCRR(messagePointer); break;
case LDRCommands::UnloadCRO: unloadCRO(messagePointer); break;
case LDRCommands::LoadCRONew: loadCRONew(messagePointer); break;
default: Helpers::panic("LDR::RO service requested. Command: %08X\n", command);
}
@ -701,6 +704,8 @@ void LDRService::initialize(u32 messagePointer) {
Helpers::panic("Failed to rebase CRS");
}
//kernel.clearInstructionCache();
loadedCRS = crsPointer;
mem.write32(messagePointer, IPC::responseHeader(0x1, 1, 0));
@ -769,7 +774,20 @@ void LDRService::loadCRONew(u32 messagePointer) {
// TODO: add fixing
//kernel.clearInstructionCache();
mem.write32(messagePointer, IPC::responseHeader(0x9, 2, 0));
mem.write32(messagePointer + 4, Result::Success);
mem.write32(messagePointer + 8, size);
}
void LDRService::unloadCRO(u32 messagePointer) {
const u32 mapVaddr = mem.read32(messagePointer + 4);
const u32 croPointer = mem.read32(messagePointer + 12);
const Handle process = mem.read32(messagePointer + 20);
Helpers::warn("LDR_RO::UnloadCRO (vaddr = %08X, buffer = %08X, process = %X)\n", mapVaddr, croPointer, process);
mem.write32(messagePointer, IPC::responseHeader(0x5, 2, 0));
mem.write32(messagePointer + 4, Result::Success);
}

2
src/core/services/service_manager.cpp
View file

@ -8,7 +8,7 @@
ServiceManager::ServiceManager(std::span<u32, 16> regs, Memory& mem, GPU& gpu, u32& currentPID, Kernel& kernel, const EmulatorConfig& config)
: regs(regs), mem(mem), kernel(kernel), ac(mem), am(mem), boss(mem), act(mem), apt(mem, kernel), cam(mem, kernel), cecd(mem, kernel), cfg(mem),
dlp_srvr(mem), dsp(mem, kernel), hid(mem, kernel), http(mem), ir_user(mem, kernel), frd(mem), fs(mem, kernel, config),
gsp_gpu(mem, gpu, kernel, currentPID), gsp_lcd(mem), ldr(mem), mcu_hwc(mem, config), mic(mem, kernel), nfc(mem, kernel), nim(mem), ndm(mem),
gsp_gpu(mem, gpu, kernel, currentPID), gsp_lcd(mem), ldr(mem, kernel), mcu_hwc(mem, config), mic(mem, kernel), nfc(mem, kernel), nim(mem), ndm(mem),
news_u(mem), ptm(mem, config), soc(mem), ssl(mem), y2r(mem, kernel) {}
static constexpr int MAX_NOTIFICATION_COUNT = 16;