From: Frode Solheim <frode@fs-uae.net>
Date: Sun, 6 Sep 2015 20:24:30 +0000 (+0200)
Subject: JIT: use scratch_t
X-Git-Tag: 3200~79^2~20
X-Git-Url: https://git.unchartedbackwaters.co.uk/w/?a=commitdiff_plain;h=16b3f11cfe6165dc9cd71f00d0480ab626d77b3e;p=francis%2Fwinuae.git

JIT: use scratch_t
---

diff --git a/jit/compemu.h b/jit/compemu.h
index 538aca5a..3716ea8d 100644
--- a/jit/compemu.h
+++ b/jit/compemu.h
@@ -7,6 +7,10 @@ typedef uae_u64 uintptr;
 typedef uae_u32 uintptr;
 #endif
 
+/* ARAnyM uses fpu_register name, used in scratch_t */
+/* FIXME: check that no ARAnyM code assumes different floating point type */
+typedef fptype fpu_register;
+
 /* Flags for Bernie during development/debugging. Should go away eventually */
 #define DISTRUST_CONSISTENT_MEM 0
 #define TAGMASK 0x000fffff
diff --git a/jit/compemu_support.cpp b/jit/compemu_support.cpp
index 97e71d74..05ee8896 100644
--- a/jit/compemu_support.cpp
+++ b/jit/compemu_support.cpp
@@ -2297,10 +2297,6 @@ void sync_m68k_pc(void)
 	}
 }
 
-#ifdef UAE
-uae_u32 scratch[VREGS];
-fptype fscratch[VFREGS];
-#else
 /********************************************************************
  * Scratch registers management                                     *
  ********************************************************************/
@@ -2311,7 +2307,6 @@ struct scratch_t {
 };
 
 static scratch_t scratch;
-#endif
 
 /********************************************************************
  * Support functions exposed to newcpu                              *
@@ -2429,7 +2424,7 @@ void init_comp(void)
 			set_status(i,INMEM);
 		}
 		else
-			live.state[i].mem=scratch+i;
+			live.state[i].mem=scratch.regs+i;
 	}
 	live.state[PC_P].mem=(uae_u32*)&(regs.pc_p);
 	live.state[PC_P].needflush=NF_TOMEM;
@@ -2462,7 +2457,7 @@ void init_comp(void)
 			live.fate[i].status=INMEM;
 		}
 		else
-			live.fate[i].mem=(uae_u32*)(fscratch+i);
+			live.fate[i].mem=(uae_u32*)(&scratch.fregs[i]);
 	}