summaryrefslogtreecommitdiffstats
path: root/src/core/mem_map_funcs.cpp
diff options
context:
space:
mode:
authorbunnei <ericbunnie@gmail.com>2014-04-25 21:27:47 +0200
committerbunnei <ericbunnie@gmail.com>2014-04-25 21:27:47 +0200
commit2672e7d88361528c9b2748114f6874d3474cb4da (patch)
tree529c1eca141a4c2aab67f662a0d546d1b6535993 /src/core/mem_map_funcs.cpp
parentfixed bug where svc_ControlMemory was not properly getting passed in parameters (diff)
downloadyuzu-2672e7d88361528c9b2748114f6874d3474cb4da.tar
yuzu-2672e7d88361528c9b2748114f6874d3474cb4da.tar.gz
yuzu-2672e7d88361528c9b2748114f6874d3474cb4da.tar.bz2
yuzu-2672e7d88361528c9b2748114f6874d3474cb4da.tar.lz
yuzu-2672e7d88361528c9b2748114f6874d3474cb4da.tar.xz
yuzu-2672e7d88361528c9b2748114f6874d3474cb4da.tar.zst
yuzu-2672e7d88361528c9b2748114f6874d3474cb4da.zip
Diffstat (limited to 'src/core/mem_map_funcs.cpp')
-rw-r--r--src/core/mem_map_funcs.cpp8
1 files changed, 1 insertions, 7 deletions
diff --git a/src/core/mem_map_funcs.cpp b/src/core/mem_map_funcs.cpp
index b2c39c57c..832957cb1 100644
--- a/src/core/mem_map_funcs.cpp
+++ b/src/core/mem_map_funcs.cpp
@@ -56,14 +56,10 @@ inline void _Read(T &var, const u32 addr) {
// Shared memory
} else if ((vaddr >= SHARED_MEMORY_VADDR) && (vaddr < SHARED_MEMORY_VADDR_END)) {
- NOTICE_LOG(OSHLE, "wtf read");
var = *((const T*)&g_shared_mem[vaddr & SHARED_MEMORY_MASK]);
- /*else if ((vaddr & 0x3F800000) == 0x04000000) {
- var = *((const T*)&m_pVRAM[vaddr & VRAM_MASK]);*/
-
} else {
- //_assert_msg_(MEMMAP, false, "unknown Read%d @ 0x%08X", sizeof(var) * 8, vaddr);
+ _assert_msg_(MEMMAP, false, "unknown Read%d @ 0x%08X", sizeof(var) * 8, vaddr);
}
}
@@ -92,7 +88,6 @@ inline void _Write(u32 addr, const T data) {
// Shared memory
} else if ((vaddr >= SHARED_MEMORY_VADDR) && (vaddr < SHARED_MEMORY_VADDR_END)) {
- NOTICE_LOG(OSHLE, "wtf read");
*(T*)&g_shared_mem[vaddr & SHARED_MEMORY_MASK] = data;
} else if ((vaddr & 0xFF000000) == 0x14000000) {
@@ -128,7 +123,6 @@ u8 *GetPointer(const u32 addr) {
// Shared memory
} else if ((vaddr > SHARED_MEMORY_VADDR) && (vaddr < SHARED_MEMORY_VADDR_END)) {
- NOTICE_LOG(OSHLE, "wtf read");
return g_shared_mem + (vaddr & SHARED_MEMORY_MASK);
} else {