diff options
author | liamwhite <liamwhite@users.noreply.github.com> | 2023-07-26 16:33:28 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-07-26 16:33:28 +0200 |
commit | d3da1e6517fe27670b6c2d713d144872d55057d8 (patch) | |
tree | ab5c72b17b15185ec40945c5ba29400569b50630 /src/core/arm | |
parent | Merge pull request #11142 from german77/avoid_crash (diff) | |
parent | Fixes and workarounds to make UBSan happier on macOS (diff) | |
download | yuzu-d3da1e6517fe27670b6c2d713d144872d55057d8.tar yuzu-d3da1e6517fe27670b6c2d713d144872d55057d8.tar.gz yuzu-d3da1e6517fe27670b6c2d713d144872d55057d8.tar.bz2 yuzu-d3da1e6517fe27670b6c2d713d144872d55057d8.tar.lz yuzu-d3da1e6517fe27670b6c2d713d144872d55057d8.tar.xz yuzu-d3da1e6517fe27670b6c2d713d144872d55057d8.tar.zst yuzu-d3da1e6517fe27670b6c2d713d144872d55057d8.zip |
Diffstat (limited to 'src/core/arm')
-rw-r--r-- | src/core/arm/arm_interface.cpp | 4 | ||||
-rw-r--r-- | src/core/arm/arm_interface.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/core/arm/arm_interface.cpp b/src/core/arm/arm_interface.cpp index aa0eb9791..0c012f094 100644 --- a/src/core/arm/arm_interface.cpp +++ b/src/core/arm/arm_interface.cpp @@ -217,8 +217,8 @@ void ARM_Interface::Run() { } } -void ARM_Interface::LoadWatchpointArray(const WatchpointArray& wp) { - watchpoints = ℘ +void ARM_Interface::LoadWatchpointArray(const WatchpointArray* wp) { + watchpoints = wp; } const Kernel::DebugWatchpoint* ARM_Interface::MatchingWatchpoint( diff --git a/src/core/arm/arm_interface.h b/src/core/arm/arm_interface.h index d5f2fa09a..3d866ff6f 100644 --- a/src/core/arm/arm_interface.h +++ b/src/core/arm/arm_interface.h @@ -186,7 +186,7 @@ public: virtual void SaveContext(ThreadContext64& ctx) const = 0; virtual void LoadContext(const ThreadContext32& ctx) = 0; virtual void LoadContext(const ThreadContext64& ctx) = 0; - void LoadWatchpointArray(const WatchpointArray& wp); + void LoadWatchpointArray(const WatchpointArray* wp); /// Clears the exclusive monitor's state. virtual void ClearExclusiveState() = 0; |