1 files changed, 11 insertions, 11 deletions

diff --git a/src/core/mem_map_funcs.cpp b/src/core/mem_map_funcs.cpp
index 90951812b..e8747840c 100644
--- a/src/core/mem_map_funcs.cpp
+++ b/src/core/mem_map_funcs.cpp
@@ -12,9 +12,9 @@
 
 namespace Memory {
 
-std::map<u32, MemoryBlock> g_heap_map;
-std::map<u32, MemoryBlock> g_heap_gsp_map;
-std::map<u32, MemoryBlock> g_shared_map;
+static std::map<u32, MemoryBlock> heap_map;
+static std::map<u32, MemoryBlock> heap_gsp_map;
+static std::map<u32, MemoryBlock> shared_map;
 
 /// Convert a physical address to virtual address
 VAddr PhysicalToVirtualAddress(const PAddr addr) {
@@ -92,7 +92,7 @@ inline void Read(T &var, const VAddr vaddr) {
         var = *((const T*)&g_vram[vaddr & VRAM_MASK]);
 
     } else {
-        ERROR_LOG(MEMMAP, "unknown Read%d @ 0x%08X", sizeof(var) * 8, vaddr);
+        ERROR_LOG(MEMMAP, "unknown Read%lu @ 0x%08X", sizeof(var) * 8, vaddr);
     }
 }
 
@@ -141,7 +141,7 @@ inline void Write(const VAddr vaddr, const T data) {
 
     // Error out...
     } else {
-        ERROR_LOG(MEMMAP, "unknown Write%d 0x%08X @ 0x%08X", sizeof(data) * 8, data, vaddr);
+        ERROR_LOG(MEMMAP, "unknown Write%lu 0x%08X @ 0x%08X", sizeof(data) * 8, (u32)data, vaddr);
     }
 }
 
@@ -194,11 +194,11 @@ u32 MapBlock_Heap(u32 size, u32 operation, u32 permissions) {
     block.operation     = operation;
     block.permissions   = permissions;
 
-    if (g_heap_map.size() > 0) {
-        const MemoryBlock last_block = g_heap_map.rbegin()->second;
+    if (heap_map.size() > 0) {
+        const MemoryBlock last_block = heap_map.rbegin()->second;
         block.address = last_block.address + last_block.size;
     }
-    g_heap_map[block.GetVirtualAddress()] = block;
+    heap_map[block.GetVirtualAddress()] = block;
 
     return block.GetVirtualAddress();
 }
@@ -217,11 +217,11 @@ u32 MapBlock_HeapGSP(u32 size, u32 operation, u32 permissions) {
     block.operation     = operation;
     block.permissions   = permissions;
 
-    if (g_heap_gsp_map.size() > 0) {
-        const MemoryBlock last_block = g_heap_gsp_map.rbegin()->second;
+    if (heap_gsp_map.size() > 0) {
+        const MemoryBlock last_block = heap_gsp_map.rbegin()->second;
         block.address = last_block.address + last_block.size;
     }
-    g_heap_gsp_map[block.GetVirtualAddress()] = block;
+    heap_gsp_map[block.GetVirtualAddress()] = block;
 
     return block.GetVirtualAddress();
 }