debuggerx/eden
1
0
Fork 0
mirror of https://git.eden-emu.dev/eden-emu/eden.git synced 2026-09-27 11:19:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

2026-09-26 11:47:43

Browse Source 
Signed-off-by: lizzie <lizzie@eden-emu.dev>
This commit is contained in:
lizzie
2026-09-26 11:47:43 +00:00
committed by crueter
parent 0150bfc66d
commit 3050a2027b
2 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/hle/service/service.cpp
+2 -2
View File
@@ -47,9 +47,9 @@ ServiceFrameworkBase::~ServiceFrameworkBase() {
const auto guard = ServiceFrameworkBase::LockService();
}
void ServiceFrameworkBase::ReportUnimplementedFunction(HLERequestContext& ctx, const FunctionInfoBase* info) {
void ServiceFrameworkBase::ReportUnimplementedFunction(HLERequestContext& ctx, std::optional<FunctionInfoBase> info) {
auto cmd_buf = ctx.CommandBuffer();
std::string function_name = info == nullptr ? "<unknown>" : info->name;
std::string function_name = info.has_value() ? info->name : "<unknown>";
fmt::memory_buffer buf;
fmt::format_to(std::back_inserter(buf), "function '{}({})': port='{}' cmd_buf={{[0]={:#x}", ctx.GetCommand(), function_name, service_name, cmd_buf[0]);
src/core/hle/service/service.h
+15 -14
View File
@@ -90,7 +90,6 @@ protected:
}
struct FunctionInfoBase {
u32 expected_header;
HandlerFnP<ServiceFrameworkBase> handler_callback;
const char* name;
u32 version_gating;
@@ -153,37 +152,39 @@ protected:
/// @param handler_callback_ member function in this service which will be called to handle the request
/// @param name_ human-friendly name for the request. Used mostly for logging purposes.
constexpr FunctionInfoTyped(u32 expected_header_, HandlerFnP<T> handler_callback_, const char* name_, u32 version_gating_ = 0)
: FunctionInfoBase{
expected_header_,
HandlerFnP<ServiceFrameworkBase>(handler_callback_),
name_,
version_gating_
}
: FunctionInfoBase{HandlerFnP<ServiceFrameworkBase>(handler_callback_), name_, version_gating_}
, expected_header{expected_header_}
{}
u32 expected_header;
};
using FunctionInfo = FunctionInfoTyped<Self>;
template<typename ...Ts>
requires (std::same_as<Ts, FunctionInfo> && ...)
[[nodiscard]] static consteval frozen::map<u32, FunctionInfo, sizeof...(Ts)> CreateStaticMap(Ts... args) {
return frozen::map<u32, FunctionInfo, sizeof...(args)>{
{args.expected_header, FunctionInfo(args)}...
[[nodiscard]] static consteval frozen::map<u32, HandlerFnP<ServiceFrameworkBase>, sizeof...(Ts)> CreateStaticMap(Ts... args) {
return frozen::map<u32, HandlerFnP<ServiceFrameworkBase>, sizeof...(args)>{
{args.expected_header, HandlerFnP<ServiceFrameworkBase>(args.handler_callback)}...
};
}
// Used exclusively by NFC
template<typename T, typename ...Ts>
requires (std::same_as<Ts, FunctionInfoTyped<T>> && ...)
[[nodiscard]] static consteval frozen::map<u32, FunctionInfoTyped<T>, sizeof...(Ts)> CreateStaticMapWithClass(Ts... args) {
return frozen::map<u32, FunctionInfoTyped<T>, sizeof...(args)>{
{args.expected_header, FunctionInfoTyped<T>(args)}...
[[nodiscard]] static consteval frozen::map<u32, HandlerFnP<ServiceFrameworkBase>, sizeof...(Ts)> CreateStaticMapWithClass(Ts... args) {
return frozen::map<u32, HandlerFnP<ServiceFrameworkBase>, sizeof...(args)>{
{args.expected_header, HandlerFnP<ServiceFrameworkBase>(args.handler_callback)}...
};
}
template<typename T>
[[nodiscard]] static constexpr std::optional<FunctionInfoBase> HandlerTableGenerateWithFind(u32 key, T const& map) {
auto const it = map.find(key);
return it != map.end() ? std::optional<FunctionInfoBase>{it->second} : std::nullopt;
if (it != map.end()) {
auto fake = FunctionInfoBase{};
fake.handler_callback = it->second;
return std::optional<FunctionInfoBase>{fake};
}
return std::nullopt;
}
/// @brief Initializes the handler with no functions installed.