JIT: Set compfpu default to 0 for 64-bit CPU, change a double to float

diff --git a/cfgfile.cpp b/cfgfile.cpp
index f7c1cfb64f92e40f9e9394a406437a324e13af3c..62be8a3b584992fb3d00d92a95f4a97e7885da5f 100644 (file)
--- a/cfgfile.cpp
+++ b/cfgfile.cpp
@@ -6015,7 +6015,12 @@ void default_prefs (struct uae_prefs *p, int type)
        p->comp_hardflush = 0;
        p->comp_constjump = 1;
 #ifdef USE_JIT_FPU
+#ifdef CPU_x86_64
+       /* Set default to off, since JIT FPU isn't 64-bit safe yet. */
+       p->compfpu = 0;
+#else
        p->compfpu = 1;
+#endif
 #else
        p->compfpu = 0;
 #endif

diff --git a/jit/codegen_x86.cpp b/jit/codegen_x86.cpp
index 7d1aca7861b9b4ee2ee8197270633bb4a947679c..e68726c92d0a56f0bd8018ffb2e4c8ccac20babf 100644 (file)
--- a/jit/codegen_x86.cpp
+++ b/jit/codegen_x86.cpp
@@ -4323,7 +4323,8 @@ LOWFUNC(NONE,NONE,2,raw_fsin_rr,(FW d, FR s))
 }
 LENDFUNC(NONE,NONE,2,raw_fsin_rr,(FW d, FR s))
 
-static const double one=1;
+float one = 1;
+
 LOWFUNC(NONE,NONE,2,raw_ftwotox_rr,(FW d, FR s))
 {
        int ds;