Changeset 5239 in webkit for trunk/JavaScriptCore/kjs

Timestamp:

Oct 22, 2003, 2:31:46 PM (22 years ago)

Author:

mjs

Message:

Merged 64-bit compilation fixes, and fixes for handling negative 0
from upstream kjs.

• kjs/internal.cpp:
• kjs/simple_number.h: (KJS::SimpleNumber): fixed constants; added negZero constant. (KJS::SimpleNumber::is): adjusted to use long and not int. (KJS::SimpleNumber::value): ditto. (KJS::SimpleNumber::fits): ditto; also don't allow -0 to fit, so we don't lose the distinction between -0 and +0. (KJS::SimpleNumber::make): adjusted to use long.

Location:

trunk/JavaScriptCore/kjs

Files:

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

trunk/JavaScriptCore/kjs/internal.cpp

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

trunk/JavaScriptCore/kjs/simple_number.h

@@ -26 +26 @@
 #include <limits.h>
 #include <math.h>
+#include <string.h>
+
+#define IS_NEGATIVE_ZERO(num) (num == 0.0 && !memcmp(&num,&SimpleNumber::negZero,sizeof(double)))
 
 namespace KJS {
@@ -32 +35 @@
     class SimpleNumber {
     public:
-        enum { tag = 1, shift = 2, mask = (1 << shift) - 1, sign = 1 << 31, max = (1 << (31 - shift)) - 1, min = -max - 1 };
+        enum { tag = 1, shift = 2, mask = (1 << shift) - 1, sign = 1L << (sizeof(long) * 8 - 1 ), max = (1L << ((sizeof(long) * 8 - 1) - shift)) - 1, min = -max - 1, imax = (1L << ((sizeof(int) * 8 - 1) - shift)) - 1, imin = -imax - 1 };
 
-        static inline bool is(const ValueImp *imp) { return ((int)imp & mask) == tag; }
-        static inline int value(const ValueImp *imp) { return ((int)imp >> shift) | (((int)imp & sign) ? ~max : 0); }
+        static inline bool is(const ValueImp *imp) { return ((long)imp & mask) == tag; }
+        static inline long value(const ValueImp *imp) { return ((long)imp >> shift) | (((long)imp & sign) ? ~max : 0); }
 
-        static inline bool fits(int i) { return i <= max && i >= min; }
+        static inline bool fits(int i) { return i <= imax && i >= imin; }
         static inline bool fits(unsigned i) { return i <= (unsigned)max; }
         static inline bool fits(long i) { return i <= max && i >= min; }
         static inline bool fits(unsigned long i) { return i <= (unsigned)max; }
-        static inline bool fits(double d) { return d <= max && d >= min && d == (double)(int)d; }
-        static inline ValueImp *make(int i) { return (ValueImp *)((i << shift) | tag); }
+        static inline bool fits(double d) { return d <= max && d >= min && d == (double)(long)d &&
+                                            !IS_NEGATIVE_ZERO(d); }
+        static inline ValueImp *make(long i) { return (ValueImp *)((i << shift) | tag); }
     };
 }