From d4fb8a887cd88f2cbbf34b3f97e595070e231997 Mon Sep 17 00:00:00 2001 From: bunnei Date: Sun, 25 Mar 2018 00:01:13 -0400 Subject: memory: Fix cast for ReadBlock/WriteBlock/ZeroBlock/CopyBlock. --- src/core/memory.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'src/core') diff --git a/src/core/memory.cpp b/src/core/memory.cpp index 47c4828f7..291bf066f 100644 --- a/src/core/memory.cpp +++ b/src/core/memory.cpp @@ -439,7 +439,8 @@ void ReadBlock(const Kernel::Process& process, const VAddr src_addr, void* dest_ size_t page_offset = src_addr & PAGE_MASK; while (remaining_size > 0) { - const size_t copy_amount = std::min(PAGE_SIZE - page_offset, remaining_size); + const size_t copy_amount = + std::min(static_cast(PAGE_SIZE) - page_offset, remaining_size); const VAddr current_vaddr = static_cast((page_index << PAGE_BITS) + page_offset); switch (page_table.attributes[page_index]) { @@ -501,7 +502,8 @@ void WriteBlock(const Kernel::Process& process, const VAddr dest_addr, const voi size_t page_offset = dest_addr & PAGE_MASK; while (remaining_size > 0) { - const size_t copy_amount = std::min(PAGE_SIZE - page_offset, remaining_size); + const size_t copy_amount = + std::min(static_cast(PAGE_SIZE) - page_offset, remaining_size); const VAddr current_vaddr = static_cast((page_index << PAGE_BITS) + page_offset); switch (page_table.attributes[page_index]) { @@ -548,7 +550,8 @@ void ZeroBlock(const Kernel::Process& process, const VAddr dest_addr, const size static const std::array zeros = {}; while (remaining_size > 0) { - const size_t copy_amount = std::min(PAGE_SIZE - page_offset, remaining_size); + const size_t copy_amount = + std::min(static_cast(PAGE_SIZE) - page_offset, remaining_size); const VAddr current_vaddr = static_cast((page_index << PAGE_BITS) + page_offset); switch (page_table.attributes[page_index]) { @@ -587,7 +590,8 @@ void CopyBlock(const Kernel::Process& process, VAddr dest_addr, VAddr src_addr, size_t page_offset = src_addr & PAGE_MASK; while (remaining_size > 0) { - const size_t copy_amount = std::min(PAGE_SIZE - page_offset, remaining_size); + const size_t copy_amount = + std::min(static_cast(PAGE_SIZE) - page_offset, remaining_size); const VAddr current_vaddr = static_cast((page_index << PAGE_BITS) + page_offset); switch (page_table.attributes[page_index]) { -- cgit v1.2.3