JIT: use scratch_t

diff --git a/jit/compemu.h b/jit/compemu.h
index 538aca5af6bcf4ad3b82b4c7fd4eb811cff8c939..3716ea8d7cbdf87550c131bf146863a14ac9f002 100644 (file)
--- 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 97e71d74ff50ce024414d2016c2ffa2a2d5ef0c9..05ee8896015c30fb5a6f375096f017eb2dd7f602 100644 (file)
--- 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]);
        }