Commit 8ee73bee authored by fpizlo@apple.com's avatar fpizlo@apple.com

JIT stub slow paths that would be identical to that of an interpreter should be factored out

https://bugs.webkit.org/show_bug.cgi?id=75743
<rdar://problem/10657024>

Reviewed by Geoff Garen.

* GNUmakefile.list.am:
* JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
* JavaScriptCore.xcodeproj/project.pbxproj:
* jit/JITStubs.cpp:
(JSC::DEFINE_STUB_FUNCTION):
* runtime/CommonSlowPaths.h: Added.
(JSC::CommonSlowPaths::opInstanceOfSlow):
(JSC::CommonSlowPaths::opIn):
(JSC::CommonSlowPaths::opResolve):
(JSC::CommonSlowPaths::opResolveSkip):
(JSC::CommonSlowPaths::opResolveWithBase):
(JSC::CommonSlowPaths::opResolveWithThis):



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@104349 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent e7d126ca
2012-01-06 Filip Pizlo <fpizlo@apple.com>
JIT stub slow paths that would be identical to that of an interpreter should be factored out
https://bugs.webkit.org/show_bug.cgi?id=75743
<rdar://problem/10657024>
Reviewed by Geoff Garen.
* GNUmakefile.list.am:
* JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
* JavaScriptCore.xcodeproj/project.pbxproj:
* jit/JITStubs.cpp:
(JSC::DEFINE_STUB_FUNCTION):
* runtime/CommonSlowPaths.h: Added.
(JSC::CommonSlowPaths::opInstanceOfSlow):
(JSC::CommonSlowPaths::opIn):
(JSC::CommonSlowPaths::opResolve):
(JSC::CommonSlowPaths::opResolveSkip):
(JSC::CommonSlowPaths::opResolveWithBase):
(JSC::CommonSlowPaths::opResolveWithThis):
2012-01-06 Sam Weinig <sam@webkit.org>
Fix windows build.
......@@ -325,6 +325,7 @@ javascriptcore_sources += \
Source/JavaScriptCore/runtime/ClassInfo.h \
Source/JavaScriptCore/runtime/CommonIdentifiers.cpp \
Source/JavaScriptCore/runtime/CommonIdentifiers.h \
Source/JavaScriptCore/runtime/CommonSlowPaths.h \
Source/JavaScriptCore/runtime/Completion.cpp \
Source/JavaScriptCore/runtime/Completion.h \
Source/JavaScriptCore/runtime/ConstructData.cpp \
......
......@@ -593,6 +593,10 @@
RelativePath="..\..\runtime\CommonIdentifiers.h"
>
</File>
<File
RelativePath="..\..\runtime\CommonSlowPaths.h"
>
</File>
<File
RelativePath="..\..\runtime\Completion.cpp"
>
......
......@@ -48,6 +48,7 @@
0BAC94A01338728400CF135B /* ThreadRestrictionVerifier.h in Headers */ = {isa = PBXBuildFile; fileRef = 0BAC949E1338728400CF135B /* ThreadRestrictionVerifier.h */; settings = {ATTRIBUTES = (Private, ); }; };
0BCD83571485845200EA2003 /* TemporaryChange.h in Headers */ = {isa = PBXBuildFile; fileRef = 0BCD83541485841200EA2003 /* TemporaryChange.h */; settings = {ATTRIBUTES = (Private, ); }; };
0BF28A2911A33DC300638F84 /* SizeLimits.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0BF28A2811A33DC300638F84 /* SizeLimits.cpp */; };
0F15F15F14B7A73E005DE37D /* CommonSlowPaths.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F15F15D14B7A73A005DE37D /* CommonSlowPaths.h */; settings = {ATTRIBUTES = (Private, ); }; };
0F16D726142C39C000CF784A /* BitVector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F16D724142C39A200CF784A /* BitVector.cpp */; };
0F242DA713F3B1E8007ADD4C /* WeakReferenceHarvester.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F242DA513F3B1BB007ADD4C /* WeakReferenceHarvester.h */; settings = {ATTRIBUTES = (Private, ); }; };
0F2C556F14738F3100121E4F /* DFGCodeBlocks.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F2C556E14738F2E00121E4F /* DFGCodeBlocks.h */; settings = {ATTRIBUTES = (Private, ); }; };
......@@ -830,6 +831,7 @@
0BAC949E1338728400CF135B /* ThreadRestrictionVerifier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ThreadRestrictionVerifier.h; sourceTree = "<group>"; };
0BCD83541485841200EA2003 /* TemporaryChange.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TemporaryChange.h; sourceTree = "<group>"; };
0BF28A2811A33DC300638F84 /* SizeLimits.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SizeLimits.cpp; sourceTree = "<group>"; };
0F15F15D14B7A73A005DE37D /* CommonSlowPaths.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CommonSlowPaths.h; sourceTree = "<group>"; };
0F16D724142C39A200CF784A /* BitVector.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BitVector.cpp; sourceTree = "<group>"; };
0F242DA513F3B1BB007ADD4C /* WeakReferenceHarvester.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WeakReferenceHarvester.h; sourceTree = "<group>"; };
0F2C556D14738F2E00121E4F /* DFGCodeBlocks.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DFGCodeBlocks.cpp; sourceTree = "<group>"; };
......@@ -2115,6 +2117,7 @@
7EF6E0BB0EB7A1EC0079AFAF /* runtime */ = {
isa = PBXGroup;
children = (
0F15F15D14B7A73A005DE37D /* CommonSlowPaths.h */,
BCF605110E203EF800B9A64D /* ArgList.cpp */,
BCF605120E203EF800B9A64D /* ArgList.h */,
BC257DE50E1F51C50016B6C9 /* Arguments.cpp */,
......@@ -3000,6 +3003,7 @@
86704B8812DBA33700A9FE7B /* YarrParser.h in Headers */,
86704B8A12DBA33700A9FE7B /* YarrPattern.h in Headers */,
86704B4312DB8A8100A9FE7B /* YarrSyntaxChecker.h in Headers */,
0F15F15F14B7A73E005DE37D /* CommonSlowPaths.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
......
......@@ -33,6 +33,7 @@
#if ENABLE(JIT)
#include "JITStubs.h"
#include "CommonSlowPaths.h"
#include "Arguments.h"
#include "CallFrame.h"
#include "CodeBlock.h"
......@@ -2088,29 +2089,10 @@ DEFINE_STUB_FUNCTION(EncodedJSValue, op_instanceof)
JSValue value = stackFrame.args[0].jsValue();
JSValue baseVal = stackFrame.args[1].jsValue();
JSValue proto = stackFrame.args[2].jsValue();
// At least one of these checks must have failed to get to the slow case.
ASSERT(!value.isCell() || !baseVal.isCell() || !proto.isCell()
|| !value.isObject() || !baseVal.isObject() || !proto.isObject()
|| !asObject(baseVal)->structure()->typeInfo().implementsDefaultHasInstance());
// ECMA-262 15.3.5.3:
// Throw an exception either if baseVal is not an object, or if it does not implement 'HasInstance' (i.e. is a function).
TypeInfo typeInfo(UnspecifiedType);
if (!baseVal.isObject() || !(typeInfo = asObject(baseVal)->structure()->typeInfo()).implementsHasInstance()) {
stackFrame.globalData->exception = createInvalidParamError(stackFrame.callFrame, "instanceof", baseVal);
VM_THROW_EXCEPTION();
}
ASSERT(typeInfo.type() != UnspecifiedType);
if (!typeInfo.overridesHasInstance() && !value.isObject())
return JSValue::encode(jsBoolean(false));
JSValue result = jsBoolean(asObject(baseVal)->methodTable()->hasInstance(asObject(baseVal), callFrame, value, proto));
bool result = CommonSlowPaths::opInstanceOfSlow(callFrame, value, baseVal, proto);
CHECK_FOR_EXCEPTION_AT_END();
return JSValue::encode(result);
return JSValue::encode(jsBoolean(result));
}
DEFINE_STUB_FUNCTION(EncodedJSValue, op_del_by_id)
......@@ -2424,25 +2406,10 @@ DEFINE_STUB_FUNCTION(EncodedJSValue, op_resolve)
STUB_INIT_STACK_FRAME(stackFrame);
CallFrame* callFrame = stackFrame.callFrame;
ScopeChainNode* scopeChain = callFrame->scopeChain();
ScopeChainIterator iter = scopeChain->begin();
ScopeChainIterator end = scopeChain->end();
ASSERT(iter != end);
Identifier& ident = stackFrame.args[0].identifier();
do {
JSObject* o = iter->get();
PropertySlot slot(o);
if (o->getPropertySlot(callFrame, ident, slot)) {
JSValue result = slot.getValue(callFrame, ident);
CHECK_FOR_EXCEPTION_AT_END();
return JSValue::encode(result);
}
} while (++iter != end);
stackFrame.globalData->exception = createUndefinedVariableError(callFrame, ident);
VM_THROW_EXCEPTION();
JSValue result = CommonSlowPaths::opResolve(callFrame, stackFrame.args[0].identifier());
CHECK_FOR_EXCEPTION_AT_END();
return JSValue::encode(result);
}
DEFINE_STUB_FUNCTION(EncodedJSValue, op_construct_NotJSConstruct)
......@@ -2784,38 +2751,9 @@ DEFINE_STUB_FUNCTION(EncodedJSValue, op_resolve_skip)
{
STUB_INIT_STACK_FRAME(stackFrame);
CallFrame* callFrame = stackFrame.callFrame;
ScopeChainNode* scopeChain = callFrame->scopeChain();
int skip = stackFrame.args[1].int32();
ScopeChainIterator iter = scopeChain->begin();
ScopeChainIterator end = scopeChain->end();
ASSERT(iter != end);
CodeBlock* codeBlock = callFrame->codeBlock();
bool checkTopLevel = codeBlock->codeType() == FunctionCode && codeBlock->needsFullScopeChain();
ASSERT(skip || !checkTopLevel);
if (checkTopLevel && skip--) {
if (callFrame->uncheckedR(codeBlock->activationRegister()).jsValue())
++iter;
}
while (skip--) {
++iter;
ASSERT(iter != end);
}
Identifier& ident = stackFrame.args[0].identifier();
do {
JSObject* o = iter->get();
PropertySlot slot(o);
if (o->getPropertySlot(callFrame, ident, slot)) {
JSValue result = slot.getValue(callFrame, ident);
CHECK_FOR_EXCEPTION_AT_END();
return JSValue::encode(result);
}
} while (++iter != end);
stackFrame.globalData->exception = createUndefinedVariableError(callFrame, ident);
VM_THROW_EXCEPTION();
JSValue result = CommonSlowPaths::opResolveSkip(stackFrame.callFrame, stackFrame.args[0].identifier(), stackFrame.args[1].int32());
CHECK_FOR_EXCEPTION_AT_END();
return JSValue::encode(result);
}
DEFINE_STUB_FUNCTION(EncodedJSValue, op_resolve_global)
......@@ -3143,33 +3081,9 @@ DEFINE_STUB_FUNCTION(EncodedJSValue, op_resolve_with_base)
STUB_INIT_STACK_FRAME(stackFrame);
CallFrame* callFrame = stackFrame.callFrame;
ScopeChainNode* scopeChain = callFrame->scopeChain();
ScopeChainIterator iter = scopeChain->begin();
ScopeChainIterator end = scopeChain->end();
// FIXME: add scopeDepthIsZero optimization
ASSERT(iter != end);
Identifier& ident = stackFrame.args[0].identifier();
JSObject* base;
do {
base = iter->get();
PropertySlot slot(base);
if (base->getPropertySlot(callFrame, ident, slot)) {
JSValue result = slot.getValue(callFrame, ident);
CHECK_FOR_EXCEPTION_AT_END();
callFrame->registers()[stackFrame.args[1].int32()] = JSValue(base);
return JSValue::encode(result);
}
++iter;
} while (iter != end);
stackFrame.globalData->exception = createUndefinedVariableError(callFrame, ident);
VM_THROW_EXCEPTION_AT_END();
return JSValue::encode(JSValue());
JSValue result = CommonSlowPaths::opResolveWithBase(callFrame, stackFrame.args[0].identifier(), callFrame->registers()[stackFrame.args[1].int32()]);
CHECK_FOR_EXCEPTION_AT_END();
return JSValue::encode(result);
}
DEFINE_STUB_FUNCTION(EncodedJSValue, op_resolve_with_this)
......@@ -3177,41 +3091,9 @@ DEFINE_STUB_FUNCTION(EncodedJSValue, op_resolve_with_this)
STUB_INIT_STACK_FRAME(stackFrame);
CallFrame* callFrame = stackFrame.callFrame;
ScopeChainNode* scopeChain = callFrame->scopeChain();
ScopeChainIterator iter = scopeChain->begin();
ScopeChainIterator end = scopeChain->end();
// FIXME: add scopeDepthIsZero optimization
ASSERT(iter != end);
Identifier& ident = stackFrame.args[0].identifier();
JSObject* base;
do {
base = iter->get();
++iter;
PropertySlot slot(base);
if (base->getPropertySlot(callFrame, ident, slot)) {
JSValue result = slot.getValue(callFrame, ident);
CHECK_FOR_EXCEPTION_AT_END();
// All entries on the scope chain should be EnvironmentRecords (activations etc),
// other then 'with' object, which are directly referenced from the scope chain,
// and the global object. If we hit either an EnvironmentRecord or a global
// object at the end of the scope chain, this is undefined. If we hit a non-
// EnvironmentRecord within the scope chain, pass the base as the this value.
if (iter == end || base->structure()->typeInfo().isEnvironmentRecord())
callFrame->registers()[stackFrame.args[1].int32()] = jsUndefined();
else
callFrame->registers()[stackFrame.args[1].int32()] = JSValue(base);
return JSValue::encode(result);
}
} while (iter != end);
stackFrame.globalData->exception = createUndefinedVariableError(callFrame, ident);
VM_THROW_EXCEPTION_AT_END();
return JSValue::encode(JSValue());
JSValue result = CommonSlowPaths::opResolveWithThis(callFrame, stackFrame.args[0].identifier(), callFrame->registers()[stackFrame.args[1].int32()]);
CHECK_FOR_EXCEPTION_AT_END();
return JSValue::encode(result);
}
DEFINE_STUB_FUNCTION(JSObject*, op_new_func_exp)
......
/*
* Copyright (C) 2011, 2012 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 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.
*
* THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
* OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef CommonSlowPaths_h
#define CommonSlowPaths_h
#include "CodeBlock.h"
#include "ExceptionHelpers.h"
#include "JSArray.h"
namespace JSC {
// The purpose of this namespace is to include slow paths that are shared
// between the interpreter and baseline JIT. They are written to be agnostic
// with respect to the slow-path calling convention, but they do rely on the
// JS code being executed more-or-less directly from bytecode (so the call
// frame layout is unmodified, making it potentially awkward to use these
// from any optimizing JIT, like the DFG).
namespace CommonSlowPaths {
ALWAYS_INLINE bool opInstanceOfSlow(ExecState* exec, JSValue value, JSValue baseVal, JSValue proto)
{
ASSERT(!value.isCell() || !baseVal.isCell() || !proto.isCell()
|| !value.isObject() || !baseVal.isObject() || !proto.isObject()
|| !asObject(baseVal)->structure()->typeInfo().implementsDefaultHasInstance());
// ECMA-262 15.3.5.3:
// Throw an exception either if baseVal is not an object, or if it does not implement 'HasInstance' (i.e. is a function).
TypeInfo typeInfo(UnspecifiedType);
if (!baseVal.isObject() || !(typeInfo = asObject(baseVal)->structure()->typeInfo()).implementsHasInstance()) {
exec->globalData().exception = createInvalidParamError(exec, "instanceof", baseVal);
return false;
}
ASSERT(typeInfo.type() != UnspecifiedType);
if (!typeInfo.overridesHasInstance() && !value.isObject())
return false;
return asObject(baseVal)->methodTable()->hasInstance(asObject(baseVal), exec, value, proto);
}
inline bool opIn(ExecState* exec, JSValue propName, JSValue baseVal)
{
if (!baseVal.isObject()) {
exec->globalData().exception = createInvalidParamError(exec, "in", baseVal);
return false;
}
JSObject* baseObj = asObject(baseVal);
uint32_t i;
if (propName.getUInt32(i))
return baseObj->hasProperty(exec, i);
Identifier property(exec, propName.toString(exec));
if (exec->globalData().exception)
return false;
return baseObj->hasProperty(exec, property);
}
ALWAYS_INLINE JSValue opResolve(ExecState* exec, Identifier& ident)
{
ScopeChainNode* scopeChain = exec->scopeChain();
ScopeChainIterator iter = scopeChain->begin();
ScopeChainIterator end = scopeChain->end();
ASSERT(iter != end);
do {
JSObject* o = iter->get();
PropertySlot slot(o);
if (o->getPropertySlot(exec, ident, slot))
return slot.getValue(exec, ident);
} while (++iter != end);
exec->globalData().exception = createUndefinedVariableError(exec, ident);
return JSValue();
}
ALWAYS_INLINE JSValue opResolveSkip(ExecState* exec, Identifier& ident, int skip)
{
ScopeChainNode* scopeChain = exec->scopeChain();
ScopeChainIterator iter = scopeChain->begin();
ScopeChainIterator end = scopeChain->end();
ASSERT(iter != end);
CodeBlock* codeBlock = exec->codeBlock();
bool checkTopLevel = codeBlock->codeType() == FunctionCode && codeBlock->needsFullScopeChain();
ASSERT(skip || !checkTopLevel);
if (checkTopLevel && skip--) {
if (exec->uncheckedR(codeBlock->activationRegister()).jsValue())
++iter;
}
while (skip--) {
++iter;
ASSERT(iter != end);
}
do {
JSObject* o = iter->get();
PropertySlot slot(o);
if (o->getPropertySlot(exec, ident, slot))
return slot.getValue(exec, ident);
} while (++iter != end);
exec->globalData().exception = createUndefinedVariableError(exec, ident);
return JSValue();
}
ALWAYS_INLINE JSValue opResolveWithBase(ExecState* exec, Identifier& ident, Register& baseSlot)
{
ScopeChainNode* scopeChain = exec->scopeChain();
ScopeChainIterator iter = scopeChain->begin();
ScopeChainIterator end = scopeChain->end();
// FIXME: add scopeDepthIsZero optimization
ASSERT(iter != end);
JSObject* base;
do {
base = iter->get();
PropertySlot slot(base);
if (base->getPropertySlot(exec, ident, slot)) {
JSValue result = slot.getValue(exec, ident);
if (exec->globalData().exception)
return JSValue();
baseSlot = JSValue(base);
return result;
}
++iter;
} while (iter != end);
exec->globalData().exception = createUndefinedVariableError(exec, ident);
return JSValue();
}
ALWAYS_INLINE JSValue opResolveWithThis(ExecState* exec, Identifier& ident, Register& baseSlot)
{
ScopeChainNode* scopeChain = exec->scopeChain();
ScopeChainIterator iter = scopeChain->begin();
ScopeChainIterator end = scopeChain->end();
// FIXME: add scopeDepthIsZero optimization
ASSERT(iter != end);
JSObject* base;
do {
base = iter->get();
++iter;
PropertySlot slot(base);
if (base->getPropertySlot(exec, ident, slot)) {
JSValue result = slot.getValue(exec, ident);
if (exec->globalData().exception)
return JSValue();
// All entries on the scope chain should be EnvironmentRecords (activations etc),
// other then 'with' object, which are directly referenced from the scope chain,
// and the global object. If we hit either an EnvironmentRecord or a global
// object at the end of the scope chain, this is undefined. If we hit a non-
// EnvironmentRecord within the scope chain, pass the base as the this value.
if (iter == end || base->structure()->typeInfo().isEnvironmentRecord())
baseSlot = jsUndefined();
else
baseSlot = JSValue(base);
return result;
}
} while (iter != end);
exec->globalData().exception = createUndefinedVariableError(exec, ident);
return JSValue();
}
} } // namespace JSC::CommonSlowPaths
#endif // CommonSlowPaths_h
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment