JavaScriptCore-7601.1.46.3.tar.gz

[apple/javascriptcore.git] / interpreter / Register.h

diff --git a/interpreter/Register.h b/interpreter/Register.h
index a4a76b865569fa1dbfbfa9b64fc66066ad35ea5a..e41da6271bac184b2f5b7f5d5413d15edb9777cc 100644 (file)
--- a/interpreter/Register.h
+++ b/interpreter/Register.h
@@ -10,7 +10,7 @@
  * 2.  Redistributions in binary form must reproduce the above copyright
  *     notice, this list of conditions and the following disclaimer in the
  *     documentation and/or other materials provided with the distribution.
- * 3.  Neither the name of Apple Computer, Inc. ("Apple") nor the names of
+ * 3.  Neither the name of Apple Inc. ("Apple") nor the names of
  *     its contributors may be used to endorse or promote products derived
  *     from this software without specific prior written permission.
  *
@@ -29,7 +29,7 @@
 #ifndef Register_h
 #define Register_h
 
-#include "JSValue.h"
+#include "JSCJSValue.h"
 #include <wtf/Assertions.h>
 #include <wtf/VectorTraits.h>
 
@@ -37,13 +37,9 @@ namespace JSC {
 
     class CodeBlock;
     class ExecState;
-    class JSActivation;
+    class JSLexicalEnvironment;
     class JSObject;
-    class JSPropertyNameIterator;
-    class ScopeChainNode;
-
-    struct InlineCallFrame;
-    struct Instruction;
+    class JSScope;
 
     typedef ExecState CallFrame;
 
@@ -59,21 +55,20 @@ namespace JSC {
         
         Register& operator=(CallFrame*);
         Register& operator=(CodeBlock*);
-        Register& operator=(ScopeChainNode*);
-        Register& operator=(Instruction*);
-        Register& operator=(InlineCallFrame*);
+        Register& operator=(JSScope*);
+        Register& operator=(JSObject*);
 
         int32_t i() const;
-        JSActivation* activation() const;
+        JSLexicalEnvironment* lexicalEnvironment() const;
         CallFrame* callFrame() const;
         CodeBlock* codeBlock() const;
-        JSObject* function() const;
-        JSPropertyNameIterator* propertyNameIterator() const;
-        ScopeChainNode* scopeChain() const;
-        Instruction* vPC() const;
-        InlineCallFrame* asInlineCallFrame() const;
+        JSObject* object() const;
+        JSScope* scope() const;
         int32_t unboxedInt32() const;
+        int64_t unboxedInt52() const;
+        int64_t unboxedStrictInt52() const;
         bool unboxedBoolean() const;
+        double unboxedDouble() const;
         JSCell* unboxedCell() const;
         int32_t payload() const;
         int32_t tag() const;
@@ -86,16 +81,14 @@ namespace JSC {
             return r;
         }
 
-        static Register withCallee(JSObject* callee);
-
     private:
         union {
             EncodedJSValue value;
             CallFrame* callFrame;
             CodeBlock* codeBlock;
-            Instruction* vPC;
-            InlineCallFrame* inlineCallFrame;
             EncodedValueDescriptor encodedValue;
+            double number;
+            int64_t integer;
         } u;
     };
 
@@ -141,18 +134,6 @@ namespace JSC {
         return *this;
     }
 
-    ALWAYS_INLINE Register& Register::operator=(Instruction* vPC)
-    {
-        u.vPC = vPC;
-        return *this;
-    }
-
-    ALWAYS_INLINE Register& Register::operator=(InlineCallFrame* inlineCallFrame)
-    {
-        u.inlineCallFrame = inlineCallFrame;
-        return *this;
-    }
-
     ALWAYS_INLINE int32_t Register::i() const
     {
         return jsValue().asInt32();
@@ -168,19 +149,19 @@ namespace JSC {
         return u.codeBlock;
     }
 
-    ALWAYS_INLINE Instruction* Register::vPC() const
+    ALWAYS_INLINE int32_t Register::unboxedInt32() const
     {
-        return u.vPC;
+        return payload();
     }
 
-    ALWAYS_INLINE InlineCallFrame* Register::asInlineCallFrame() const
+    ALWAYS_INLINE int64_t Register::unboxedInt52() const
     {
-        return u.inlineCallFrame;
+        return u.integer >> JSValue::int52ShiftAmount;
     }
-        
-    ALWAYS_INLINE int32_t Register::unboxedInt32() const
+
+    ALWAYS_INLINE int64_t Register::unboxedStrictInt52() const
     {
-        return payload();
+        return u.integer;
     }
 
     ALWAYS_INLINE bool Register::unboxedBoolean() const
@@ -188,6 +169,11 @@ namespace JSC {
         return !!payload();
     }
 
+    ALWAYS_INLINE double Register::unboxedDouble() const
+    {
+        return u.number;
+    }
+
     ALWAYS_INLINE JSCell* Register::unboxedCell() const
     {
 #if USE(JSVALUE64)