diff options
| author | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2015-07-10 03:47:27 +0200 |
|---|---|---|
| committer | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2015-07-12 04:49:53 +0200 |
| commit | 51820691e77b816da7d4d66de68e3c0b79f2781a (patch) | |
| tree | bb84275d0a15650f3be8e428f2cce348cebe4ff9 /src/core/memory.cpp | |
| parent | Loader: Clean up 3dsx loader a bit, fixing a potential buffer overrun (diff) | |
| download | yuzu-51820691e77b816da7d4d66de68e3c0b79f2781a.tar yuzu-51820691e77b816da7d4d66de68e3c0b79f2781a.tar.gz yuzu-51820691e77b816da7d4d66de68e3c0b79f2781a.tar.bz2 yuzu-51820691e77b816da7d4d66de68e3c0b79f2781a.tar.lz yuzu-51820691e77b816da7d4d66de68e3c0b79f2781a.tar.xz yuzu-51820691e77b816da7d4d66de68e3c0b79f2781a.tar.zst yuzu-51820691e77b816da7d4d66de68e3c0b79f2781a.zip | |
Diffstat (limited to 'src/core/memory.cpp')
| -rw-r--r-- | src/core/memory.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/core/memory.cpp b/src/core/memory.cpp index 172ae9054..1f66bb27d 100644 --- a/src/core/memory.cpp +++ b/src/core/memory.cpp @@ -59,14 +59,12 @@ static void MapPages(u32 base, u32 size, u8* memory, PageType type) { while (base != end) { ASSERT_MSG(base < PageTable::NUM_ENTRIES, "out of range mapping at %08X", base); - if (current_page_table->attributes[base] != PageType::Unmapped && type != PageType::Unmapped) { - LOG_ERROR(HW_Memory, "overlapping memory ranges at %08X", base * PAGE_SIZE); - } current_page_table->attributes[base] = type; current_page_table->pointers[base] = memory; base += 1; - memory += PAGE_SIZE; + if (memory != nullptr) + memory += PAGE_SIZE; } } |