diff options
| author | Markus Wick <degasus@users.noreply.github.com> | 2021-01-27 20:07:24 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-27 20:07:24 +0100 |
| commit | 2ada5b422db91115dab9d25b8c4bb7fcbf97c9f3 (patch) | |
| tree | d5067cdc5ab5429a475a29a3c8bb75c43a41fed3 /Source/Core/Common | |
| parent | 8c127a612f72b68081129d75c58e252491e372d9 (diff) | |
| parent | 67491979ab2c11a3961236e79bb11fd7e3030591 (diff) | |
Merge pull request #9448 from JosJuice/blr-x30
JitArm64: Avoid using X30 with BLR
Diffstat (limited to 'Source/Core/Common')
| -rw-r--r-- | Source/Core/Common/Arm64Emitter.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/Core/Common/Arm64Emitter.h b/Source/Core/Common/Arm64Emitter.h index 3aa5942b88..246a7d86a6 100644 --- a/Source/Core/Common/Arm64Emitter.h +++ b/Source/Core/Common/Arm64Emitter.h @@ -912,14 +912,14 @@ public: } // This function expects you to have set up the state. - // Overwrites X0 and X30 + // Overwrites X0 and X8 template <typename T, typename... Args> ARM64Reg ABI_SetupLambda(const std::function<T(Args...)>* f) { auto trampoline = &ARM64XEmitter::CallLambdaTrampoline<T, Args...>; - MOVI2R(X30, (uintptr_t)trampoline); - MOVI2R(X0, (uintptr_t) const_cast<void*>((const void*)f)); - return X30; + MOVP2R(X8, trampoline); + MOVP2R(X0, const_cast<void*>((const void*)f)); + return X8; } // Plain function call |