diff options
Diffstat (limited to 'src/core/mem_map_funcs.cpp')
| -rw-r--r-- | src/core/mem_map_funcs.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/core/mem_map_funcs.cpp b/src/core/mem_map_funcs.cpp index b78821a3b..7f7e77233 100644 --- a/src/core/mem_map_funcs.cpp +++ b/src/core/mem_map_funcs.cpp | |||
| @@ -28,7 +28,7 @@ VAddr PhysicalToVirtualAddress(const PAddr addr) { | |||
| 28 | return addr - FCRAM_PADDR + FCRAM_VADDR; | 28 | return addr - FCRAM_PADDR + FCRAM_VADDR; |
| 29 | } | 29 | } |
| 30 | 30 | ||
| 31 | ERROR_LOG(MEMMAP, "Unknown physical address @ 0x%08x", addr); | 31 | LOG_ERROR(HW_Memory, "Unknown physical address @ 0x%08x", addr); |
| 32 | return addr; | 32 | return addr; |
| 33 | } | 33 | } |
| 34 | 34 | ||
| @@ -44,7 +44,7 @@ PAddr VirtualToPhysicalAddress(const VAddr addr) { | |||
| 44 | return addr - FCRAM_VADDR + FCRAM_PADDR; | 44 | return addr - FCRAM_VADDR + FCRAM_PADDR; |
| 45 | } | 45 | } |
| 46 | 46 | ||
| 47 | ERROR_LOG(MEMMAP, "Unknown virtual address @ 0x%08x", addr); | 47 | LOG_ERROR(HW_Memory, "Unknown virtual address @ 0x%08x", addr); |
| 48 | return addr; | 48 | return addr; |
| 49 | } | 49 | } |
| 50 | 50 | ||
| @@ -92,7 +92,7 @@ inline void Read(T &var, const VAddr vaddr) { | |||
| 92 | var = *((const T*)&g_vram[vaddr - VRAM_VADDR]); | 92 | var = *((const T*)&g_vram[vaddr - VRAM_VADDR]); |
| 93 | 93 | ||
| 94 | } else { | 94 | } else { |
| 95 | ERROR_LOG(MEMMAP, "unknown Read%lu @ 0x%08X", sizeof(var) * 8, vaddr); | 95 | LOG_ERROR(HW_Memory, "unknown Read%lu @ 0x%08X", sizeof(var) * 8, vaddr); |
| 96 | } | 96 | } |
| 97 | } | 97 | } |
| 98 | 98 | ||
| @@ -141,7 +141,7 @@ inline void Write(const VAddr vaddr, const T data) { | |||
| 141 | 141 | ||
| 142 | // Error out... | 142 | // Error out... |
| 143 | } else { | 143 | } else { |
| 144 | ERROR_LOG(MEMMAP, "unknown Write%lu 0x%08X @ 0x%08X", sizeof(data) * 8, (u32)data, vaddr); | 144 | LOG_ERROR(HW_Memory, "unknown Write%lu 0x%08X @ 0x%08X", sizeof(data) * 8, (u32)data, vaddr); |
| 145 | } | 145 | } |
| 146 | } | 146 | } |
| 147 | 147 | ||
| @@ -175,7 +175,7 @@ u8 *GetPointer(const VAddr vaddr) { | |||
| 175 | return g_vram + (vaddr - VRAM_VADDR); | 175 | return g_vram + (vaddr - VRAM_VADDR); |
| 176 | 176 | ||
| 177 | } else { | 177 | } else { |
| 178 | ERROR_LOG(MEMMAP, "unknown GetPointer @ 0x%08x", vaddr); | 178 | LOG_ERROR(HW_Memory, "unknown GetPointer @ 0x%08x", vaddr); |
| 179 | return 0; | 179 | return 0; |
| 180 | } | 180 | } |
| 181 | } | 181 | } |
| @@ -239,7 +239,7 @@ u16 Read16(const VAddr addr) { | |||
| 239 | // Check for 16-bit unaligned memory reads... | 239 | // Check for 16-bit unaligned memory reads... |
| 240 | if (addr & 1) { | 240 | if (addr & 1) { |
| 241 | // TODO(bunnei): Implement 16-bit unaligned memory reads | 241 | // TODO(bunnei): Implement 16-bit unaligned memory reads |
| 242 | ERROR_LOG(MEMMAP, "16-bit unaligned memory reads are not implemented!"); | 242 | LOG_ERROR(HW_Memory, "16-bit unaligned memory reads are not implemented!"); |
| 243 | } | 243 | } |
| 244 | 244 | ||
| 245 | return (u16)data; | 245 | return (u16)data; |