summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/core/hle/kernel/vm_manager.cpp2
-rw-r--r--src/core/hle/kernel/vm_manager.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/core/hle/kernel/vm_manager.cpp b/src/core/hle/kernel/vm_manager.cpp
index 205cc7b53..e5e567de1 100644
--- a/src/core/hle/kernel/vm_manager.cpp
+++ b/src/core/hle/kernel/vm_manager.cpp
@@ -55,7 +55,7 @@ VMManager::VMAHandle VMManager::FindVMA(VAddr target) const {
55} 55}
56 56
57ResultVal<VMManager::VMAHandle> VMManager::MapMemoryBlock(VAddr target, 57ResultVal<VMManager::VMAHandle> VMManager::MapMemoryBlock(VAddr target,
58 std::shared_ptr<std::vector<u8>> block, u32 offset, u32 size, MemoryState state) { 58 std::shared_ptr<std::vector<u8>> block, size_t offset, u32 size, MemoryState state) {
59 ASSERT(block != nullptr); 59 ASSERT(block != nullptr);
60 ASSERT(offset + size <= block->size()); 60 ASSERT(offset + size <= block->size());
61 61
diff --git a/src/core/hle/kernel/vm_manager.h b/src/core/hle/kernel/vm_manager.h
index b3795a94a..a8cf0d0d4 100644
--- a/src/core/hle/kernel/vm_manager.h
+++ b/src/core/hle/kernel/vm_manager.h
@@ -75,7 +75,7 @@ struct VirtualMemoryArea {
75 /// Memory block backing this VMA. 75 /// Memory block backing this VMA.
76 std::shared_ptr<std::vector<u8>> backing_block = nullptr; 76 std::shared_ptr<std::vector<u8>> backing_block = nullptr;
77 /// Offset into the backing_memory the mapping starts from. 77 /// Offset into the backing_memory the mapping starts from.
78 u32 offset = 0; 78 size_t offset = 0;
79 79
80 // Settings for type = BackingMemory 80 // Settings for type = BackingMemory
81 /// Pointer backing this VMA. It will not be destroyed or freed when the VMA is removed. 81 /// Pointer backing this VMA. It will not be destroyed or freed when the VMA is removed.
@@ -141,7 +141,7 @@ public:
141 * @param state MemoryState tag to attach to the VMA. 141 * @param state MemoryState tag to attach to the VMA.
142 */ 142 */
143 ResultVal<VMAHandle> MapMemoryBlock(VAddr target, std::shared_ptr<std::vector<u8>> block, 143 ResultVal<VMAHandle> MapMemoryBlock(VAddr target, std::shared_ptr<std::vector<u8>> block,
144 u32 offset, u32 size, MemoryState state); 144 size_t offset, u32 size, MemoryState state);
145 145
146 /** 146 /**
147 * Maps an unmanaged host memory pointer at a given address. 147 * Maps an unmanaged host memory pointer at a given address.