diff options
| author | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2015-05-13 04:17:30 +0200 |
|---|---|---|
| committer | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2015-05-15 05:04:39 +0200 |
| commit | ec514b16a66c0aca19e3f641836d836eacd59e75 (patch) | |
| tree | 14bbe427b74a2e0d8f0e015f3898cf79f13adb10 /src/core/memory.cpp | |
| parent | Memmap: Re-organize memory function in two files (diff) | |
| download | yuzu-ec514b16a66c0aca19e3f641836d836eacd59e75.tar yuzu-ec514b16a66c0aca19e3f641836d836eacd59e75.tar.gz yuzu-ec514b16a66c0aca19e3f641836d836eacd59e75.tar.bz2 yuzu-ec514b16a66c0aca19e3f641836d836eacd59e75.tar.lz yuzu-ec514b16a66c0aca19e3f641836d836eacd59e75.tar.xz yuzu-ec514b16a66c0aca19e3f641836d836eacd59e75.tar.zst yuzu-ec514b16a66c0aca19e3f641836d836eacd59e75.zip | |
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 517167b0a..aee1674b6 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)) { |