diff options
| author | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2015-05-12 23:17:30 -0300 |
|---|---|---|
| committer | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2015-05-15 00:04:39 -0300 |
| commit | ec514b16a66c0aca19e3f641836d836eacd59e75 (patch) | |
| tree | 14bbe427b74a2e0d8f0e015f3898cf79f13adb10 /src/core/memory.cpp | |
| parent | 7ada357b2d12cf616672425a8961804b865354d6 (diff) | |
Memory: Read ConfigMem directly from Memory::Read
Diffstat (limited to 'src/core/memory.cpp')
| -rw-r--r-- | src/core/memory.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core/memory.cpp b/src/core/memory.cpp index 517167b0ad..aee1674b6b 100644 --- a/src/core/memory.cpp +++ b/src/core/memory.cpp @@ -42,7 +42,8 @@ inline void Read(T &var, const VAddr vaddr) { // Config memory } else if ((vaddr >= CONFIG_MEMORY_VADDR) && (vaddr < CONFIG_MEMORY_VADDR_END)) { - ConfigMem::Read<T>(var, vaddr); + const u8* raw_memory = (const u8*)&ConfigMem::config_mem; + var = *((const T*)&raw_memory[vaddr - CONFIG_MEMORY_VADDR]); // Shared page } else if ((vaddr >= SHARED_PAGE_VADDR) && (vaddr < SHARED_PAGE_VADDR_END)) { |