More test17 impovements, fixed NAN for mulpd ([DYNAREC] too, introducing BOX64_DYNAREC_FASTNAN env. var. to keep old faster behaviour selectable)

4 files changed, 37 insertions, 6 deletions

diff --git a/src/dynarec/arm64/dynarec_arm64_660f.c b/src/dynarec/arm64/dynarec_arm64_660f.c
index c739ee15..abd12c04 100755
--- a/src/dynarec/arm64/dynarec_arm64_660f.c
+++ b/src/dynarec/arm64/dynarec_arm64_660f.c
@@ -703,8 +703,21 @@ uintptr_t dynarec64_660F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int n
             INST_NAME("MULPD Gx, Ex");

             nextop = F8;

             GETEX(q0, 0);

-            GETGX(v0);

-            VFMULQD(v0, v0, q0);

+            GETGX(q1);

+            if(!box64_dynarec_fastnan) {

+                v0 = fpu_get_scratch(dyn);

+                v1 = fpu_get_scratch(dyn);

+                // check if any input value was NAN

+                VFMAXQD(v0, q0, q1);    // propagate NAN

+                FCMEQQD(v0, v0, v0);    // 0 if NAN, 1 if not NAN

+            }

+            VFMULQD(q1, q1, q0);

+            if(!box64_dynarec_fastnan) {

+                FCMEQQD(v1, q1, q1);    // 0 => out is NAN

+                VBICQ(v1, v0, v1);      // forget it in any input was a NAN already

+                VSHLQ_64(v1, v1, 63);   // only keep the sign bit

+                VORRQ(q1, q1, v1);      // NAN -> -NAN

+            }

             break;

         case 0x5A:

             INST_NAME("CVTPD2PS Gx, Ex");

diff --git a/src/emu/x64run660f.c b/src/emu/x64run660f.c
index 09354192..5db9994a 100644
--- a/src/emu/x64run660f.c
+++ b/src/emu/x64run660f.c
@@ -796,8 +796,8 @@ int Run660F(x64emu_t *emu, rex_t rex)
         GETGX;

         for (int i=0; i<2; ++i) {

             #ifndef NOALIGN

-            if(EX->d[i]<0.0) // on x86, default nan are negative

-                GX->d[i] = -NAN;

+            if(EX->d[i]<0.0)        // on x86, default nan are negative

+                GX->d[i] = -NAN;    // but input NAN are not touched (so sqrt(+nan) -> +nan)

             else

             #endif

             GX->d[i] = sqrt(EX->d[i]);

@@ -843,8 +843,15 @@ int Run660F(x64emu_t *emu, rex_t rex)
         nextop = F8;

         GETEX(0);

         GETGX;

-        GX->d[0] *= EX->d[0];

-        GX->d[1] *= EX->d[1];

+        for(int i=0; i<2; ++i) {

+            #ifndef NOALIGN

+                // mul generate a -NAN only if doing (+/-)inf * (+/-)0

+                if((isinf(GX->d[i]) && EX->d[i]==0.0) || (isinf(EX->d[i]) && GX->d[i]==0.0))

+                    GX->d[i] = -NAN;

+                else

+            #endif

+            GX->d[i] *= EX->d[i];

+        }

         break;

     case 0x5A:                      /* CVTPD2PS Gx, Ex */

         nextop = F8;

diff --git a/src/include/debug.h b/src/include/debug.h
index b5f08599..b8ce4995 100755
--- a/src/include/debug.h
+++ b/src/include/debug.h
@@ -15,6 +15,7 @@ extern int box64_dynarec_forced;
 extern uintptr_t box64_nodynarec_start, box64_nodynarec_end;
 extern int box64_dynarec_bigblock;
 extern int box64_dynarec_strongmem;
+extern int box64_dynarec_fastnan;
 #ifdef ARM64
 extern int arm64_asimd;
 extern int arm64_aes;
diff --git a/src/main.c b/src/main.c
index 208c251d..92d23936 100755
--- a/src/main.c
+++ b/src/main.c
@@ -45,6 +45,7 @@ int box64_dynarec_dump = 0;
 int box64_dynarec_forced = 0;
 int box64_dynarec_bigblock = 1;
 int box64_dynarec_strongmem = 0;
+int box64_dynarec_fastnan = 0;
 uintptr_t box64_nodynarec_start = 0;
 uintptr_t box64_nodynarec_end = 0;
 #ifdef ARM64
@@ -405,6 +406,15 @@ void LoadLogEnv()
         if(box64_dynarec_strongmem)
             printf_log(LOG_INFO, "Dynarec will try to emulate a strong memory model%s\n", (box64_dynarec_strongmem==1)?" with limited performance loss":"");
     }
+    p = getenv("BOX64_DYNAREC_FASTNAN");
+    if(p) {
+        if(strlen(p)==1) {
+            if(p[0]>='0' && p[0]<='1')
+                box64_dynarec_fastnan = p[0]-'0';
+        }
+        if(box64_dynarec_fastnan)
+            printf_log(LOG_INFO, "Dynarec will not try to normalize generated NAN\n");
+    }
     p = getenv("BOX64_NODYNAREC");
     if(p) {
         if (strchr(p,'-')) {