diff options
| author |  bunnei | 2014-08-06 18:30:01 -0400 |
|---|---|---|
| committer | bunnei | 2014-08-06 18:30:01 -0400 |
| commit | d0c179485392903fa413543d6b6908d45bc1f0fb (patch) | |
| tree | a2e85ca4b091042e2e45446fda5b36bf6f62d2b3 /src/core/mem_map_funcs.cpp | |
| parent | Merge pull request #36 from bunnei/fix-memory-unaligned-reads (diff) | |
| parent | GPU: Updated g_last_ticks variable to be more descriptive (represents CPU tic... (diff) | |
| download | yuzu-d0c179485392903fa413543d6b6908d45bc1f0fb.tar.gz yuzu-d0c179485392903fa413543d6b6908d45bc1f0fb.tar.xz yuzu-d0c179485392903fa413543d6b6908d45bc1f0fb.zip | |
Merge pull request #34 from bunnei/gsp-command-synch
Gsp command synch
Diffstat (limited to 'src/core/mem_map_funcs.cpp')
| -rw-r--r-- | src/core/mem_map_funcs.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/mem_map_funcs.cpp b/src/core/mem_map_funcs.cpp index 038d3bffa..305be8468 100644 --- a/src/core/mem_map_funcs.cpp +++ b/src/core/mem_map_funcs.cpp | |||
| @@ -168,7 +168,7 @@ u8 *GetPointer(const u32 addr) { | |||
| 168 | return g_system_mem + (vaddr & SYSTEM_MEMORY_MASK); | 168 | return g_system_mem + (vaddr & SYSTEM_MEMORY_MASK); |
| 169 | 169 | ||
| 170 | // VRAM | 170 | // VRAM |
| 171 | } else if ((vaddr > VRAM_VADDR) && (vaddr < VRAM_VADDR_END)) { | 171 | } else if ((vaddr >= VRAM_VADDR) && (vaddr < VRAM_VADDR_END)) { |
| 172 | return g_vram + (vaddr & VRAM_MASK); | 172 | return g_vram + (vaddr & VRAM_MASK); |
| 173 | 173 | ||
| 174 | } else { | 174 | } else { |