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

Common: CallLambdaTrampoline can return a value
dolphin-emu · Jul 4, 2015 · 3bbb2ed · 3bbb2ed
2 parents eb3c5a2 + c9a25f9
commit 3bbb2ed
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/Source/Core/Common/Arm64Emitter.h b/Source/Core/Common/Arm64Emitter.h
@@ -711,10 +711,9 @@ class ARM64XEmitter
 	// (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.

diff --git a/Source/Core/Common/x64Emitter.h b/Source/Core/Common/x64Emitter.h
@@ -971,10 +971,9 @@ class XEmitter
 	// (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>