JavaScriptCore-1097.3.tar.gz

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

diff --git a/interpreter/Register.h b/interpreter/Register.h
index fb02c12089b21ad3dcc1a4e99d862865b74d5123..a4a76b865569fa1dbfbfa9b64fc66066ad35ea5a 100644 (file)
--- a/interpreter/Register.h
+++ b/interpreter/Register.h
@@ -42,6 +42,7 @@ namespace JSC {
     class JSPropertyNameIterator;
     class ScopeChainNode;
 
     class JSPropertyNameIterator;
     class ScopeChainNode;
 

+    struct InlineCallFrame;

     struct Instruction;
 
     typedef ExecState CallFrame;
     struct Instruction;
 
     typedef ExecState CallFrame;


@@ -60,6 +61,7 @@ namespace JSC {
         Register& operator=(CodeBlock*);
         Register& operator=(ScopeChainNode*);
         Register& operator=(Instruction*);
         Register& operator=(CodeBlock*);
         Register& operator=(ScopeChainNode*);
         Register& operator=(Instruction*);

+        Register& operator=(InlineCallFrame*);

 
         int32_t i() const;
         JSActivation* activation() const;
 
         int32_t i() const;
         JSActivation* activation() const;


@@ -69,6 +71,14 @@ namespace JSC {
         JSPropertyNameIterator* propertyNameIterator() const;
         ScopeChainNode* scopeChain() const;
         Instruction* vPC() const;
         JSPropertyNameIterator* propertyNameIterator() const;
         ScopeChainNode* scopeChain() const;
         Instruction* vPC() const;

+        InlineCallFrame* asInlineCallFrame() const;
+        int32_t unboxedInt32() const;
+        bool unboxedBoolean() const;
+        JSCell* unboxedCell() const;
+        int32_t payload() const;
+        int32_t tag() const;
+        int32_t& payload();
+        int32_t& tag();

 
         static Register withInt(int32_t i)
         {
 
         static Register withInt(int32_t i)
         {


@@ -76,7 +86,7 @@ namespace JSC {
             return r;
         }
 
             return r;
         }
 

-        static inline Register withCallee(JSObject* callee);
+        static Register withCallee(JSObject* callee);

 
     private:
         union {
 
     private:
         union {


@@ -84,6 +94,8 @@ namespace JSC {
             CallFrame* callFrame;
             CodeBlock* codeBlock;
             Instruction* vPC;
             CallFrame* callFrame;
             CodeBlock* codeBlock;
             Instruction* vPC;

+            InlineCallFrame* inlineCallFrame;
+            EncodedValueDescriptor encodedValue;

         } u;
     };
 
         } u;
     };
 


@@ -96,17 +108,11 @@ namespace JSC {
 
     ALWAYS_INLINE Register::Register(const JSValue& v)
     {
 
     ALWAYS_INLINE Register::Register(const JSValue& v)
     {

-#if ENABLE(JSC_ZOMBIES)
-        ASSERT(!v.isZombie());
-#endif

         u.value = JSValue::encode(v);
     }
 
     ALWAYS_INLINE Register& Register::operator=(const JSValue& v)
     {
         u.value = JSValue::encode(v);
     }
 
     ALWAYS_INLINE Register& Register::operator=(const JSValue& v)
     {

-#if ENABLE(JSC_ZOMBIES)
-        ASSERT(!v.isZombie());
-#endif

         u.value = JSValue::encode(v);
         return *this;
     }
         u.value = JSValue::encode(v);
         return *this;
     }


@@ -141,6 +147,12 @@ namespace JSC {
         return *this;
     }
 
         return *this;
     }
 

+    ALWAYS_INLINE Register& Register::operator=(InlineCallFrame* inlineCallFrame)
+    {
+        u.inlineCallFrame = inlineCallFrame;
+        return *this;
+    }
+

     ALWAYS_INLINE int32_t Register::i() const
     {
         return jsValue().asInt32();
     ALWAYS_INLINE int32_t Register::i() const
     {
         return jsValue().asInt32();


@@ -161,6 +173,50 @@ namespace JSC {
         return u.vPC;
     }
 
         return u.vPC;
     }
 

+    ALWAYS_INLINE InlineCallFrame* Register::asInlineCallFrame() const
+    {
+        return u.inlineCallFrame;
+    }
+        
+    ALWAYS_INLINE int32_t Register::unboxedInt32() const
+    {
+        return payload();
+    }
+
+    ALWAYS_INLINE bool Register::unboxedBoolean() const
+    {
+        return !!payload();
+    }
+
+    ALWAYS_INLINE JSCell* Register::unboxedCell() const
+    {
+#if USE(JSVALUE64)
+        return u.encodedValue.ptr;
+#else
+        return bitwise_cast<JSCell*>(payload());
+#endif
+    }
+
+    ALWAYS_INLINE int32_t Register::payload() const
+    {
+        return u.encodedValue.asBits.payload;
+    }
+
+    ALWAYS_INLINE int32_t Register::tag() const
+    {
+        return u.encodedValue.asBits.tag;
+    }
+
+    ALWAYS_INLINE int32_t& Register::payload()
+    {
+        return u.encodedValue.asBits.payload;
+    }
+
+    ALWAYS_INLINE int32_t& Register::tag()
+    {
+        return u.encodedValue.asBits.tag;
+    }
+

 } // namespace JSC
 
 namespace WTF {
 } // namespace JSC
 
 namespace WTF {