From e12c84d5c542c07e6ea62c23a85c76d6f4c7c07f Mon Sep 17 00:00:00 2001 From: Lioncash Date: Mon, 23 Jul 2018 20:33:15 -0400 Subject: exclusive_monitor: Use consistent type alias for u64 Uses the same type aliases we use for virtual addresses, and converts one lingering usage of std::array to u128 for consistency. --- src/core/arm/dynarmic/arm_dynarmic.h | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'src/core/arm/dynarmic/arm_dynarmic.h') diff --git a/src/core/arm/dynarmic/arm_dynarmic.h b/src/core/arm/dynarmic/arm_dynarmic.h index 0fa8b417c..350f61fd2 100644 --- a/src/core/arm/dynarmic/arm_dynarmic.h +++ b/src/core/arm/dynarmic/arm_dynarmic.h @@ -68,15 +68,14 @@ public: explicit DynarmicExclusiveMonitor(size_t core_count); ~DynarmicExclusiveMonitor(); - void SetExclusive(size_t core_index, u64 addr) override; + void SetExclusive(size_t core_index, VAddr addr) override; void ClearExclusive() override; - bool ExclusiveWrite8(size_t core_index, u64 vaddr, u8 value) override; - bool ExclusiveWrite16(size_t core_index, u64 vaddr, u16 value) override; - bool ExclusiveWrite32(size_t core_index, u64 vaddr, u32 value) override; - bool ExclusiveWrite64(size_t core_index, u64 vaddr, u64 value) override; - bool ExclusiveWrite128(size_t core_index, u64 vaddr, - std::array value) override; + bool ExclusiveWrite8(size_t core_index, VAddr vaddr, u8 value) override; + bool ExclusiveWrite16(size_t core_index, VAddr vaddr, u16 value) override; + bool ExclusiveWrite32(size_t core_index, VAddr vaddr, u32 value) override; + bool ExclusiveWrite64(size_t core_index, VAddr vaddr, u64 value) override; + bool ExclusiveWrite128(size_t core_index, VAddr vaddr, u128 value) override; private: friend class ARM_Dynarmic; -- cgit v1.2.3