From 967e5629de4ffb49a193e73df388efae7b3eaa43 Mon Sep 17 00:00:00 2001
From: bunnei <bunneidev@gmail.com>
Date: Tue, 5 Aug 2014 20:05:06 -0400
Subject: MemMap: Added an error for unaligned 16-bit memory reads.

---
 src/core/mem_map_funcs.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'src/core/mem_map_funcs.cpp')

diff --git a/src/core/mem_map_funcs.cpp b/src/core/mem_map_funcs.cpp
index b4884d9d9..038d3bffa 100644
--- a/src/core/mem_map_funcs.cpp
+++ b/src/core/mem_map_funcs.cpp
@@ -232,6 +232,13 @@ u8 Read8(const u32 addr) {
 u16 Read16(const u32 addr) {
     u16_le data = 0;
     Read<u16_le>(data, addr);
+
+    // Check for 16-bit unaligned memory reads...
+    if (addr & 1) {
+        // TODO(bunnei): Implement 16-bit unaligned memory reads
+        ERROR_LOG(MEMMAP, "16-bit unaligned memory reads are not implemented!");
+    }
+
     return (u16)data;
 }
 
-- 
cgit v1.2.3