Commit 63eba56c authored by bfulgham@apple.com's avatar bfulgham@apple.com

Unreviewed, rolling out r156120.

http://trac.webkit.org/changeset/156120
https://bugs.webkit.org/show_bug.cgi?id=121651

Broke windows runtime and all tests (Requested by bfulgham on
#webkit).

Patch by Commit Queue <commit-queue@webkit.org> on 2013-09-19

* CMakeLists.txt:
* GNUmakefile.list.am:
* JavaScriptCore.vcxproj/JavaScriptCore.vcxproj:
* JavaScriptCore.xcodeproj/project.pbxproj:
* Target.pri:
* bytecode/ValueRecovery.h:
(JSC::ValueRecovery::dumpInContext):
* dfg/DFGAssemblyHelpers.cpp: Renamed from Source/JavaScriptCore/jit/AssemblyHelpers.cpp.
(JSC::DFG::AssemblyHelpers::executableFor):
(JSC::DFG::AssemblyHelpers::decodedCodeMapFor):
(JSC::DFG::AssemblyHelpers::setSamplingFlag):
(JSC::DFG::AssemblyHelpers::clearSamplingFlag):
(JSC::DFG::AssemblyHelpers::jitAssertIsInt32):
(JSC::DFG::AssemblyHelpers::jitAssertIsJSInt32):
(JSC::DFG::AssemblyHelpers::jitAssertIsJSNumber):
(JSC::DFG::AssemblyHelpers::jitAssertIsJSDouble):
(JSC::DFG::AssemblyHelpers::jitAssertIsCell):
(JSC::DFG::AssemblyHelpers::jitAssertHasValidCallFrame):
* dfg/DFGAssemblyHelpers.h: Renamed from Source/JavaScriptCore/jit/AssemblyHelpers.h.
(JSC::DFG::AssemblyHelpers::AssemblyHelpers):
(JSC::DFG::AssemblyHelpers::codeBlock):
(JSC::DFG::AssemblyHelpers::vm):
(JSC::DFG::AssemblyHelpers::assembler):
(JSC::DFG::AssemblyHelpers::preserveReturnAddressAfterCall):
(JSC::DFG::AssemblyHelpers::restoreReturnAddressBeforeReturn):
(JSC::DFG::AssemblyHelpers::emitGetFromCallFrameHeaderPtr):
(JSC::DFG::AssemblyHelpers::emitPutToCallFrameHeader):
(JSC::DFG::AssemblyHelpers::emitPutImmediateToCallFrameHeader):
(JSC::DFG::AssemblyHelpers::branchIfNotCell):
(JSC::DFG::AssemblyHelpers::addressFor):
(JSC::DFG::AssemblyHelpers::tagFor):
(JSC::DFG::AssemblyHelpers::payloadFor):
(JSC::DFG::AssemblyHelpers::branchIfNotObject):
(JSC::DFG::AssemblyHelpers::selectScratchGPR):
(JSC::DFG::AssemblyHelpers::debugCall):
(JSC::DFG::AssemblyHelpers::jitAssertIsInt32):
(JSC::DFG::AssemblyHelpers::jitAssertIsJSInt32):
(JSC::DFG::AssemblyHelpers::jitAssertIsJSNumber):
(JSC::DFG::AssemblyHelpers::jitAssertIsJSDouble):
(JSC::DFG::AssemblyHelpers::jitAssertIsCell):
(JSC::DFG::AssemblyHelpers::jitAssertHasValidCallFrame):
(JSC::DFG::AssemblyHelpers::boxDouble):
(JSC::DFG::AssemblyHelpers::unboxDouble):
(JSC::DFG::AssemblyHelpers::boxInt52):
(JSC::DFG::AssemblyHelpers::emitExceptionCheck):
(JSC::DFG::AssemblyHelpers::emitCount):
(JSC::DFG::AssemblyHelpers::globalObjectFor):
(JSC::DFG::AssemblyHelpers::strictModeFor):
(JSC::DFG::AssemblyHelpers::baselineCodeBlockFor):
(JSC::DFG::AssemblyHelpers::baselineCodeBlock):
(JSC::DFG::AssemblyHelpers::argumentsRegisterFor):
(JSC::DFG::AssemblyHelpers::symbolTableFor):
(JSC::DFG::AssemblyHelpers::offsetOfLocals):
(JSC::DFG::AssemblyHelpers::offsetOfArgumentsIncludingThis):
* dfg/DFGBinarySwitch.h:
* dfg/DFGByteCodeParser.cpp:
* dfg/DFGCCallHelpers.h: Renamed from Source/JavaScriptCore/jit/CCallHelpers.h.
(JSC::DFG::CCallHelpers::CCallHelpers):
(JSC::DFG::CCallHelpers::resetCallArguments):
(JSC::DFG::CCallHelpers::addCallArgument):
(JSC::DFG::CCallHelpers::setupArguments):
(JSC::DFG::CCallHelpers::setupArgumentsExecState):
(JSC::DFG::CCallHelpers::setupArgumentsWithExecState):
(JSC::DFG::CCallHelpers::setupTwoStubArgs):
(JSC::DFG::CCallHelpers::setupStubArguments):
(JSC::DFG::CCallHelpers::setupResults):
* dfg/DFGDisassembler.cpp:
* dfg/DFGFPRInfo.h: Renamed from Source/JavaScriptCore/jit/FPRInfo.h.
(JSC::DFG::FPRInfo::toRegister):
(JSC::DFG::FPRInfo::toIndex):
(JSC::DFG::FPRInfo::toArgumentRegister):
(JSC::DFG::FPRInfo::debugName):
* dfg/DFGGPRInfo.h: Renamed from Source/JavaScriptCore/jit/GPRInfo.h.
(JSC::DFG::JSValueRegs::JSValueRegs):
(JSC::DFG::JSValueRegs::payloadOnly):
(JSC::DFG::JSValueRegs::operator!):
(JSC::DFG::JSValueRegs::gpr):
(JSC::DFG::JSValueRegs::payloadGPR):
(JSC::DFG::JSValueSource::JSValueSource):
(JSC::DFG::JSValueSource::unboxedCell):
(JSC::DFG::JSValueSource::operator!):
(JSC::DFG::JSValueSource::isAddress):
(JSC::DFG::JSValueSource::offset):
(JSC::DFG::JSValueSource::base):
(JSC::DFG::JSValueSource::gpr):
(JSC::DFG::JSValueSource::asAddress):
(JSC::DFG::JSValueSource::notAddress):
(JSC::DFG::JSValueRegs::tagGPR):
(JSC::DFG::JSValueSource::tagGPR):
(JSC::DFG::JSValueSource::payloadGPR):
(JSC::DFG::JSValueSource::hasKnownTag):
(JSC::DFG::JSValueSource::tag):
(JSC::DFG::GPRInfo::toRegister):
(JSC::DFG::GPRInfo::toIndex):
(JSC::DFG::GPRInfo::debugName):
(JSC::DFG::GPRInfo::toArgumentRegister):
* dfg/DFGGraph.cpp:
* dfg/DFGGraph.h:
* dfg/DFGJITCompiler.h:
* dfg/DFGOSRExit.cpp:
* dfg/DFGOSRExit.h:
* dfg/DFGOSRExitCompiler.h:
* dfg/DFGOSRExitCompilerCommon.h:
* dfg/DFGRegisterBank.h:
* dfg/DFGRegisterSet.h:
* dfg/DFGRepatch.cpp:
* dfg/DFGSilentRegisterSavePlan.h:
* dfg/DFGThunks.cpp:
* dfg/DFGVariableEvent.cpp:
* ftl/FTLCArgumentGetter.h:
(JSC::FTL::CArgumentGetter::CArgumentGetter):
(JSC::FTL::CArgumentGetter::loadNext8):
(JSC::FTL::CArgumentGetter::loadNext32):
(JSC::FTL::CArgumentGetter::loadNext64):
(JSC::FTL::CArgumentGetter::loadNextPtr):
(JSC::FTL::CArgumentGetter::loadNextDouble):
* ftl/FTLCompile.cpp:
* ftl/FTLExitThunkGenerator.h:
* ftl/FTLLink.cpp:
* ftl/FTLThunks.cpp:
* jit/JIT.cpp:
(JSC::JIT::JIT):
* jit/JIT.h:
* jit/JITPropertyAccess.cpp:
(JSC::JIT::stringGetByValStubGenerator):
* jit/JITPropertyAccess32_64.cpp:
(JSC::JIT::stringGetByValStubGenerator):
* jit/JSInterfaceJIT.h:
(JSC::JSInterfaceJIT::preserveReturnAddressAfterCall):
(JSC::JSInterfaceJIT::restoreReturnAddressBeforeReturn):
* jit/SpecializedThunkJIT.h:
(JSC::SpecializedThunkJIT::SpecializedThunkJIT):
(JSC::SpecializedThunkJIT::finalize):
* jit/ThunkGenerators.cpp:
(JSC::linkForGenerator):
(JSC::virtualForGenerator):
(JSC::stringLengthTrampolineGenerator):
(JSC::nativeForGenerator):
(JSC::arityFixup):
(JSC::charCodeAtThunkGenerator):
(JSC::charAtThunkGenerator):
(JSC::fromCharCodeThunkGenerator):
(JSC::sqrtThunkGenerator):
(JSC::floorThunkGenerator):
(JSC::ceilThunkGenerator):
(JSC::roundThunkGenerator):
(JSC::expThunkGenerator):
(JSC::logThunkGenerator):
(JSC::absThunkGenerator):
(JSC::powThunkGenerator):
(JSC::imulThunkGenerator):
* llint/LLIntThunks.cpp:
(JSC::LLInt::generateThunkWithJumpTo):
* runtime/JSCJSValue.h:


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@156136 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 596b6b71
......@@ -80,6 +80,7 @@ set(JavaScriptCore_SOURCES
dfg/DFGAbstractValue.cpp
dfg/DFGArgumentsSimplificationPhase.cpp
dfg/DFGArrayMode.cpp
dfg/DFGAssemblyHelpers.cpp
dfg/DFGAtTailAbstractState.cpp
dfg/DFGBackwardsPropagationPhase.cpp
dfg/DFGBasicBlock.cpp
......@@ -208,7 +209,6 @@ set(JavaScriptCore_SOURCES
interpreter/StackVisitor.cpp
interpreter/VMInspector.cpp
jit/AssemblyHelpers.cpp
jit/ClosureCallStubRoutine.cpp
jit/ExecutableAllocator.cpp
jit/ExecutableAllocatorFixedVMPool.cpp
......
2013-09-19 Commit Queue <commit-queue@webkit.org>
Unreviewed, rolling out r156120.
http://trac.webkit.org/changeset/156120
https://bugs.webkit.org/show_bug.cgi?id=121651
Broke windows runtime and all tests (Requested by bfulgham on
#webkit).
* CMakeLists.txt:
* GNUmakefile.list.am:
* JavaScriptCore.vcxproj/JavaScriptCore.vcxproj:
* JavaScriptCore.xcodeproj/project.pbxproj:
* Target.pri:
* bytecode/ValueRecovery.h:
(JSC::ValueRecovery::dumpInContext):
* dfg/DFGAssemblyHelpers.cpp: Renamed from Source/JavaScriptCore/jit/AssemblyHelpers.cpp.
(JSC::DFG::AssemblyHelpers::executableFor):
(JSC::DFG::AssemblyHelpers::decodedCodeMapFor):
(JSC::DFG::AssemblyHelpers::setSamplingFlag):
(JSC::DFG::AssemblyHelpers::clearSamplingFlag):
(JSC::DFG::AssemblyHelpers::jitAssertIsInt32):
(JSC::DFG::AssemblyHelpers::jitAssertIsJSInt32):
(JSC::DFG::AssemblyHelpers::jitAssertIsJSNumber):
(JSC::DFG::AssemblyHelpers::jitAssertIsJSDouble):
(JSC::DFG::AssemblyHelpers::jitAssertIsCell):
(JSC::DFG::AssemblyHelpers::jitAssertHasValidCallFrame):
* dfg/DFGAssemblyHelpers.h: Renamed from Source/JavaScriptCore/jit/AssemblyHelpers.h.
(JSC::DFG::AssemblyHelpers::AssemblyHelpers):
(JSC::DFG::AssemblyHelpers::codeBlock):
(JSC::DFG::AssemblyHelpers::vm):
(JSC::DFG::AssemblyHelpers::assembler):
(JSC::DFG::AssemblyHelpers::preserveReturnAddressAfterCall):
(JSC::DFG::AssemblyHelpers::restoreReturnAddressBeforeReturn):
(JSC::DFG::AssemblyHelpers::emitGetFromCallFrameHeaderPtr):
(JSC::DFG::AssemblyHelpers::emitPutToCallFrameHeader):
(JSC::DFG::AssemblyHelpers::emitPutImmediateToCallFrameHeader):
(JSC::DFG::AssemblyHelpers::branchIfNotCell):
(JSC::DFG::AssemblyHelpers::addressFor):
(JSC::DFG::AssemblyHelpers::tagFor):
(JSC::DFG::AssemblyHelpers::payloadFor):
(JSC::DFG::AssemblyHelpers::branchIfNotObject):
(JSC::DFG::AssemblyHelpers::selectScratchGPR):
(JSC::DFG::AssemblyHelpers::debugCall):
(JSC::DFG::AssemblyHelpers::jitAssertIsInt32):
(JSC::DFG::AssemblyHelpers::jitAssertIsJSInt32):
(JSC::DFG::AssemblyHelpers::jitAssertIsJSNumber):
(JSC::DFG::AssemblyHelpers::jitAssertIsJSDouble):
(JSC::DFG::AssemblyHelpers::jitAssertIsCell):
(JSC::DFG::AssemblyHelpers::jitAssertHasValidCallFrame):
(JSC::DFG::AssemblyHelpers::boxDouble):
(JSC::DFG::AssemblyHelpers::unboxDouble):
(JSC::DFG::AssemblyHelpers::boxInt52):
(JSC::DFG::AssemblyHelpers::emitExceptionCheck):
(JSC::DFG::AssemblyHelpers::emitCount):
(JSC::DFG::AssemblyHelpers::globalObjectFor):
(JSC::DFG::AssemblyHelpers::strictModeFor):
(JSC::DFG::AssemblyHelpers::baselineCodeBlockFor):
(JSC::DFG::AssemblyHelpers::baselineCodeBlock):
(JSC::DFG::AssemblyHelpers::argumentsRegisterFor):
(JSC::DFG::AssemblyHelpers::symbolTableFor):
(JSC::DFG::AssemblyHelpers::offsetOfLocals):
(JSC::DFG::AssemblyHelpers::offsetOfArgumentsIncludingThis):
* dfg/DFGBinarySwitch.h:
* dfg/DFGByteCodeParser.cpp:
* dfg/DFGCCallHelpers.h: Renamed from Source/JavaScriptCore/jit/CCallHelpers.h.
(JSC::DFG::CCallHelpers::CCallHelpers):
(JSC::DFG::CCallHelpers::resetCallArguments):
(JSC::DFG::CCallHelpers::addCallArgument):
(JSC::DFG::CCallHelpers::setupArguments):
(JSC::DFG::CCallHelpers::setupArgumentsExecState):
(JSC::DFG::CCallHelpers::setupArgumentsWithExecState):
(JSC::DFG::CCallHelpers::setupTwoStubArgs):
(JSC::DFG::CCallHelpers::setupStubArguments):
(JSC::DFG::CCallHelpers::setupResults):
* dfg/DFGDisassembler.cpp:
* dfg/DFGFPRInfo.h: Renamed from Source/JavaScriptCore/jit/FPRInfo.h.
(JSC::DFG::FPRInfo::toRegister):
(JSC::DFG::FPRInfo::toIndex):
(JSC::DFG::FPRInfo::toArgumentRegister):
(JSC::DFG::FPRInfo::debugName):
* dfg/DFGGPRInfo.h: Renamed from Source/JavaScriptCore/jit/GPRInfo.h.
(JSC::DFG::JSValueRegs::JSValueRegs):
(JSC::DFG::JSValueRegs::payloadOnly):
(JSC::DFG::JSValueRegs::operator!):
(JSC::DFG::JSValueRegs::gpr):
(JSC::DFG::JSValueRegs::payloadGPR):
(JSC::DFG::JSValueSource::JSValueSource):
(JSC::DFG::JSValueSource::unboxedCell):
(JSC::DFG::JSValueSource::operator!):
(JSC::DFG::JSValueSource::isAddress):
(JSC::DFG::JSValueSource::offset):
(JSC::DFG::JSValueSource::base):
(JSC::DFG::JSValueSource::gpr):
(JSC::DFG::JSValueSource::asAddress):
(JSC::DFG::JSValueSource::notAddress):
(JSC::DFG::JSValueRegs::tagGPR):
(JSC::DFG::JSValueSource::tagGPR):
(JSC::DFG::JSValueSource::payloadGPR):
(JSC::DFG::JSValueSource::hasKnownTag):
(JSC::DFG::JSValueSource::tag):
(JSC::DFG::GPRInfo::toRegister):
(JSC::DFG::GPRInfo::toIndex):
(JSC::DFG::GPRInfo::debugName):
(JSC::DFG::GPRInfo::toArgumentRegister):
* dfg/DFGGraph.cpp:
* dfg/DFGGraph.h:
* dfg/DFGJITCompiler.h:
* dfg/DFGOSRExit.cpp:
* dfg/DFGOSRExit.h:
* dfg/DFGOSRExitCompiler.h:
* dfg/DFGOSRExitCompilerCommon.h:
* dfg/DFGRegisterBank.h:
* dfg/DFGRegisterSet.h:
* dfg/DFGRepatch.cpp:
* dfg/DFGSilentRegisterSavePlan.h:
* dfg/DFGThunks.cpp:
* dfg/DFGVariableEvent.cpp:
* ftl/FTLCArgumentGetter.h:
(JSC::FTL::CArgumentGetter::CArgumentGetter):
(JSC::FTL::CArgumentGetter::loadNext8):
(JSC::FTL::CArgumentGetter::loadNext32):
(JSC::FTL::CArgumentGetter::loadNext64):
(JSC::FTL::CArgumentGetter::loadNextPtr):
(JSC::FTL::CArgumentGetter::loadNextDouble):
* ftl/FTLCompile.cpp:
* ftl/FTLExitThunkGenerator.h:
* ftl/FTLLink.cpp:
* ftl/FTLThunks.cpp:
* jit/JIT.cpp:
(JSC::JIT::JIT):
* jit/JIT.h:
* jit/JITPropertyAccess.cpp:
(JSC::JIT::stringGetByValStubGenerator):
* jit/JITPropertyAccess32_64.cpp:
(JSC::JIT::stringGetByValStubGenerator):
* jit/JSInterfaceJIT.h:
(JSC::JSInterfaceJIT::preserveReturnAddressAfterCall):
(JSC::JSInterfaceJIT::restoreReturnAddressBeforeReturn):
* jit/SpecializedThunkJIT.h:
(JSC::SpecializedThunkJIT::SpecializedThunkJIT):
(JSC::SpecializedThunkJIT::finalize):
* jit/ThunkGenerators.cpp:
(JSC::linkForGenerator):
(JSC::virtualForGenerator):
(JSC::stringLengthTrampolineGenerator):
(JSC::nativeForGenerator):
(JSC::arityFixup):
(JSC::charCodeAtThunkGenerator):
(JSC::charAtThunkGenerator):
(JSC::fromCharCodeThunkGenerator):
(JSC::sqrtThunkGenerator):
(JSC::floorThunkGenerator):
(JSC::ceilThunkGenerator):
(JSC::roundThunkGenerator):
(JSC::expThunkGenerator):
(JSC::logThunkGenerator):
(JSC::absThunkGenerator):
(JSC::powThunkGenerator):
(JSC::imulThunkGenerator):
* llint/LLIntThunks.cpp:
(JSC::LLInt::generateThunkWithJumpTo):
* runtime/JSCJSValue.h:
2013-09-19 Filip Pizlo <fpizlo@apple.com>
Unreviewed, fix Windows build part 2. m_jitCodeMap should always be there.
......
......@@ -192,6 +192,8 @@ javascriptcore_sources += \
Source/JavaScriptCore/dfg/DFGArrayMode.cpp \
Source/JavaScriptCore/dfg/DFGArrayMode.h \
Source/JavaScriptCore/dfg/DFGArrayifySlowPathGenerator.h \
Source/JavaScriptCore/dfg/DFGAssemblyHelpers.cpp \
Source/JavaScriptCore/dfg/DFGAssemblyHelpers.h \
Source/JavaScriptCore/dfg/DFGAtTailAbstractState.cpp \
Source/JavaScriptCore/dfg/DFGAtTailAbstractState.h \
Source/JavaScriptCore/dfg/DFGBackwardsPropagationPhase.cpp \
......@@ -206,6 +208,7 @@ javascriptcore_sources += \
Source/JavaScriptCore/dfg/DFGBranchDirection.h \
Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp \
Source/JavaScriptCore/dfg/DFGByteCodeParser.h \
Source/JavaScriptCore/dfg/DFGCCallHelpers.h \
Source/JavaScriptCore/dfg/DFGCFGSimplificationPhase.cpp \
Source/JavaScriptCore/dfg/DFGCFGSimplificationPhase.h \
Source/JavaScriptCore/dfg/DFGCallArrayAllocatorSlowPathGenerator.h \
......@@ -258,6 +261,7 @@ javascriptcore_sources += \
Source/JavaScriptCore/dfg/DFGEdge.h \
Source/JavaScriptCore/dfg/DFGEdgeDominates.h \
Source/JavaScriptCore/dfg/DFGEdgeUsesStructure.h \
Source/JavaScriptCore/dfg/DFGFPRInfo.h \
Source/JavaScriptCore/dfg/DFGFailedFinalizer.cpp \
Source/JavaScriptCore/dfg/DFGFailedFinalizer.h \
Source/JavaScriptCore/dfg/DFGFiltrationResult.h \
......@@ -270,6 +274,7 @@ javascriptcore_sources += \
Source/JavaScriptCore/dfg/DFGFlushLivenessAnalysisPhase.cpp \
Source/JavaScriptCore/dfg/DFGFlushLivenessAnalysisPhase.h \
Source/JavaScriptCore/dfg/DFGGenerationInfo.h \
Source/JavaScriptCore/dfg/DFGGPRInfo.h \
Source/JavaScriptCore/dfg/DFGGenerationInfo.h \
Source/JavaScriptCore/dfg/DFGGraph.cpp \
Source/JavaScriptCore/dfg/DFGGraph.h \
......@@ -599,19 +604,14 @@ javascriptcore_sources += \
Source/JavaScriptCore/interpreter/VMInspector.cpp \
Source/JavaScriptCore/interpreter/VMInspector.h \
Source/JavaScriptCore/JavaScriptCorePrefix.h \
Source/JavaScriptCore/jit/AssemblyHelpers.cpp \
Source/JavaScriptCore/jit/AssemblyHelpers.h \
Source/JavaScriptCore/jit/CCallHelpers.h \
Source/JavaScriptCore/jit/CompactJITCodeMap.h \
Source/JavaScriptCore/jit/ClosureCallStubRoutine.cpp \
Source/JavaScriptCore/jit/ClosureCallStubRoutine.h \
Source/JavaScriptCore/jit/ExecutableAllocator.cpp \
Source/JavaScriptCore/jit/ExecutableAllocator.h \
Source/JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp \
Source/JavaScriptCore/jit/FPRInfo.h \
Source/JavaScriptCore/jit/GCAwareJITStubRoutine.cpp \
Source/JavaScriptCore/jit/GCAwareJITStubRoutine.h \
Source/JavaScriptCore/jit/GPRInfo.h \
Source/JavaScriptCore/jit/HostCallReturnValue.cpp \
Source/JavaScriptCore/jit/HostCallReturnValue.h \
Source/JavaScriptCore/jit/JITArithmetic32_64.cpp \
......
......@@ -362,7 +362,6 @@
<ClCompile Include="..\interpreter\JSStack.cpp" />
<ClCompile Include="..\interpreter\StackVisitor.cpp" />
<ClCompile Include="..\interpreter\VMInspector.cpp" />
<ClCompile Include="..\jit\AssemblyHelpers.cpp" />
<ClCompile Include="..\jit\ClosureCallStubRoutine.cpp" />
<ClCompile Include="..\jit\ExecutableAllocator.cpp" />
<ClCompile Include="..\jit\GCAwareJITStubRoutine.cpp" />
......@@ -752,14 +751,10 @@
<ClInclude Include="..\interpreter\Register.h" />
<ClInclude Include="..\interpreter\StackVisitor.h" />
<ClInclude Include="..\interpreter\VMInspector.h" />
<ClInclude Include="..\jit\AssemblyHelpers.h" />
<ClInclude Include="..\jit\CCallHelpers.h" />
<ClInclude Include="..\jit\ClosureCallStubRoutine.h" />
<ClInclude Include="..\jit\CompactJITCodeMap.h" />
<ClInclude Include="..\jit\ExecutableAllocator.h" />
<ClInclude Include="..\jit\FPRInfo.h" />
<ClInclude Include="..\jit\GCAwareJITStubRoutine.h" />
<ClInclude Include="..\jit\GPRInfo.h" />
<ClInclude Include="..\jit\HostCallReturnValue.h" />
<ClInclude Include="..\jit\JIT.h" />
<ClInclude Include="..\jit\JITCode.h" />
......
......@@ -117,6 +117,7 @@ SOURCES += \
dfg/DFGAbstractValue.cpp \
dfg/DFGArgumentsSimplificationPhase.cpp \
dfg/DFGArrayMode.cpp \
dfg/DFGAssemblyHelpers.cpp \
dfg/DFGAtTailAbstractState.cpp \
dfg/DFGBackwardsPropagationPhase.cpp \
dfg/DFGBasicBlock.cpp \
......@@ -205,7 +206,6 @@ SOURCES += \
interpreter/Interpreter.cpp \
interpreter/JSStack.cpp \
interpreter/StackVisitor.cpp \
jit/AssemblyHelpers.cpp \
jit/ClosureCallStubRoutine.cpp \
jit/ExecutableAllocatorFixedVMPool.cpp \
jit/ExecutableAllocator.cpp \
......
......@@ -27,8 +27,6 @@
#define ValueRecovery_h
#include "DataFormat.h"
#include "GPRInfo.h"
#include "FPRInfo.h"
#include "JSCJSValue.h"
#include "MacroAssembler.h"
#include "VirtualRegister.h"
......@@ -325,29 +323,29 @@ public:
out.printf("(double)");
return;
case InGPR:
out.print(gpr());
out.printf("%%r%d", gpr());
return;
case UnboxedInt32InGPR:
out.print("int32(", gpr(), ")");
out.printf("int32(%%r%d)", gpr());
return;
case UnboxedInt52InGPR:
out.print("int53(", gpr(), ")");
out.printf("int52(%%r%d)", gpr());
return;
case UnboxedStrictInt52InGPR:
out.print("strictInt52(", gpr(), ")");
out.printf("strictInt52(%%r%d)", gpr());
return;
case UnboxedBooleanInGPR:
out.print("bool(", gpr(), ")");
out.printf("bool(%%r%d)", gpr());
return;
case UInt32InGPR:
out.print("uint32(", gpr(), ")");
out.printf("uint32(%%r%d)", gpr());
return;
case InFPR:
out.print(fpr());
out.printf("%%fr%d", fpr());
return;
#if USE(JSVALUE32_64)
case InPair:
out.print("pair(", tagGPR(), ", ", payloadGPR(), ")");
out.printf("pair(%%r%d, %%r%d)", tagGPR(), payloadGPR());
return;
#endif
case DisplacedInJSStack:
......
/*
* Copyright (C) 2011, 2013 Apple Inc. All rights reserved.
* Copyright (C) 2011 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
......@@ -24,11 +24,11 @@
*/
#include "config.h"
#include "AssemblyHelpers.h"
#include "DFGAssemblyHelpers.h"
#if ENABLE(JIT)
#if ENABLE(DFG_JIT)
namespace JSC {
namespace JSC { namespace DFG {
ExecutableBase* AssemblyHelpers::executableFor(const CodeOrigin& codeOrigin)
{
......@@ -68,7 +68,7 @@ void AssemblyHelpers::clearSamplingFlag(int32_t flag)
}
#endif
#if !ASSERT_DISABLED
#if DFG_ENABLE(JIT_ASSERT)
#if USE(JSVALUE64)
void AssemblyHelpers::jitAssertIsInt32(GPRReg gpr)
{
......@@ -153,9 +153,9 @@ void AssemblyHelpers::jitAssertHasValidCallFrame()
breakpoint();
checkCFR.link(this);
}
#endif // !ASSERT_DISABLED
#endif // DFG_ENABLE(JIT_ASSERT)
} // namespace JSC
} } // namespace JSC::DFG
#endif // ENABLE(JIT)
#endif // ENABLE(DFG_JIT)
......@@ -23,23 +23,24 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef AssemblyHelpers_h
#define AssemblyHelpers_h
#ifndef DFGAssemblyHelpers_h
#define DFGAssemblyHelpers_h
#include <wtf/Platform.h>
#if ENABLE(JIT)
#if ENABLE(DFG_JIT)
#include "CodeBlock.h"
#include "FPRInfo.h"
#include "GPRInfo.h"
#include "JITCode.h"
#include "MacroAssembler.h"
#include "DFGFPRInfo.h"
#include "DFGGPRInfo.h"
#include "DFGJITCode.h"
#include "DFGNode.h"
#include "VM.h"
#include "MacroAssembler.h"
namespace JSC {
namespace JSC { namespace DFG {
typedef void (*V_DebugOperation_EPP)(ExecState*, void*, void*);
typedef void (*V_DFGDebugOperation_EPP)(ExecState*, void*, void*);
class AssemblyHelpers : public MacroAssembler {
public:
......@@ -51,7 +52,7 @@ public:
if (m_codeBlock) {
ASSERT(m_baselineCodeBlock);
ASSERT(!m_baselineCodeBlock->alternative());
ASSERT(JITCode::isBaselineCode(m_baselineCodeBlock->jitType()));
ASSERT(m_baselineCodeBlock->jitType() == JITCode::BaselineJIT);
}
}
......@@ -204,7 +205,7 @@ public:
}
// Add a debug call. This call has no effect on JIT code execution state.
void debugCall(V_DebugOperation_EPP function, void* argument)
void debugCall(V_DFGDebugOperation_EPP function, void* argument)
{
size_t scratchSize = sizeof(EncodedJSValue) * (GPRInfo::numberOfRegisters + FPRInfo::numberOfRegisters);
ScratchBuffer* scratchBuffer = m_vm->scratchBufferForSize(scratchSize);
......@@ -238,7 +239,7 @@ public:
poke(TrustedImmPtr(buffer), 2);
GPRReg scratch = GPRInfo::regT0;
#else
#error "JIT not supported on this platform."
#error "DFG JIT not supported on this platform."
#endif
move(TrustedImmPtr(reinterpret_cast<void*>(function)), scratch);
call(scratch);
......@@ -260,7 +261,7 @@ public:
}
// These methods JIT generate dynamic, debug-only checks - akin to ASSERTs.
#if !ASSERT_DISABLED
#if DFG_ENABLE(JIT_ASSERT)
void jitAssertIsInt32(GPRReg);
void jitAssertIsJSInt32(GPRReg);
void jitAssertIsJSNumber(GPRReg);
......@@ -423,9 +424,9 @@ protected:
HashMap<CodeBlock*, Vector<BytecodeAndMachineOffset> > m_decodedCodeMaps;
};
} // namespace JSC
} } // namespace JSC::DFG
#endif // ENABLE(JIT)
#endif // ENABLE(DFG_JIT)
#endif // AssemblyHelpers_h
#endif // DFGAssemblyHelpers_h
......@@ -30,7 +30,7 @@
#if ENABLE(DFG_JIT)
#include "GPRInfo.h"
#include "DFGGPRInfo.h"
#include "MacroAssembler.h"
namespace JSC { namespace DFG {
......
......@@ -34,7 +34,6 @@
#include "CodeBlockWithJITType.h"
#include "DFGArrayMode.h"
#include "DFGCapabilities.h"
#include "DFGJITCode.h"
#include "GetByIdStatus.h"
#include "Operations.h"
#include "PreciseJumpTargets.h"
......
......@@ -23,17 +23,17 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef CCallHelpers_h
#define CCallHelpers_h
#ifndef DFGCCallHelpers_h
#define DFGCCallHelpers_h
#include <wtf/Platform.h>
#if ENABLE(JIT)
#if ENABLE(DFG_JIT)
#include "AssemblyHelpers.h"
#include "GPRInfo.h"
#include "DFGAssemblyHelpers.h"
#include "DFGGPRInfo.h"
namespace JSC {
namespace JSC { namespace DFG {
class CCallHelpers : public AssemblyHelpers {
public:
......@@ -699,7 +699,7 @@ public:
move(GPRInfo::callFrameRegister, GPRInfo::argumentGPR0);
}
#else
#error "JIT not supported on this platform."
#error "DFG JIT not supported on this platform."
#endif
ALWAYS_INLINE void setupArguments(GPRReg arg1)
......@@ -1090,9 +1090,9 @@ public:
}
};
} // namespace JSC
} } // namespace JSC::DFG
#endif // ENABLE(JIT)
#endif // ENABLE(DFG_JIT)
#endif // CCallHelpers_h
#endif // DFGCCallHelpers_h
......@@ -30,7 +30,6 @@
#include "CodeBlockWithJITType.h"
#include "DFGGraph.h"
#include "DFGJITCode.h"
#include <wtf/StdLibExtras.h>
namespace JSC { namespace DFG {
......
/*
* Copyright (C) 2011, 2013 Apple Inc. All rights reserved.
* Copyright (C) 2011 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
......@@ -23,16 +23,18 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef FPRInfo_h
#define FPRInfo_h
#ifndef DFGFPRInfo_h
#define DFGFPRInfo_h
#if ENABLE(DFG_JIT)
#include "DFGRegisterBank.h"
#include "MacroAssembler.h"
#include <wtf/PrintStream.h>
namespace JSC {
namespace JSC { namespace DFG {
typedef MacroAssembler::FPRegisterID FPRReg;
#define InvalidFPRReg ((::JSC::FPRReg)-1)
#define InvalidFPRReg ((FPRReg)-1)
#if CPU(X86) || CPU(X86_64)
......@@ -299,19 +301,9 @@ private:
#endif
} // namespace JSC
typedef RegisterBank<FPRInfo>::iterator fpr_iterator;
namespace WTF {
} } // namespace JSC::DFG
inline void printInternal(PrintStream& out, JSC::FPRReg reg)
{
#if ENABLE(JIT)
out.print("%", JSC::FPRInfo::debugName(reg));
#else
out.printf("%%fr%d", reg);
#endif
}
} // namespace WTF
#endif
/*
* Copyright (C) 2011, 2013 Apple Inc. All rights reserved.
* Copyright (C) 2011 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
......@@ -23,16 +23,20 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef GPRInfo_h
#define GPRInfo_h
#ifndef DFGGPRInfo_h
#define DFGGPRInfo_h
#include <wtf/Platform.h>
#if ENABLE(DFG_JIT)
#include "DFGRegisterBank.h"
#include "MacroAssembler.h"
#include <wtf/PrintStream.h>
namespace JSC {
namespace JSC { namespace DFG {
typedef MacroAssembler::RegisterID GPRReg;
#define InvalidGPRReg ((::JSC::GPRReg)-1)
#define InvalidGPRReg ((::JSC::DFG::GPRReg)-1)
#if USE(JSVALUE64)
class JSValueRegs {
......@@ -632,19 +636,9 @@ private:
#endif
} // namespace JSC
typedef RegisterBank<GPRInfo>::iterator gpr_iterator;
namespace WTF {
} } // namespace JSC::DFG
inline void printInternal(PrintStream& out, JSC::GPRReg reg)
{
#if ENABLE(JIT)
out.print("%", JSC::GPRInfo::debugName(reg));
#else
out.printf("%%r%d", reg);
#endif
}
} // namespace WTF
#endif
......@@ -29,7 +29,6 @@
#include "CodeBlock.h"
#include "CodeBlockWithJITType.h"
#include "DFGClobberSet.h"
#include "DFGJITCode.h"
#include "DFGVariableAccessDataDump.h"
#include "FunctionExecutableDump.h"
#include "OperandsInlines.h"
......
......@@ -30,9 +30,9 @@
#if ENABLE(DFG_JIT)
#include "AssemblyHelpers.h"
#include "CodeBlock.h"
#include "DFGArgumentPosition.h"
#include "DFGAssemblyHelpers.h"
#include "DFGBasicBlock.h"
#include "DFGDominators.h"
#include "DFGLongLivedState.h"
......
......@@ -28,17 +28,17 @@
#if ENABLE(DFG_JIT)
#include "CCallHelpers.h"
#include "CallFrameInlines.h"
#include "CodeBlock.h"
#include "DFGCCallHelpers.h"
#include "DFGDisassembler.h"
#include "DFGFPRInfo.h"
#include "DFGGPRInfo.h"
#include "DFGGraph.h"
#include "DFGJITCode.h"
#include "DFGOSRExitCompilationInfo.h"
#include "DFGRegisterBank.h"
#include "DFGRegisterSet.h"
#include "FPRInfo.h"
#include "GPRInfo.h"
#include "JITCode.h"
#include "LinkBuffer.h"
#include "MacroAssembler.h"
......
......@@ -28,7 +28,7 @@
#if ENABLE(DFG_JIT)
#include "AssemblyHelpers.h"
#include "DFGAssemblyHelpers.h"
#include "DFGGraph.h"
#include "DFGSpeculativeJIT.h"
#include "JSCellInlines.h"
......