diff options
| author | bunnei <bunneidev@gmail.com> | 2018-02-23 08:51:52 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-23 08:51:52 -0800 |
| commit | 6bf71085459e22b6d43a8c6ba8986b4e94ceead3 (patch) | |
| tree | fc49393b5b0566579d85a87b969485bb6d2cd9c9 /src/core/memory.cpp | |
| parent | 7f0ecbf8596a51da47707de147669267efaa123f (diff) | |
| parent | 32d127ad3e94b09566ca17b83072ff42018b02b3 (diff) | |
Merge pull request #210 from MerryMage/f/dynarmic/sysreg
arm_dynarmic: Implement system registers and provide more hooks
Diffstat (limited to 'src/core/memory.cpp')
| -rw-r--r-- | src/core/memory.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/core/memory.cpp b/src/core/memory.cpp index cc1ed16b6..ce62666d7 100644 --- a/src/core/memory.cpp +++ b/src/core/memory.cpp @@ -118,6 +118,11 @@ boost::optional<T> ReadSpecial(VAddr addr); template <typename T> T Read(const VAddr vaddr) { + if ((vaddr >> PAGE_BITS) >= PAGE_TABLE_NUM_ENTRIES) { + LOG_ERROR(HW_Memory, "Read%lu after page table @ 0x%016" PRIX64, sizeof(T) * 8, vaddr); + return 0; + } + const PageType type = current_page_table->attributes[vaddr >> PAGE_BITS]; switch (type) { case PageType::Unmapped: @@ -146,6 +151,12 @@ bool WriteSpecial(VAddr addr, const T data); template <typename T> void Write(const VAddr vaddr, const T data) { + if ((vaddr >> PAGE_BITS) >= PAGE_TABLE_NUM_ENTRIES) { + LOG_ERROR(HW_Memory, "Write%lu after page table 0x%08X @ 0x%016" PRIX64, sizeof(data) * 8, + (u32)data, vaddr); + return; + } + const PageType type = current_page_table->attributes[vaddr >> PAGE_BITS]; switch (type) { case PageType::Unmapped: |