diff options
author | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2015-07-14 04:28:13 +0200 |
---|---|---|
committer | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2015-08-16 06:03:43 +0200 |
commit | 785407d06f149921dffe5a268620ae566eca9f28 (patch) | |
tree | 2a5f668ac6222965afe305c2520e1688ccdcb2cd /src/core | |
parent | Merge pull request #1031 from bbarenblat/master (diff) | |
download | yuzu-785407d06f149921dffe5a268620ae566eca9f28.tar yuzu-785407d06f149921dffe5a268620ae566eca9f28.tar.gz yuzu-785407d06f149921dffe5a268620ae566eca9f28.tar.bz2 yuzu-785407d06f149921dffe5a268620ae566eca9f28.tar.lz yuzu-785407d06f149921dffe5a268620ae566eca9f28.tar.xz yuzu-785407d06f149921dffe5a268620ae566eca9f28.tar.zst yuzu-785407d06f149921dffe5a268620ae566eca9f28.zip |
Diffstat (limited to 'src/core')
-rw-r--r-- | src/core/hle/kernel/vm_manager.cpp | 2 | ||||
-rw-r--r-- | src/core/hle/kernel/vm_manager.h | 4 |
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 { } ResultVal<VMManager::VMAHandle> VMManager::MapMemoryBlock(VAddr target, - std::shared_ptr<std::vector<u8>> block, u32 offset, u32 size, MemoryState state) { + std::shared_ptr<std::vector<u8>> block, size_t offset, u32 size, MemoryState state) { ASSERT(block != nullptr); ASSERT(offset + size <= block->size()); 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 { /// Memory block backing this VMA. std::shared_ptr<std::vector<u8>> backing_block = nullptr; /// Offset into the backing_memory the mapping starts from. - u32 offset = 0; + size_t offset = 0; // Settings for type = BackingMemory /// Pointer backing this VMA. It will not be destroyed or freed when the VMA is removed. @@ -141,7 +141,7 @@ public: * @param state MemoryState tag to attach to the VMA. */ ResultVal<VMAHandle> MapMemoryBlock(VAddr target, std::shared_ptr<std::vector<u8>> block, - u32 offset, u32 size, MemoryState state); + size_t offset, u32 size, MemoryState state); /** * Maps an unmanaged host memory pointer at a given address. |