From 2b6a587c2db4eb1d56d23bf56899762da125a360 Mon Sep 17 00:00:00 2001
From: zeromus <zeromus@users.sf.net>
Date: Wed, 8 Oct 2008 06:52:30 +0000
Subject: [PATCH] start making my debugging crap conditionally compiled

---
 desmume/src/MMU.cpp        |  9 +++++----
 desmume/src/zero_private.h | 12 ++++++++++++
 2 files changed, 17 insertions(+), 4 deletions(-)
 create mode 100644 desmume/src/zero_private.h

diff --git a/desmume/src/MMU.cpp b/desmume/src/MMU.cpp
index 6dfa3b010..028d5ee14 100644
--- a/desmume/src/MMU.cpp
+++ b/desmume/src/MMU.cpp
@@ -36,6 +36,7 @@
 #include "gfx3d.h"
 #include "rtc.h"
 #include "GPU_osd.h"
+#include "zero_private.h"
 
 #define ROM_MASK 3
 
@@ -3634,14 +3635,14 @@ struct armcpu_memory_iface arm9_direct_memory_iface = {
 
 u32 FASTCALL MMU_read32(u32 proc, u32 adr) 
 {
-	assert((adr&3)==0);
+	ASSERT_UNALIGNED((adr&3)==0);
 	if(proc==0) return _MMU_read32<0ul>(adr);
 	else return _MMU_read32<1ul>(adr);
 }
 
 u16 FASTCALL MMU_read16(u32 proc, u32 adr) 
 {
-	assert((adr&1)==0);
+	ASSERT_UNALIGNED((adr&1)==0);
 	if(proc==0) return _MMU_read16<0ul>(adr);
 	else return _MMU_read16<1ul>(adr);
 }
@@ -3654,14 +3655,14 @@ u8 FASTCALL MMU_read8(u32 proc, u32 adr)
 
 void FASTCALL MMU_write32(u32 proc, u32 adr, u32 val)
 {
-	assert((adr&3)==0);
+	ASSERT_UNALIGNED((adr&3)==0);
 	if(proc==0) _MMU_write32<0ul>(adr,val);
 	else _MMU_write32<1ul>(adr,val);
 }
 
 void FASTCALL MMU_write16(u32 proc, u32 adr, u16 val)
 {
-	assert((adr&1)==0);
+	ASSERT_UNALIGNED((adr&1)==0);
 	if(proc==0) _MMU_write16<0ul>(adr,val);
 	else _MMU_write16<1ul>(adr,val);
 }
diff --git a/desmume/src/zero_private.h b/desmume/src/zero_private.h
new file mode 100644
index 000000000..16279c0ae
--- /dev/null
+++ b/desmume/src/zero_private.h
@@ -0,0 +1,12 @@
+#ifndef _zero_private_h
+#define _zero_private_h
+
+//#define ZERO_MODE
+
+#ifdef ZERO_MODE
+#define ASSERT_UNALIGNED(x) assert(x)
+#else
+#define ASSERT_UNALIGNED(x)
+#endif
+
+#endif