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

Clean up service intercepts

Browse source
This commit is contained in:
wheremyfoodat 2025-07-04 00:25:02 +03:00
parent 9932e58bf0
commit 162e73bfd2
6 changed files with 85 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -216,25 +216,9 @@ void ServiceManager::publishToSubscriber(u32 messagePointer) {
}
void ServiceManager::sendCommandToService(u32 messagePointer, Handle handle) {
if (interceptedServices.size() != 0) [[unlikely]] {
// Check if there's a Lua handler for this function and call it
u32 function = mem.read32(messagePointer);
for (auto [serviceName, serviceHandle] : serviceMap) {
if (serviceHandle == handle) {
auto intercept = InterceptedService(std::string(serviceName), function);
if (interceptedServices.contains(intercept)) {
printf("Call to intercepted service\n");
// If the Lua handler returns true, it means the service is handled entirely
// From Lua, and we shouldn't do anything else here.
if (lua.signalInterceptedService(intercept.serviceName, function, messagePointer)) {
return;
}
}
break;
}
if (haveServiceIntercepts) [[unlikely]] {
if (checkForIntercept(messagePointer, handle)) [[unlikely]] {
return;
}
}
@ -281,4 +265,25 @@ void ServiceManager::sendCommandToService(u32 messagePointer, Handle handle) {
case KernelHandles::Y2R: y2r.handleSyncRequest(messagePointer); break;
default: Helpers::panic("Sent IPC message to unknown service %08X\n Command: %08X", handle, mem.read32(messagePointer));
}
}
bool ServiceManager::checkForIntercept(u32 messagePointer, Handle handle) {
// Check if there's a Lua handler for this function and call it
const u32 function = mem.read32(messagePointer);
for (auto [serviceName, serviceHandle] : serviceMap) {
if (serviceHandle == handle) {
auto intercept = InterceptedService(std::string(serviceName), function);
if (interceptedServices.contains(intercept)) {
// If the Lua handler returns true, it means the service is handled entirely
// From Lua, and we shouldn't do anything else here.
return lua.signalInterceptedService(intercept.serviceName, function, messagePointer);
}
break;
}
}
// Lua did not intercept the service, so emulate it normally
return false;
}