diff options
Diffstat (limited to 'src/core/memory.cpp')
| -rw-r--r-- | src/core/memory.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/memory.cpp b/src/core/memory.cpp index bf2493270..2ac3e7de4 100644 --- a/src/core/memory.cpp +++ b/src/core/memory.cpp | |||
| @@ -364,7 +364,7 @@ u64 Read64(const VAddr addr) { | |||
| 364 | return Read<u64_le>(addr); | 364 | return Read<u64_le>(addr); |
| 365 | } | 365 | } |
| 366 | 366 | ||
| 367 | void ReadBlock(const VAddr src_addr, u8* dest_buffer, const size_t size) { | 367 | void ReadBlock(const VAddr src_addr, void* dest_buffer, const size_t size) { |
| 368 | size_t remaining_size = size; | 368 | size_t remaining_size = size; |
| 369 | size_t page_index = src_addr >> PAGE_BITS; | 369 | size_t page_index = src_addr >> PAGE_BITS; |
| 370 | size_t page_offset = src_addr & PAGE_MASK; | 370 | size_t page_offset = src_addr & PAGE_MASK; |
| @@ -398,7 +398,7 @@ void ReadBlock(const VAddr src_addr, u8* dest_buffer, const size_t size) { | |||
| 398 | 398 | ||
| 399 | page_index++; | 399 | page_index++; |
| 400 | page_offset = 0; | 400 | page_offset = 0; |
| 401 | dest_buffer += copy_amount; | 401 | dest_buffer = static_cast<u8*>(dest_buffer) + copy_amount; |
| 402 | remaining_size -= copy_amount; | 402 | remaining_size -= copy_amount; |
| 403 | } | 403 | } |
| 404 | } | 404 | } |
| @@ -419,7 +419,7 @@ void Write64(const VAddr addr, const u64 data) { | |||
| 419 | Write<u64_le>(addr, data); | 419 | Write<u64_le>(addr, data); |
| 420 | } | 420 | } |
| 421 | 421 | ||
| 422 | void WriteBlock(const VAddr dest_addr, const u8* src_buffer, const size_t size) { | 422 | void WriteBlock(const VAddr dest_addr, const void* src_buffer, const size_t size) { |
| 423 | size_t remaining_size = size; | 423 | size_t remaining_size = size; |
| 424 | size_t page_index = dest_addr >> PAGE_BITS; | 424 | size_t page_index = dest_addr >> PAGE_BITS; |
| 425 | size_t page_offset = dest_addr & PAGE_MASK; | 425 | size_t page_offset = dest_addr & PAGE_MASK; |
| @@ -452,7 +452,7 @@ void WriteBlock(const VAddr dest_addr, const u8* src_buffer, const size_t size) | |||
| 452 | 452 | ||
| 453 | page_index++; | 453 | page_index++; |
| 454 | page_offset = 0; | 454 | page_offset = 0; |
| 455 | src_buffer += copy_amount; | 455 | src_buffer = static_cast<const u8*>(src_buffer) + copy_amount; |
| 456 | remaining_size -= copy_amount; | 456 | remaining_size -= copy_amount; |
| 457 | } | 457 | } |
| 458 | } | 458 | } |