X-Git-Url: https://git.saurik.com/apple/javascriptcore.git/blobdiff_plain/81345200c95645a1b0d2635520f96ad55dfde63f..refs/heads/master:/interpreter/ProtoCallFrame.h?ds=sidebyside diff --git a/interpreter/ProtoCallFrame.h b/interpreter/ProtoCallFrame.h index 406dfb3..af33a30 100644 --- a/interpreter/ProtoCallFrame.h +++ b/interpreter/ProtoCallFrame.h @@ -32,23 +32,20 @@ namespace JSC { struct ProtoCallFrame { Register codeBlockValue; - Register scopeChainValue; Register calleeValue; Register argCountAndCodeOriginValue; Register thisArg; uint32_t paddedArgCount; + bool arityMissMatch; 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; } - 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; } @@ -60,6 +57,8 @@ struct ProtoCallFrame { 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(argumentIndex) < argumentCount());