JavaScriptCore-7601.1.46.3.tar.gz

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

diff --git a/interpreter/ProtoCallFrame.h b/interpreter/ProtoCallFrame.h
index 406dfb3e716322393edbb119fc270924ffb20da4..af33a3072ccc6153daa0c75ae14bc6b8b3b212c9 100644 (file)
--- a/interpreter/ProtoCallFrame.h
+++ b/interpreter/ProtoCallFrame.h
@@ -32,23 +32,20 @@ namespace JSC {
 
 struct ProtoCallFrame {
     Register codeBlockValue;
 
 struct ProtoCallFrame {
     Register codeBlockValue;

-    Register scopeChainValue;

     Register calleeValue;
     Register argCountAndCodeOriginValue;
     Register thisArg;
     uint32_t paddedArgCount;
     Register calleeValue;
     Register argCountAndCodeOriginValue;
     Register thisArg;
     uint32_t paddedArgCount;

+    bool arityMissMatch;

     JSValue *args;
 
     JSValue *args;
 

-    void init(CodeBlock*, JSScope*, JSObject*, JSValue, int, JSValue* otherArgs = 0);
+    void init(CodeBlock*, JSObject*, JSValue, int, JSValue* otherArgs = 0);

 
     CodeBlock* codeBlock() const { return codeBlockValue.Register::codeBlock(); }
     void setCodeBlock(CodeBlock* codeBlock) { codeBlockValue = codeBlock; }
 
 
     CodeBlock* codeBlock() const { return codeBlockValue.Register::codeBlock(); }
     void setCodeBlock(CodeBlock* codeBlock) { codeBlockValue = codeBlock; }
 

-    JSScope* scope() const { return scopeChainValue.Register::scope(); }
-    void setScope(JSScope* scope) { scopeChainValue = scope; }
-
-    JSObject* callee() const { return calleeValue.Register::function(); }
-    void setCallee(JSObject* callee) { calleeValue = Register::withCallee(callee); }
+    JSObject* callee() const { return calleeValue.Register::object(); }
+    void setCallee(JSObject* callee) { calleeValue = callee; }

 
     int argumentCountIncludingThis() const { return argCountAndCodeOriginValue.payload(); }
     int argumentCount() const { return argumentCountIncludingThis() - 1; }
 
     int argumentCountIncludingThis() const { return argCountAndCodeOriginValue.payload(); }
     int argumentCount() const { return argumentCountIncludingThis() - 1; }


@@ -60,6 +57,8 @@ struct ProtoCallFrame {
     JSValue thisValue() const { return thisArg.Register::jsValue(); }
     void setThisValue(JSValue value) { thisArg = value; }
 
     JSValue thisValue() const { return thisArg.Register::jsValue(); }
     void setThisValue(JSValue value) { thisArg = value; }
 

+    bool needArityCheck() { return arityMissMatch; }
+

     JSValue argument(size_t argumentIndex)
     {
         ASSERT(static_cast<int>(argumentIndex) < argumentCount());
     JSValue argument(size_t argumentIndex)
     {
         ASSERT(static_cast<int>(argumentIndex) < argumentCount());