Plexi09/eden-miror
1
0
Fork 0
mirror of https://git.eden-emu.dev/eden-emu/eden synced 2026-05-14 19:26:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

[hle] fetch manager once in cmif wrapper

Browse source 
Signed-off-by: lizzie <lizzie@eden-emu.dev>
This commit is contained in:
lizzie 2026-03-29 05:18:54 +00:00
parent 5322bce4b8
commit 00abe68430
1 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/core/hle/service/cmif_serialization.h
View file

@ -438,20 +438,20 @@ void WriteOutArgument(bool is_domain, CallArguments& args, u8* raw_data, HLERequ
template <bool Domain, typename T, typename... A> template <bool Domain, typename T, typename... A>
void CmifReplyWrapImpl(HLERequestContext& ctx, T& t, Result (T::*f)(A...)) { void CmifReplyWrapImpl(HLERequestContext& ctx, T& t, Result (T::*f)(A...)) {
const auto mgr = ctx.GetManager();
// Verify domain state. // Verify domain state.
if constexpr (!Domain) { if constexpr (!Domain) {
const auto _mgr = ctx.GetManager(); const bool is_domain = mgr ? mgr->IsDomain() : false;
const bool _is_domain = _mgr ? _mgr->IsDomain() : false; ASSERT_MSG(!is_domain,
ASSERT_MSG(!_is_domain, "Non-domain reply used on domain session\n"
"Non-domain reply used on domain session\n" "Service={} (TIPC={} CmdType={} Cmd=0x{:08X}\n"
"Service={} (TIPC={} CmdType={} Cmd=0x{:08X}\n" "HasDomainHeader={} DomainHandlers={}\nDesc={}",
"HasDomainHeader={} DomainHandlers={}\nDesc={}", t.GetServiceName(), ctx.IsTipc(),
t.GetServiceName(), ctx.IsTipc(), u32(ctx.GetCommandType()), u32(ctx.GetCommand()),
static_cast<u32>(ctx.GetCommandType()), static_cast<u32>(ctx.GetCommand()), ctx.HasDomainMessageHeader(), mgr ? u32(mgr->DomainHandlerCount()) : 0u,
ctx.HasDomainMessageHeader(), _mgr ? static_cast<u32>(_mgr->DomainHandlerCount()) : 0u, ctx.Description());
ctx.Description());
} }
const bool is_domain = Domain ? ctx.GetManager()->IsDomain() : false; const bool is_domain = Domain ? mgr->IsDomain() : false;
static_assert(ConstIfReference<A...>(), "Arguments taken by reference must be const"); static_assert(ConstIfReference<A...>(), "Arguments taken by reference must be const");
using MethodArguments = std::tuple<std::remove_cvref_t<A>...>; using MethodArguments = std::tuple<std::remove_cvref_t<A>...>;