Changeset 36140 in vbox for trunk/src/recompiler/fpu/softfloat-native.c

Timestamp:

Mar 3, 2011 1:48:16 PM (14 years ago)

Author:

vboxsync

Message:

rem: Re-synced to ​svn://svn.savannah.nongnu.org/qemu/trunk@5495 (repo UUID c046a42c-6fe2-441c-8c8c-71466251a162).

File:

• trunk/src/recompiler/fpu/softfloat-native.c (modified) (10 diffs)

trunk/src/recompiler/fpu/softfloat-native.c

@@ -7 +7 @@
 {
     STATUS(float_rounding_mode) = val;
-#if defined(_BSD) && !defined(__APPLE__) || (defined(HOST_SOLARIS) && (HOST_SOLARIS < 10 || HOST_SOLARIS == 11))
+#if defined(_BSD) && !defined(__APPLE__) || (defined(HOST_SOLARIS) && (HOST_SOLARIS < 10 || HOST_SOLARIS == 11)) /* VBOX adds sol 11 */
     fpsetround(val);
 #elif defined(__arm__)
@@ -61 +61 @@
 #endif
 
-#if defined(_ARCH_PPC)
+#if defined(__powerpc__)
 
 /* correct (but slow) PowerPC rint() (glibc version is incorrect) */
-static double qemu_rint(double x)
+double qemu_rint(double x)
 {
     double y = 4503599627370496.0;
@@ -230 +230 @@
 {
     if (a < b) {
-        return float_relation_less;
+        return -1;
     } else if (a == b) {
-        return float_relation_equal;
+        return 0;
     } else if (a > b) {
-        return float_relation_greater;
-    } else {
-        return float_relation_unordered;
+        return 1;
+    } else {
+        return 2;
     }
 }
@@ -242 +242 @@
 {
     if (isless(a, b)) {
-        return float_relation_less;
+        return -1;
     } else if (a == b) {
-        return float_relation_equal;
+        return 0;
     } else if (isgreater(a, b)) {
-        return float_relation_greater;
-    } else {
-        return float_relation_unordered;
+        return 1;
+    } else {
+        return 2;
     }
 }
@@ -258 +258 @@
     a = u.i;
     return ( ( ( a>>22 ) & 0x1FF ) == 0x1FE ) && ( a & 0x003FFFFF );
-}
-
-int float32_is_nan( float32 a1 )
-{
-    float32u u;
-    uint64_t a;
-    u.f = a1;
-    a = u.i;
-    return ( 0xFF800000 < ( a<<1 ) );
 }
 
@@ -401 +392 @@
 {
     if (a < b) {
-        return float_relation_less;
+        return -1;
     } else if (a == b) {
-        return float_relation_equal;
+        return 0;
     } else if (a > b) {
-        return float_relation_greater;
-    } else {
-        return float_relation_unordered;
+        return 1;
+    } else {
+        return 2;
     }
 }
@@ -413 +404 @@
 {
     if (isless(a, b)) {
-        return float_relation_less;
+        return -1;
     } else if (a == b) {
-        return float_relation_equal;
+        return 0;
     } else if (isgreater(a, b)) {
-        return float_relation_greater;
-    } else {
-        return float_relation_unordered;
+        return 1;
+    } else {
+        return 2;
     }
 }
@@ -441 +432 @@
     a = u.i;
 
-    return ( LIT64( 0xFFF0000000000000 ) < (bits64) ( a<<1 ) );
+    return ( LIT64( 0xFFE0000000000000 ) < (bits64) ( a<<1 ) );
 
 }
@@ -493 +484 @@
 {
     if (a < b) {
-        return float_relation_less;
+        return -1;
     } else if (a == b) {
-        return float_relation_equal;
+        return 0;
     } else if (a > b) {
-        return float_relation_greater;
-    } else {
-        return float_relation_unordered;
+        return 1;
+    } else {
+        return 2;
     }
 }
@@ -505 +496 @@
 {
     if (isless(a, b)) {
-        return float_relation_less;
+        return -1;
     } else if (a == b) {
-        return float_relation_equal;
+        return 0;
     } else if (isgreater(a, b)) {
-        return float_relation_greater;
-    } else {
-        return float_relation_unordered;
+        return 1;
+    } else {
+        return 2;
     }
 }
 int floatx80_is_signaling_nan( floatx80 a1)
-{
-    floatx80u u;
-    uint64_t aLow;
-    u.f = a1;
-
-    aLow = u.i.low & ~ LIT64( 0x4000000000000000 );
-    return
-           ( ( u.i.high & 0x7FFF ) == 0x7FFF )
-        && (bits64) ( aLow<<1 )
-        && ( u.i.low == aLow );
-}
-
-int floatx80_is_nan( floatx80 a1 )
 {
     floatx80u u;