Changeset 10510 in webkit for trunk/JavaScriptCore/kjs

Timestamp:

Sep 10, 2005, 11:24:44 AM (20 years ago)

Author:

darin

Message:

Windows changes by Krzysztof Kowalczyk <​[email protected]>.

• fixed ​http://bugzilla.opendarwin.org/show_bug.cgi?id=4870 win portability: fix IS_NEGATIVE_ZERO macro in simple_number.h

• kjs/simple_number.h: (KJS::isNegativeZero): Added. Inline function. Has a case for Windows that uses _fpclass and a case for other platforms that uses signbit. (KJS::SimpleNumber::fits): Use inline isNegativeZero instead of macro IS_NEGATIVE_ZERO.

• kjs/internal.cpp: Remove definition of now-unneeded negZero global.

• kjs/value.cpp: Touched the file because Xcode didn't know it needed to recompile it.

• improved test engine

• tests/mozilla/jsDriver.pl: Sort tests in numeric order instead of using a plain-ASCII sort; now test 33 will be after test 5 in any given set of numbered tests.

Location:

trunk/JavaScriptCore/kjs

Files:

• internal.cpp (modified) (1 diff)
• simple_number.h (modified) (3 diffs)
• value.cpp (modified) (1 diff)

trunk/JavaScriptCore/kjs/internal.cpp

@@ -264 +264 @@
   return (double)uint32 == val;
 }
-
-double SimpleNumber::negZero = -0.0;
 
 // ------------------------------ LabelStack -----------------------------------

trunk/JavaScriptCore/kjs/simple_number.h

@@ -1 @@
-// -*- c-basic-offset: 2 -*-
 /*
  *  This file is part of the KDE libraries
@@ -21 +20 @@
  */
 
-#ifndef _KJS_SIMPLE_NUMBER_H_
-#define _KJS_SIMPLE_NUMBER_H_
+#ifndef KJS_SIMPLE_NUMBER_H
+#define KJS_SIMPLE_NUMBER_H
 
+#include <float.h>
 #include <math.h>
 #include <string.h>
 
-#define IS_NEGATIVE_ZERO(num) (num == 0.0 && !memcmp(&num, &SimpleNumber::negZero, sizeof(double)))
+namespace KJS {
 
-namespace KJS {
     class ValueImp;
 
+    inline bool isNegativeZero(double num)
+    {
+#if WIN32
+        return _fpclass(num) == _FPCLASS_NZ;
+#else
+        return num == -0.0 && signbit(num);
+#endif
+    }
+    
     class SimpleNumber {
     public:
@@ -44 +52 @@
         static inline bool fits(unsigned long i) { return i <= (unsigned)max; }
         static inline bool integerFits(double d) { return !(d < min || d > max); }
-        static inline bool fits(double d) { return d >= min && d <= max && d == (double)(long)d && !IS_NEGATIVE_ZERO(d); }
+        static inline bool fits(double d) { return d >= min && d <= max && d == (double)(long)d && !isNegativeZero(d); }
         static inline ValueImp *make(long i) { return (ValueImp *)((i << shift) | tag); }
+    };
 
-        static double negZero;
-    };
 }
 

trunk/JavaScriptCore/kjs/value.cpp

@@ -46 +46 @@
 AllocatedValueImp *ConstantValues::NaN = NULL;
 
-static const double D16 = 65536;
+static const double D16 = 65536.0;
 static const double D32 = 4294967296.0;