JavaScriptCore-7600.1.4.9.tar.gz

[apple/javascriptcore.git] / bytecode / DataFormat.h

diff --git a/bytecode/DataFormat.h b/bytecode/DataFormat.h
index 4f015486a114fb009d128e092fa52f3ec9bf29ac..bb9da4c576a014b6700898e127219d9ea2734a5a 100644 (file)
--- a/bytecode/DataFormat.h
+++ b/bytecode/DataFormat.h
@@ -38,16 +38,25 @@ namespace JSC {
 // (May also need bool, array, object, string types!)
 enum DataFormat {
     DataFormatNone = 0,
-    DataFormatInteger = 1,
-    DataFormatDouble = 2,
-    DataFormatBoolean = 3,
-    DataFormatCell = 4,
-    DataFormatStorage = 5,
+    DataFormatInt32 = 1,
+    DataFormatInt52 = 2, // Int52's are left-shifted by 16 by default.
+    DataFormatStrictInt52 = 3, // "Strict" Int52 means it's not shifted.
+    DataFormatDouble = 4,
+    DataFormatBoolean = 5,
+    DataFormatCell = 6,
+    DataFormatStorage = 7,
     DataFormatJS = 8,
-    DataFormatJSInteger = DataFormatJS | DataFormatInteger,
+    DataFormatJSInt32 = DataFormatJS | DataFormatInt32,
     DataFormatJSDouble = DataFormatJS | DataFormatDouble,
     DataFormatJSCell = DataFormatJS | DataFormatCell,
-    DataFormatJSBoolean = DataFormatJS | DataFormatBoolean
+    DataFormatJSBoolean = DataFormatJS | DataFormatBoolean,
+    
+    // Marker deliminating ordinary data formats and OSR-only data formats.
+    DataFormatOSRMarker = 32, 
+    
+    // Special data formats used only for OSR.
+    DataFormatDead = 33, // Implies jsUndefined().
+    DataFormatArguments = 34 // Implies that the arguments object must be reified.
 };
 
 inline const char* dataFormatToString(DataFormat dataFormat)
@@ -55,8 +64,12 @@ inline const char* dataFormatToString(DataFormat dataFormat)
     switch (dataFormat) {
     case DataFormatNone:
         return "None";
-    case DataFormatInteger:
-        return "Integer";
+    case DataFormatInt32:
+        return "Int32";
+    case DataFormatInt52:
+        return "Int52";
+    case DataFormatStrictInt52:
+        return "StrictInt52";
     case DataFormatDouble:
         return "Double";
     case DataFormatCell:
@@ -67,96 +80,33 @@ inline const char* dataFormatToString(DataFormat dataFormat)
         return "Storage";
     case DataFormatJS:
         return "JS";
-    case DataFormatJSInteger:
-        return "JSInteger";
+    case DataFormatJSInt32:
+        return "JSInt32";
     case DataFormatJSDouble:
         return "JSDouble";
     case DataFormatJSCell:
         return "JSCell";
     case DataFormatJSBoolean:
         return "JSBoolean";
+    case DataFormatDead:
+        return "Dead";
+    case DataFormatArguments:
+        return "Arguments";
     default:
+        RELEASE_ASSERT_NOT_REACHED();
         return "Unknown";
     }
 }
 
-#if USE(JSVALUE64)
-inline bool needDataFormatConversion(DataFormat from, DataFormat to)
-{
-    ASSERT(from != DataFormatNone);
-    ASSERT(to != DataFormatNone);
-    switch (from) {
-    case DataFormatInteger:
-    case DataFormatDouble:
-        return to != from;
-    case DataFormatCell:
-    case DataFormatJS:
-    case DataFormatJSInteger:
-    case DataFormatJSDouble:
-    case DataFormatJSCell:
-    case DataFormatJSBoolean:
-        switch (to) {
-        case DataFormatInteger:
-        case DataFormatDouble:
-            return true;
-        case DataFormatCell:
-        case DataFormatJS:
-        case DataFormatJSInteger:
-        case DataFormatJSDouble:
-        case DataFormatJSCell:
-        case DataFormatJSBoolean:
-            return false;
-        default:
-            // This captures DataFormatBoolean, which is currently unused.
-            ASSERT_NOT_REACHED();
-        }
-    case DataFormatStorage:
-        ASSERT(to == DataFormatStorage);
-        return false;
-    default:
-        // This captures DataFormatBoolean, which is currently unused.
-        ASSERT_NOT_REACHED();
-    }
-    return true;
-}
-
-#elif USE(JSVALUE32_64)
-inline bool needDataFormatConversion(DataFormat from, DataFormat to)
-{
-    ASSERT(from != DataFormatNone);
-    ASSERT(to != DataFormatNone);
-    switch (from) {
-    case DataFormatInteger:
-    case DataFormatCell:
-    case DataFormatBoolean:
-        return ((to & DataFormatJS) || to == DataFormatDouble);
-    case DataFormatDouble:
-    case DataFormatJSDouble:
-        return (to != DataFormatDouble && to != DataFormatJSDouble);
-    case DataFormatJS:
-    case DataFormatJSInteger:
-    case DataFormatJSCell:
-    case DataFormatJSBoolean:
-        return (!(to & DataFormatJS) || to == DataFormatJSDouble);
-    case DataFormatStorage:
-        ASSERT(to == DataFormatStorage);
-        return false;
-    default:
-        ASSERT_NOT_REACHED();
-    }
-    return true;
-}
-#endif
-
 inline bool isJSFormat(DataFormat format, DataFormat expectedFormat)
 {
     ASSERT(expectedFormat & DataFormatJS);
     return (format | DataFormatJS) == expectedFormat;
 }
 
-inline bool isJSInteger(DataFormat format)
+inline bool isJSInt32(DataFormat format)
 {
-    return isJSFormat(format, DataFormatJSInteger);
+    return isJSFormat(format, DataFormatJSInt32);
 }
 
 inline bool isJSDouble(DataFormat format)