diff options
Diffstat (limited to 'src/core/mem_map_funcs.cpp')
| -rw-r--r-- | src/core/mem_map_funcs.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/core/mem_map_funcs.cpp b/src/core/mem_map_funcs.cpp index f35e25caf..184296287 100644 --- a/src/core/mem_map_funcs.cpp +++ b/src/core/mem_map_funcs.cpp | |||
| @@ -20,8 +20,8 @@ inline void _Read(T &var, const u32 addr) { | |||
| 20 | // Memory allocated for HLE use that can be addressed from the emulated application | 20 | // Memory allocated for HLE use that can be addressed from the emulated application |
| 21 | // The primary use of this is sharing a commandbuffer between the HLE OS (syscore) and the LLE | 21 | // The primary use of this is sharing a commandbuffer between the HLE OS (syscore) and the LLE |
| 22 | // core running the user application (appcore) | 22 | // core running the user application (appcore) |
| 23 | if (addr >= MEM_OSHLE_VADDR && addr < MEM_OSHLE_VADDR_END) { | 23 | if (addr >= HLE::CMD_BUFFER_ADDR && addr < HLE::CMD_BUFFER_ADDR_END) { |
| 24 | NOTICE_LOG(MEMMAP, "OSHLE read @ 0x%08X", addr); | 24 | HLE::Read<T>(var, addr); |
| 25 | 25 | ||
| 26 | // Hardware I/O register reads | 26 | // Hardware I/O register reads |
| 27 | // 0x10XXXXXX- is physical address space, 0x1EXXXXXX is virtual address space | 27 | // 0x10XXXXXX- is physical address space, 0x1EXXXXXX is virtual address space |
| @@ -58,13 +58,13 @@ inline void _Write(u32 addr, const T data) { | |||
| 58 | // Memory allocated for HLE use that can be addressed from the emulated application | 58 | // Memory allocated for HLE use that can be addressed from the emulated application |
| 59 | // The primary use of this is sharing a commandbuffer between the HLE OS (syscore) and the LLE | 59 | // The primary use of this is sharing a commandbuffer between the HLE OS (syscore) and the LLE |
| 60 | // core running the user application (appcore) | 60 | // core running the user application (appcore) |
| 61 | if (addr >= MEM_OSHLE_VADDR && addr < MEM_OSHLE_VADDR_END) { | 61 | if (addr >= HLE::CMD_BUFFER_ADDR && addr < HLE::CMD_BUFFER_ADDR_END) { |
| 62 | NOTICE_LOG(MEMMAP, "OSHLE write @ 0x%08X", addr); | 62 | HLE::Write<T>(addr, data); |
| 63 | 63 | ||
| 64 | // Hardware I/O register writes | 64 | // Hardware I/O register writes |
| 65 | // 0x10XXXXXX- is physical address space, 0x1EXXXXXX is virtual address space | 65 | // 0x10XXXXXX- is physical address space, 0x1EXXXXXX is virtual address space |
| 66 | } else if ((addr & 0xFF000000) == 0x10000000 || (addr & 0xFF000000) == 0x1E000000) { | 66 | } else if ((addr & 0xFF000000) == 0x10000000 || (addr & 0xFF000000) == 0x1E000000) { |
| 67 | HW::Write<const T>(addr, data); | 67 | HW::Write<T>(addr, data); |
| 68 | 68 | ||
| 69 | // ExeFS:/.code is loaded here: | 69 | // ExeFS:/.code is loaded here: |
| 70 | } else if ((addr & 0xFFF00000) == 0x00100000) { | 70 | } else if ((addr & 0xFFF00000) == 0x00100000) { |