diff options
| author |  David Marcec | 2018-08-11 10:35:47 +1000 |
|---|---|---|
| committer | David Marcec | 2018-08-11 10:35:47 +1000 |
| commit | b76ddb7647cbb390cce4143d91a1db171b0fa503 (patch) | |
| tree | a6e2e334e82b035923c41458150604dd5fb31d65 /src/common/x64 | |
| parent | Added IsUserRegistrationRequestPermitted (diff) | |
| parent | Merge pull request #1007 from MerryMage/dynarmic (diff) | |
| download | yuzu-b76ddb7647cbb390cce4143d91a1db171b0fa503.tar.gz yuzu-b76ddb7647cbb390cce4143d91a1db171b0fa503.tar.xz yuzu-b76ddb7647cbb390cce4143d91a1db171b0fa503.zip | |
Merge remote-tracking branch 'origin/master' into better-account
Diffstat (limited to 'src/common/x64')
| -rw-r--r-- | src/common/x64/xbyak_util.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/common/x64/xbyak_util.h b/src/common/x64/xbyak_util.h index 0f52f704b..ec76e0a47 100644 --- a/src/common/x64/xbyak_util.h +++ b/src/common/x64/xbyak_util.h | |||
| @@ -34,7 +34,7 @@ inline bool IsWithin2G(const Xbyak::CodeGenerator& code, uintptr_t target) { | |||
| 34 | 34 | ||
| 35 | template <typename T> | 35 | template <typename T> |
| 36 | inline void CallFarFunction(Xbyak::CodeGenerator& code, const T f) { | 36 | inline void CallFarFunction(Xbyak::CodeGenerator& code, const T f) { |
| 37 | static_assert(std::is_pointer<T>(), "Argument must be a (function) pointer."); | 37 | static_assert(std::is_pointer_v<T>, "Argument must be a (function) pointer."); |
| 38 | size_t addr = reinterpret_cast<size_t>(f); | 38 | size_t addr = reinterpret_cast<size_t>(f); |
| 39 | if (IsWithin2G(code, addr)) { | 39 | if (IsWithin2G(code, addr)) { |
| 40 | code.call(f); | 40 | code.call(f); |