diff options
| author | 2014-04-25 15:27:47 -0400 | |
|---|---|---|
| committer | 2014-04-25 15:27:47 -0400 | |
| commit | 2672e7d88361528c9b2748114f6874d3474cb4da (patch) | |
| tree | 529c1eca141a4c2aab67f662a0d546d1b6535993 /src/core/mem_map_funcs.cpp | |
| parent | fixed bug where svc_ControlMemory was not properly getting passed in parameters (diff) | |
| download | yuzu-2672e7d88361528c9b2748114f6874d3474cb4da.tar.gz yuzu-2672e7d88361528c9b2748114f6874d3474cb4da.tar.xz yuzu-2672e7d88361528c9b2748114f6874d3474cb4da.zip | |
removed some cruft
Diffstat (limited to 'src/core/mem_map_funcs.cpp')
| -rw-r--r-- | src/core/mem_map_funcs.cpp | 8 |
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) { | |||
| 56 | 56 | ||
| 57 | // Shared memory | 57 | // Shared memory |
| 58 | } else if ((vaddr >= SHARED_MEMORY_VADDR) && (vaddr < SHARED_MEMORY_VADDR_END)) { | 58 | } else if ((vaddr >= SHARED_MEMORY_VADDR) && (vaddr < SHARED_MEMORY_VADDR_END)) { |
| 59 | NOTICE_LOG(OSHLE, "wtf read"); | ||
| 60 | var = *((const T*)&g_shared_mem[vaddr & SHARED_MEMORY_MASK]); | 59 | var = *((const T*)&g_shared_mem[vaddr & SHARED_MEMORY_MASK]); |
| 61 | 60 | ||
| 62 | /*else if ((vaddr & 0x3F800000) == 0x04000000) { | ||
| 63 | var = *((const T*)&m_pVRAM[vaddr & VRAM_MASK]);*/ | ||
| 64 | |||
| 65 | } else { | 61 | } else { |
| 66 | //_assert_msg_(MEMMAP, false, "unknown Read%d @ 0x%08X", sizeof(var) * 8, vaddr); | 62 | _assert_msg_(MEMMAP, false, "unknown Read%d @ 0x%08X", sizeof(var) * 8, vaddr); |
| 67 | } | 63 | } |
| 68 | } | 64 | } |
| 69 | 65 | ||
| @@ -92,7 +88,6 @@ inline void _Write(u32 addr, const T data) { | |||
| 92 | 88 | ||
| 93 | // Shared memory | 89 | // Shared memory |
| 94 | } else if ((vaddr >= SHARED_MEMORY_VADDR) && (vaddr < SHARED_MEMORY_VADDR_END)) { | 90 | } else if ((vaddr >= SHARED_MEMORY_VADDR) && (vaddr < SHARED_MEMORY_VADDR_END)) { |
| 95 | NOTICE_LOG(OSHLE, "wtf read"); | ||
| 96 | *(T*)&g_shared_mem[vaddr & SHARED_MEMORY_MASK] = data; | 91 | *(T*)&g_shared_mem[vaddr & SHARED_MEMORY_MASK] = data; |
| 97 | 92 | ||
| 98 | } else if ((vaddr & 0xFF000000) == 0x14000000) { | 93 | } else if ((vaddr & 0xFF000000) == 0x14000000) { |
| @@ -128,7 +123,6 @@ u8 *GetPointer(const u32 addr) { | |||
| 128 | 123 | ||
| 129 | // Shared memory | 124 | // Shared memory |
| 130 | } else if ((vaddr > SHARED_MEMORY_VADDR) && (vaddr < SHARED_MEMORY_VADDR_END)) { | 125 | } else if ((vaddr > SHARED_MEMORY_VADDR) && (vaddr < SHARED_MEMORY_VADDR_END)) { |
| 131 | NOTICE_LOG(OSHLE, "wtf read"); | ||
| 132 | return g_shared_mem + (vaddr & SHARED_MEMORY_MASK); | 126 | return g_shared_mem + (vaddr & SHARED_MEMORY_MASK); |
| 133 | 127 | ||
| 134 | } else { | 128 | } else { |