Changeset 27149 in webkit for trunk/JavaScriptCore/kjs/JSImmediate.h

Timestamp:

Oct 27, 2007, 7:48:34 AM (18 years ago)

Author:

darin

Message:

Reviewed by Maciej.

• ​http://bugs.webkit.org/show_bug.cgi?id=15711 force JSImmediate to be inlined for roughly 1.2% SunSpider speedup

• kjs/JSImmediate.h: Put ALWAYS_INLINE on everything.

• kjs/object.h: Removed redundant includes.
• kjs/value.h: Ditto.

File:

• trunk/JavaScriptCore/kjs/JSImmediate.h (modified) (15 diffs)

trunk/JavaScriptCore/kjs/JSImmediate.h

@@ -25 +25 @@
 #include "JSType.h"
 #include <wtf/Assertions.h>
+#include <wtf/AlwaysInline.h>
 #include <stdarg.h>
 #include <stdint.h>
@@ -60 +61 @@
 class JSImmediate {
 public:
-    static bool isImmediate(const JSValue* v)
+    static ALWAYS_INLINE bool isImmediate(const JSValue* v)
     {
         return getTag(v) != 0;
     }
     
-    static bool isNumber(const JSValue* v)
+    static ALWAYS_INLINE bool isNumber(const JSValue* v)
     {
         return (getTag(v) == NumberType);
     }
     
-    static bool isBoolean(const JSValue* v)
+    static ALWAYS_INLINE bool isBoolean(const JSValue* v)
     {
         return (getTag(v) == BooleanType);
@@ -76 +77 @@
     
     // Since we have room for only 3 unique tags, null and undefined have to share.
-    static bool isUndefinedOrNull(const JSValue* v)
+    static ALWAYS_INLINE bool isUndefinedOrNull(const JSValue* v)
     {
         return (getTag(v) == UndefinedType);
@@ -103 +104 @@
     static const uintptr_t TagMask = 3; // type tags are 2 bits long
     
-    static JSValue* tag(uintptr_t bits, uintptr_t tag)
+    static ALWAYS_INLINE JSValue* tag(uintptr_t bits, uintptr_t tag)
     {
         return reinterpret_cast<JSValue*>(bits | tag);
     }
     
-    static uintptr_t unTag(const JSValue* v)
+    static ALWAYS_INLINE uintptr_t unTag(const JSValue* v)
     {
         return reinterpret_cast<uintptr_t>(v) & ~TagMask;
     }
     
-    static uintptr_t getTag(const JSValue* v)
+    static ALWAYS_INLINE uintptr_t getTag(const JSValue* v)
     {
         return reinterpret_cast<uintptr_t>(v) & TagMask;
@@ -146 +147 @@
     static const uint32_t zeroAsBits = 0x0;
 
-    static JSValue* fromDouble(double d)
+    static ALWAYS_INLINE JSValue* fromDouble(double d)
     {
         FloatUnion floatUnion;
@@ -164 +165 @@
     }
 
-    static float toFloat(const JSValue* v)
+    static ALWAYS_INLINE float toFloat(const JSValue* v)
     {
         ASSERT(isImmediate(v));
@@ -173 +174 @@
     }
 
-    static double toDouble(const JSValue* v)
+    static ALWAYS_INLINE double toDouble(const JSValue* v)
     {
         return toFloat(v);
     }
 
-    static bool getTruncatedInt32(const JSValue* v, int32_t& i)
+    static ALWAYS_INLINE bool getTruncatedInt32(const JSValue* v, int32_t& i)
     {
         float f = toFloat(v);
@@ -187 +188 @@
     }
 
-    static bool getTruncatedUInt32(const JSValue* v, uint32_t& i)
+    static ALWAYS_INLINE bool getTruncatedUInt32(const JSValue* v, uint32_t& i)
     {
         float f = toFloat(v);
@@ -202 +203 @@
     static const uint64_t zeroAsBits = 0x0;
 
-    static JSValue* fromDouble(double d)
+    static ALWAYS_INLINE JSValue* fromDouble(double d)
     {
         DoubleUnion doubleUnion;
@@ -214 +215 @@
     }
 
-    static double toDouble(const JSValue* v)
+    static ALWAYS_INLINE double toDouble(const JSValue* v)
     {
         ASSERT(isImmediate(v));
@@ -223 +224 @@
     }
 
-    static bool getTruncatedInt32(const JSValue* v, int32_t& i)
+    static ALWAYS_INLINE bool getTruncatedInt32(const JSValue* v, int32_t& i)
     {
         double d = toDouble(v);
@@ -232 +233 @@
     }
 
-    static bool getTruncatedUInt32(const JSValue* v, uint32_t& i)
+    static ALWAYS_INLINE bool getTruncatedUInt32(const JSValue* v, uint32_t& i)
     {
         double d = toDouble(v);
@@ -242 +243 @@
 };
 
-inline JSValue* JSImmediate::trueImmediate() { return tag(FPBitValues<is32bit, is64bit>::oneAsBits, BooleanType); }
-inline JSValue* JSImmediate::falseImmediate() { return tag(FPBitValues<is32bit, is64bit>::zeroAsBits, BooleanType); }
-inline JSValue* JSImmediate::NaNImmediate() { return tag(FPBitValues<is32bit, is64bit>::nanAsBits, NumberType); }
-inline JSValue* JSImmediate::undefinedImmediate() { return tag(FPBitValues<is32bit, is64bit>::nanAsBits, UndefinedType); }
-inline JSValue* JSImmediate::nullImmediate() { return tag(FPBitValues<is32bit, is64bit>::zeroAsBits, UndefinedType); }
-
-inline bool JSImmediate::toBoolean(const JSValue* v)
+ALWAYS_INLINE JSValue* JSImmediate::trueImmediate() { return tag(FPBitValues<is32bit, is64bit>::oneAsBits, BooleanType); }
+ALWAYS_INLINE JSValue* JSImmediate::falseImmediate() { return tag(FPBitValues<is32bit, is64bit>::zeroAsBits, BooleanType); }
+ALWAYS_INLINE JSValue* JSImmediate::NaNImmediate() { return tag(FPBitValues<is32bit, is64bit>::nanAsBits, NumberType); }
+ALWAYS_INLINE JSValue* JSImmediate::undefinedImmediate() { return tag(FPBitValues<is32bit, is64bit>::nanAsBits, UndefinedType); }
+ALWAYS_INLINE JSValue* JSImmediate::nullImmediate() { return tag(FPBitValues<is32bit, is64bit>::zeroAsBits, UndefinedType); }
+
+ALWAYS_INLINE bool JSImmediate::toBoolean(const JSValue* v)
 {
     ASSERT(isImmediate(v));
@@ -259 +260 @@
 }
 
-inline JSValue* JSImmediate::fromDouble(double d)
+ALWAYS_INLINE JSValue* JSImmediate::fromDouble(double d)
 {
     return FPBitValues<is32bit, is64bit>::fromDouble(d);
 }
 
-inline double JSImmediate::toDouble(const JSValue* v)
+ALWAYS_INLINE double JSImmediate::toDouble(const JSValue* v)
 {
     return FPBitValues<is32bit, is64bit>::toDouble(v);
 }
 
-inline bool JSImmediate::getUInt32(const JSValue* v, uint32_t& i)
+ALWAYS_INLINE bool JSImmediate::getUInt32(const JSValue* v, uint32_t& i)
 {
     double d = toDouble(v);
@@ -276 +277 @@
 }
 
-inline bool JSImmediate::getTruncatedInt32(const JSValue* v, int32_t& i)
+ALWAYS_INLINE bool JSImmediate::getTruncatedInt32(const JSValue* v, int32_t& i)
 {
     return FPBitValues<is32bit, is64bit>::getTruncatedInt32(v, i);
 }
 
-inline bool JSImmediate::getTruncatedUInt32(const JSValue* v, uint32_t& i)
+ALWAYS_INLINE bool JSImmediate::getTruncatedUInt32(const JSValue* v, uint32_t& i)
 {
     return FPBitValues<is32bit, is64bit>::getTruncatedUInt32(v, i);