From d27d4f9b00a508bd7e1407af81b98e1bf88fc18c Mon Sep 17 00:00:00 2001
From: Flyinghead <raphael.jean@gmail.com>
Date: Thu, 18 Oct 2018 09:55:17 +0000
Subject: [PATCH] Naomi: fix for ARM

---
 core/hw/maple/maple_devs.cpp |  8 ++++----
 core/hw/naomi/naomi.cpp      |  6 +++---
 core/rec-ARM/ngen_arm.S      |  4 +++-
 shell/linux/Makefile         | 10 +++++-----
 4 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/core/hw/maple/maple_devs.cpp b/core/hw/maple/maple_devs.cpp
index ef8c90b1d..5a943bfd4 100755
--- a/core/hw/maple/maple_devs.cpp
+++ b/core/hw/maple/maple_devs.cpp
@@ -1129,7 +1129,7 @@ struct maple_keyboard : maple_base
 			return MDRS_DataTransfer;
 
 		default:
-			printf("Keyboard: unknown MAPLE COMMAND %d\n", cmd);
+			//printf("Keyboard: unknown MAPLE COMMAND %d\n", cmd);
 			return MDRE_UnknownCmd;
 		}
 	}
@@ -1236,7 +1236,7 @@ struct maple_mouse : maple_base
 			return MDRS_DataTransfer;
 
 		default:
-			printf("Mouse: unknown MAPLE COMMAND %d\n", cmd);
+			//printf("Mouse: unknown MAPLE COMMAND %d\n", cmd);
 			return MDRE_UnknownCmd;
 		}
 	}
@@ -1320,7 +1320,7 @@ struct maple_lightgun : maple_base
 		return MDRS_DataTransfer;
 
 		default:
-			printf("Light gun: unknown MAPLE COMMAND %d\n", cmd);
+			//printf("Light gun: unknown MAPLE COMMAND %d\n", cmd);
 			return MDRE_UnknownCmd;
 		}
 	}
@@ -1917,7 +1917,7 @@ struct maple_naomi_jamma : maple_sega_controller
 			break;
 
 		default:
-			printf("Unknown Maple command %x\n", cmd);
+			//printf("Unknown Maple command %x\n", cmd);
 			w8(MDRE_UnknownCmd);
 			w8(0x00);
 			w8(0x00);
diff --git a/core/hw/naomi/naomi.cpp b/core/hw/naomi/naomi.cpp
index 24f58cbc3..aa27296df 100644
--- a/core/hw/naomi/naomi.cpp
+++ b/core/hw/naomi/naomi.cpp
@@ -354,13 +354,13 @@ u32  _ReadMem_naomi(u32 Addr, u32 sz)
 {
 	verify(sz!=1);
 
-	printf("naomi?WTF? ReadMem: %X, %d\n", Addr, sz);
+	//printf("naomi?WTF? ReadMem: %X, %d\n", Addr, sz);
 	return 1;
 
 }
 void _WriteMem_naomi(u32 Addr, u32 data, u32 sz)
 {
-	printf("naomi?WTF? WriteMem: %X <= %X, %d\n", Addr, data, sz);
+	//printf("naomi?WTF? WriteMem: %X <= %X, %d\n", Addr, data, sz);
 }
 
 
@@ -500,7 +500,7 @@ u32  ReadMem_naomi(u32 Addr, u32 sz)
 
 	default: break;
 	}
-	printf("naomi?WTF? ReadMem: %X, %d\n", Addr, sz);
+	//printf("naomi?WTF? ReadMem: %X, %d\n", Addr, sz);
 	return 0;
 
 }
diff --git a/core/rec-ARM/ngen_arm.S b/core/rec-ARM/ngen_arm.S
index a5d7ea4c0..769931738 100644
--- a/core/rec-ARM/ngen_arm.S
+++ b/core/rec-ARM/ngen_arm.S
@@ -180,9 +180,11 @@ CSYM(no_update):              @ next_pc _MUST_ be on r4 *R4 NOT R0 anymore*
 #if DC_PLATFORM == DC_PLATFORM_NAOMI
 	sub r2,r8,#0x4100000
 	ubfx r1,r4,#1,#24
-#else
+#elif DC_PLATFORM == DC_PLATFORM_DREAMCAST
 	sub r2,r8,#0x2100000
 	ubfx r1,r4,#1,#23
+#else
+#error "Define DC_PLATFORM"
 #endif
 	ldr pc,[r2,r1,lsl #2]
 
diff --git a/shell/linux/Makefile b/shell/linux/Makefile
index 09fe8af6d..9efca19f0 100644
--- a/shell/linux/Makefile
+++ b/shell/linux/Makefile
@@ -282,11 +282,6 @@ MAN_DIR ?= ${PREFIX}/share/man/man1
 MENUENTRY_DIR ?= ${PREFIX}/share/applications
 ICON_DIR ?= ${PREFIX}/share/pixmaps
 
-ifndef NOT_ARM
-    AS=${CC_PREFIX}gcc
-    ASFLAGS += $(CFLAGS)
-endif
-
 ifdef USE_SDL
     CXXFLAGS += `sdl2-config --cflags` -D USE_SDL
     LIBS += `sdl2-config --libs`
@@ -387,6 +382,11 @@ else
     EXECUTABLE_NAME=reicast
 endif
 
+ifndef NOT_ARM
+    AS=${CC_PREFIX}gcc
+    ASFLAGS += $(CFLAGS)
+endif
+
 CHAR_EMPTY:=
 CHAR_SPACE:=$(CHAR_EMPTY) $(CHAR_EMPTY)
 BUILDDIR:=obj-$(DC_PLATFORM)-$(subst $(CHAR_SPACE),-,$(platform))