From 3858c73982f070b9d468620dd98472072d21077e Mon Sep 17 00:00:00 2001
From: Frode Solheim <frode@fs-uae.net>
Date: Mon, 7 Sep 2015 21:20:33 +0200
Subject: [PATCH] JIT: RETURN define in gencomp.cpp

---
 jit/gencomp.cpp | 44 +++++++++-----------------------------------
 1 file changed, 9 insertions(+), 35 deletions(-)

diff --git a/jit/gencomp.cpp b/jit/gencomp.cpp
index 386cae96..50945b30 100644
--- a/jit/gencomp.cpp
+++ b/jit/gencomp.cpp
@@ -41,9 +41,11 @@
 #ifdef UAE
 #define JIT_PATH "jit/"
 #define GEN_PATH "jit/"
+#define RETURN "return 0;"
 #else
 #define JIT_PATH "compiler/"
 #define GEN_PATH ""
+#define RETURN "return;"
 #endif
 
 #define BOOL_TYPE "int"
@@ -1915,11 +1917,7 @@ gen_opcode (unsigned long int opcode)
 	if (curi->smode==Dreg) {
 	    comprintf("if ((uae_u32)srcreg==(uae_u32)dstreg) {\n"
 		"  FAIL(1);\n"
-#ifdef UAE
-		"  return 0;\n"
-#else
-		"  return;\n"
-#endif
+		"  " RETURN "\n"
 		"} \n");
 	    start_brace();
 	}
@@ -2086,11 +2084,7 @@ gen_opcode (unsigned long int opcode)
 	if (curi->smode==Dreg) {
 	    comprintf("if ((uae_u32)srcreg==(uae_u32)dstreg) {\n"
 		"  FAIL(1);\n"
-#ifdef UAE
-		"  return 0;\n"
-#else
-		"  return;\n"
-#endif
+		"  " RETURN "\n"
 		"} \n");
 	    start_brace();
 	}
@@ -2101,11 +2095,7 @@ gen_opcode (unsigned long int opcode)
 	   thing ;-) */
 	comprintf("if (needed_flags & FLAG_V) {\n"
 		  "  FAIL(1);\n"
-#ifdef UAE
-		  "  return 0;\n"
-#else
-		  "  return;\n"
-#endif
+		  "  " RETURN "\n"
 		  "} \n");
 
 	genamode (curi->smode, "srcreg", curi->size, "cnt", 1, 0);
@@ -2240,11 +2230,7 @@ gen_opcode (unsigned long int opcode)
 	if (curi->smode==Dreg) {
 	    comprintf("if ((uae_u32)srcreg==(uae_u32)dstreg) {\n"
 		"  FAIL(1);\n"
-#ifdef UAE
-		"  return 0;\n"
-#else
-		"  return;\n"
-#endif
+		"  " RETURN "\n"
 		"} \n");
 	    start_brace();
 	}
@@ -2379,11 +2365,7 @@ gen_opcode (unsigned long int opcode)
 	if (curi->smode==Dreg) {
 		comprintf("if ((uae_u32)srcreg==(uae_u32)dstreg) {\n"
 				"  FAIL(1);\n"
-#ifdef UAE
-				"  return 0;\n"
-#else
-				"  return;\n"
-#endif
+				"  " RETURN "\n"
 				"} \n");
 		start_brace();
 	}
@@ -2520,11 +2502,7 @@ gen_opcode (unsigned long int opcode)
 	if (curi->smode==Dreg) {
 	    comprintf("if ((uae_u32)srcreg==(uae_u32)dstreg) {\n"
 		"  FAIL(1);\n"
-#ifdef UAE
-		"  return 0;\n"
-#else
-		"  return;\n"
-#endif
+		"  " RETURN "\n"
 		"} \n");
 	    start_brace();
 	}
@@ -2559,11 +2537,7 @@ gen_opcode (unsigned long int opcode)
 	if (curi->smode==Dreg) {
 	    comprintf("if ((uae_u32)srcreg==(uae_u32)dstreg) {\n"
 		"  FAIL(1);\n"
-#ifdef UAE
-		"  return 0;\n"
-#else
-		"  return;\n"
-#endif
+		"  " RETURN "\n"
 		"} \n");
 	    start_brace();
 	}
-- 
2.47.3