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

[SRV] Use map instead of huge if for services

Browse source
This commit is contained in:
wheremyfoodat 2023-03-17 02:18:58 +02:00
parent f1bfc05fd2
commit 3119365ad9
1 changed files with 29 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,4 +1,5 @@
#include "services/service_manager.hpp" #include "services/service_manager.hpp"
#include <map>
#include "kernel.hpp" #include "kernel.hpp"
ServiceManager::ServiceManager(std::array<u32, 16>& regs, Memory& mem, GPU& gpu, u32& currentPID, Kernel& kernel) ServiceManager::ServiceManager(std::array<u32, 16>& regs, Memory& mem, GPU& gpu, u32& currentPID, Kernel& kernel)
@ -80,6 +81,30 @@ void ServiceManager::registerClient(u32 messagePointer) {
mem.write32(messagePointer + 4, Result::Success); mem.write32(messagePointer + 4, Result::Success);
} }
static std::map<std::string, Handle> serviceMap = {
{ "ac:u", KernelHandles::AC },
{ "am:app", KernelHandles::AM },
{ "APT:S", KernelHandles::APT }, // TODO: APT:A, APT:S and APT:U are slightly different
{ "APT:A", KernelHandles::APT },
{ "APT:U", KernelHandles::APT },
{ "boss:U", KernelHandles::BOSS },
{ "cam:u", KernelHandles::CAM },
{ "cecd:u", KernelHandles::CECD },
{ "cfg:u", KernelHandles::CFG },
{ "dsp::DSP", KernelHandles::DSP },
{ "hid:USER", KernelHandles::HID },
{ "frd:u", KernelHandles::FRD },
{ "fs:USER", KernelHandles::FS },
{ "gsp::Gpu", KernelHandles::GPU },
{ "gsp::Lcd", KernelHandles::LCD },
{ "mic:u", KernelHandles::MIC },
{ "ndm:u", KernelHandles::NDM },
{ "nim:aoc", KernelHandles::NIM },
{ "ptm:u", KernelHandles::PTM },
{ "y2r:u", KernelHandles::Y2R }
};
// https://www.3dbrew.org/wiki/SRV:GetServiceHandle // https://www.3dbrew.org/wiki/SRV:GetServiceHandle
void ServiceManager::getServiceHandle(u32 messagePointer) { void ServiceManager::getServiceHandle(u32 messagePointer) {
u32 nameLength = mem.read32(messagePointer + 12); u32 nameLength = mem.read32(messagePointer + 12);
@ -89,50 +114,11 @@ void ServiceManager::getServiceHandle(u32 messagePointer) {
std::string service = mem.readString(messagePointer + 4, 8); std::string service = mem.readString(messagePointer + 4, 8);
log("srv::getServiceHandle (Service: %s, nameLength: %d, flags: %d)\n", service.c_str(), nameLength, flags); log("srv::getServiceHandle (Service: %s, nameLength: %d, flags: %d)\n", service.c_str(), nameLength, flags);
// TODO: Use a map here // Look up service handle in map, panic if it does not exist
if (service == "ac:u") { if (auto search = serviceMap.find(service); search != serviceMap.end())
handle = KernelHandles::AC; handle = search->second;
} else if (service == "am:app") { else
handle = KernelHandles::AM;
} else if (service == "APT:S") { // TODO: APT:A, APT:S and APT:U are slightly different
handle = KernelHandles::APT;
} else if (service == "APT:A") {
handle = KernelHandles::APT;
} else if (service == "APT:U") {
handle = KernelHandles::APT;
} else if (service == "boss:U") {
handle = KernelHandles::BOSS;
} else if (service == "cam:u") {
handle = KernelHandles::CAM;
} else if (service == "cecd:u") {
handle = KernelHandles::CECD;
} else if (service == "cfg:u") {
handle = KernelHandles::CFG;
} else if (service == "dsp::DSP") {
handle = KernelHandles::DSP;
} else if (service == "hid:USER") {
handle = KernelHandles::HID;
} else if (service == "frd:u") {
handle = KernelHandles::FRD;
} else if (service == "fs:USER") {
handle = KernelHandles::FS;
} else if (service == "gsp::Gpu") {
handle = KernelHandles::GPU;
} else if (service == "gsp::Lcd") {
handle = KernelHandles::LCD;
} else if (service == "mic:u") {
handle = KernelHandles::MIC;
} else if (service == "ndm:u") {
handle = KernelHandles::NDM;
} else if (service == "nim:aoc") {
handle = KernelHandles::NIM;
} else if (service == "ptm:u") {
handle = KernelHandles::PTM;
} else if (service == "y2r:u") {
handle = KernelHandles::Y2R;
} else {
Helpers::panic("srv: GetServiceHandle with unknown service %s", service.c_str()); Helpers::panic("srv: GetServiceHandle with unknown service %s", service.c_str());
}
mem.write32(messagePointer + 4, Result::Success); mem.write32(messagePointer + 4, Result::Success);
mem.write32(messagePointer + 12, handle); mem.write32(messagePointer + 12, handle);