thirdpartymirrors/UnleashedRecomp
1
0
Fork 0
mirror of https://github.com/hedge-dev/UnleashedRecomp.git synced 2026-04-28 05:11:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Handle float/double arguments properly in GuestToHostFunction.

Browse source
This commit is contained in:
Skyth 2024-11-25 00:58:11 +03:00
parent 3c2922a583
commit 3c48c17deb
1 changed files with 19 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
UnleashedRecomp/kernel/function.h
View file

@ -193,10 +193,10 @@ struct Argument
int ordinal{}; int ordinal{};
}; };
template<auto Func> template<typename T1>
constexpr std::array<Argument, arg_count_t<Func>::value> GatherFunctionArguments() constexpr std::array<Argument, std::tuple_size_v<T1>> GatherFunctionArguments(const T1& tpl)
{ {
std::array<Argument, arg_count_t<Func>::value> args{}; std::array<Argument, std::tuple_size_v<T1>> args{};
int floatOrdinal{}; int floatOrdinal{};
size_t i{}; size_t i{};
@ -205,9 +205,9 @@ constexpr std::array<Argument, arg_count_t<Func>::value> GatherFunctionArguments
{ {
std::apply([&](const auto& first, const auto&... rest) std::apply([&](const auto& first, const auto&... rest)
{ {
auto append = [&]<typename T>(const T & v) auto append = [&]<typename T2>(const T2& v)
{ {
if constexpr (is_precise_v<T>) if constexpr (is_precise_v<T2>)
{ {
args[i] = { 1, floatOrdinal++ }; args[i] = { 1, floatOrdinal++ };
} }
@ -221,12 +221,18 @@ constexpr std::array<Argument, arg_count_t<Func>::value> GatherFunctionArguments
append(first); append(first);
(append(rest), ...); (append(rest), ...);
}, function_args(Func)); }, tpl);
} }
return args; return args;
} }
template<auto Func>
constexpr std::array<Argument, arg_count_t<Func>::value> GatherFunctionArguments()
{
return GatherFunctionArguments(function_args(Func));
}
template<auto Func, size_t I> template<auto Func, size_t I>
struct arg_ordinal_t struct arg_ordinal_t
{ {
@ -248,19 +254,19 @@ FORCEINLINE std::enable_if_t<(I < sizeof...(TArgs)), void> _translate_args_to_ho
_translate_args_to_host<Func, I + 1>(ctx, base, tpl); _translate_args_to_host<Func, I + 1>(ctx, base, tpl);
} }
template<auto Func, int I = 0, typename ...TArgs> template<int I = 0, typename ...TArgs>
FORCEINLINE void _translate_args_to_guest(PPCContext& ctx, uint8_t* base, std::tuple<TArgs...>&) noexcept FORCEINLINE void _translate_args_to_guest(PPCContext& ctx, uint8_t* base, std::tuple<TArgs...>&) noexcept
requires (I >= sizeof...(TArgs)) requires (I >= sizeof...(TArgs))
{ {
} }
template <auto Func, int I = 0, typename ...TArgs> template <int I = 0, typename ...TArgs>
FORCEINLINE std::enable_if_t<(I < sizeof...(TArgs)), void> _translate_args_to_guest(PPCContext& ctx, uint8_t* base, std::tuple<TArgs...>& tpl) noexcept FORCEINLINE std::enable_if_t<(I < sizeof...(TArgs)), void> _translate_args_to_guest(PPCContext& ctx, uint8_t* base, std::tuple<TArgs...>& tpl) noexcept
{ {
using T = std::tuple_element_t<I, std::remove_reference_t<decltype(tpl)>>; using T = std::tuple_element_t<I, std::remove_reference_t<decltype(tpl)>>;
ArgTranslator::SetValue<T>(ctx, base, I, std::get<I>(tpl)); ArgTranslator::SetValue<T>(ctx, base, GatherFunctionArguments(std::tuple<TArgs...>{})[I].ordinal, std::get<I>(tpl));
_translate_args_to_guest<Func, I + 1>(ctx, base, tpl); _translate_args_to_guest<I + 1>(ctx, base, tpl);
} }
template<auto Func> template<auto Func>
@ -302,9 +308,9 @@ FORCEINLINE PPC_FUNC(HostToGuestFunction)
} }
template<typename T, typename TFunction, typename... TArgs> template<typename T, typename TFunction, typename... TArgs>
FORCEINLINE T GuestToHostFunction(const TFunction& func, TArgs... argv) FORCEINLINE T GuestToHostFunction(const TFunction& func, TArgs&&... argv)
{ {
auto args = std::make_tuple(argv...); auto args = std::make_tuple(std::forward<TArgs>(argv)...);
auto& currentCtx = *GetPPCContext(); auto& currentCtx = *GetPPCContext();
PPCContext newCtx; // NOTE: No need for zero initialization, has lots of unnecessary code generation. PPCContext newCtx; // NOTE: No need for zero initialization, has lots of unnecessary code generation.
@ -313,7 +319,7 @@ FORCEINLINE T GuestToHostFunction(const TFunction& func, TArgs... argv)
newCtx.r13 = currentCtx.r13; newCtx.r13 = currentCtx.r13;
newCtx.fpscr = currentCtx.fpscr; newCtx.fpscr = currentCtx.fpscr;
_translate_args_to_guest<GuestToHostFunction<T, TFunction, TArgs...>>(newCtx, (uint8_t*)g_memory.base, args); _translate_args_to_guest(newCtx, (uint8_t*)g_memory.base, args);
SetPPCContext(newCtx); SetPPCContext(newCtx);