From: Frode Solheim <frode@fs-uae.net>
Date: Mon, 7 Sep 2015 19:21:32 +0000 (+0200)
Subject: JIT: harmless restructuring of get_n_addr
X-Git-Tag: 3200~70^2~24
X-Git-Url: https://git.unchartedbackwaters.co.uk/w/?a=commitdiff_plain;h=e202dde56054ab16ddd837558636e3dff4352b8c;p=francis%2Fwinuae.git

JIT: harmless restructuring of get_n_addr
---

diff --git a/jit/compemu_support.cpp b/jit/compemu_support.cpp
index 3b8cf90d..47ad59ed 100644
--- a/jit/compemu_support.cpp
+++ b/jit/compemu_support.cpp
@@ -3055,8 +3055,14 @@ void readlong(int address, int dest, int tmp)
 		readmem_real(address,dest,4,tmp);
 }
 
-static inline void get_n_addr_real(int address, int dest, int tmp)
+void get_n_addr(int address, int dest, int tmp)
 {
+	if (special_mem || distrust_addr()) {
+		/* This one might appear a bit odd... */
+		readmem(address,dest,24,4,tmp);
+		return;
+	}
+
 	// a is the register containing the virtual address
 	// after the offset had been fetched
 	int a=tmp;
@@ -3091,20 +3097,6 @@ static inline void get_n_addr_real(int address, int dest, int tmp)
 	forget_about(tmp);
 }
 
-/* This one might appear a bit odd... */
-static inline void get_n_addr_old(int address, int dest, int tmp)
-{
-	readmem(address,dest,24,4,tmp);
-}
-
-void get_n_addr(int address, int dest, int tmp)
-{
-	if (special_mem || distrust_addr())
-		get_n_addr_old(address,dest,tmp);
-	else
-		get_n_addr_real(address,dest,tmp);
-}
-
 void get_n_addr_jmp(int address, int dest, int tmp)
 {
 #if 0