archive/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-09-21 03:41:42 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2697 from endrift/fix-jit-trampoline

Browse source 
Common: CallLambdaTrampoline can return a value
This commit is contained in:
flacs 2015-07-04 11:59:00 +02:00
commit 3bbb2ede9c
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Source/Core/Common/Arm64Emitter.h
View file

@ -711,10 +711,9 @@ public:
// (this method might be a thunk in the case of multi-inheritance) so we
// have to go through a trampoline function.
template <typename T, typename... Args>
static void CallLambdaTrampoline(const std::function<T(Args...)>* f,
Args... args)
static T CallLambdaTrampoline(const std::function<T(Args...)>* f, Args... args)
{
(*f)(args...);
return (*f)(args...);
}
// This function expects you to have set up the state.

5
Source/Core/Common/x64Emitter.h
View file

@ -971,10 +971,9 @@ public:
// (this method might be a thunk in the case of multi-inheritance) so we
// have to go through a trampoline function.
template <typename T, typename... Args>
static void CallLambdaTrampoline(const std::function<T(Args...)>* f,
Args... args)
static T CallLambdaTrampoline(const std::function<T(Args...)>* f, Args... args)
{
(*f)(args...);
return (*f)(args...);
}
template <typename T, typename... Args>