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<uint64_t, 2> to u128 for consistency.

1 files changed, 6 insertions, 8 deletions

diff --git a/src/core/arm/exclusive_monitor.h b/src/core/arm/exclusive_monitor.h
index acfcdb94c..13671ed7a 100644
--- a/src/core/arm/exclusive_monitor.h
+++ b/src/core/arm/exclusive_monitor.h
@@ -4,20 +4,18 @@
 
 #pragma once
 
-#include <array>
 #include "common/common_types.h"
 
 class ExclusiveMonitor {
 public:
     virtual ~ExclusiveMonitor();
 
-    virtual void SetExclusive(size_t core_index, u64 addr) = 0;
+    virtual void SetExclusive(size_t core_index, VAddr addr) = 0;
     virtual void ClearExclusive() = 0;
 
-    virtual bool ExclusiveWrite8(size_t core_index, u64 vaddr, u8 value) = 0;
-    virtual bool ExclusiveWrite16(size_t core_index, u64 vaddr, u16 value) = 0;
-    virtual bool ExclusiveWrite32(size_t core_index, u64 vaddr, u32 value) = 0;
-    virtual bool ExclusiveWrite64(size_t core_index, u64 vaddr, u64 value) = 0;
-    virtual bool ExclusiveWrite128(size_t core_index, u64 vaddr,
-                                   std::array<std::uint64_t, 2> value) = 0;
+    virtual bool ExclusiveWrite8(size_t core_index, VAddr vaddr, u8 value) = 0;
+    virtual bool ExclusiveWrite16(size_t core_index, VAddr vaddr, u16 value) = 0;
+    virtual bool ExclusiveWrite32(size_t core_index, VAddr vaddr, u32 value) = 0;
+    virtual bool ExclusiveWrite64(size_t core_index, VAddr vaddr, u64 value) = 0;
+    virtual bool ExclusiveWrite128(size_t core_index, VAddr vaddr, u128 value) = 0;
 };