/*
- * Copyright (C) 2012, 2013 Apple Inc. All rights reserved.
+ * Copyright (C) 2012-2015 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
#if ENABLE(DFG_JIT)
#include "CodeBlock.h"
+#include "DFGJITCode.h"
#include "DFGValueSource.h"
-#include "Operations.h"
+#include "JSCInlines.h"
#include <wtf/DataLog.h>
#include <wtf/HashMap.h>
struct MinifiedGenerationInfo {
bool filled; // true -> in gpr/fpr/pair, false -> spilled
+ bool alive;
VariableRepresentation u;
DataFormat format;
MinifiedGenerationInfo()
- : format(DataFormatNone)
+ : filled(false)
+ , alive(false)
+ , format(DataFormatNone)
{
}
case BirthToFill:
case Fill:
filled = true;
+ alive = true;
break;
case BirthToSpill:
case Spill:
filled = false;
+ alive = true;
break;
+ case Birth:
+ alive = true;
+ return;
case Death:
format = DataFormatNone;
+ alive = false;
return;
default:
return;
} // namespace
-bool VariableEventStream::tryToSetConstantRecovery(ValueRecovery& recovery, CodeBlock* codeBlock, MinifiedNode* node) const
+bool VariableEventStream::tryToSetConstantRecovery(ValueRecovery& recovery, MinifiedNode* node) const
{
if (!node)
return false;
- if (node->hasConstantNumber()) {
- recovery = ValueRecovery::constant(
- codeBlock->constantRegister(
- FirstConstantRegisterIndex + node->constantNumber()).get());
+ if (node->hasConstant()) {
+ recovery = ValueRecovery::constant(node->constant());
return true;
}
- if (node->hasWeakConstant()) {
- recovery = ValueRecovery::constant(node->weakConstant());
+ if (node->op() == PhantomDirectArguments) {
+ recovery = ValueRecovery::directArgumentsThatWereNotCreated(node->id());
return true;
}
- if (node->op() == PhantomArguments) {
- recovery = ValueRecovery::argumentsThatWereNotCreated();
+ if (node->op() == PhantomClonedArguments) {
+ recovery = ValueRecovery::outOfBandArgumentsThatWereNotCreated(node->id());
return true;
}
CodeBlock* codeBlock, CodeOrigin codeOrigin, MinifiedGraph& graph,
unsigned index, Operands<ValueRecovery>& valueRecoveries) const
{
- ASSERT(codeBlock->getJITType() == JITCode::DFGJIT);
+ ASSERT(codeBlock->jitType() == JITCode::DFGJIT);
CodeBlock* baselineCodeBlock = codeBlock->baselineVersion();
unsigned numVariables;
if (codeOrigin.inlineCallFrame)
- numVariables = baselineCodeBlockForInlineCallFrame(codeOrigin.inlineCallFrame)->m_numCalleeRegisters + codeOrigin.inlineCallFrame->stackOffset;
+ numVariables = baselineCodeBlockForInlineCallFrame(codeOrigin.inlineCallFrame)->m_numCalleeRegisters + VirtualRegister(codeOrigin.inlineCallFrame->stackOffset).toLocal() + 1;
else
numVariables = baselineCodeBlock->m_numCalleeRegisters;
// reflect this.
if (!index) {
valueRecoveries = Operands<ValueRecovery>(codeBlock->numParameters(), numVariables);
- for (size_t i = 0; i < valueRecoveries.size(); ++i)
- valueRecoveries[i] = ValueRecovery::alreadyInJSStack();
+ for (size_t i = 0; i < valueRecoveries.size(); ++i) {
+ valueRecoveries[i] = ValueRecovery::displacedInJSStack(
+ VirtualRegister(valueRecoveries.operandForIndex(i)), DataFormatJS);
+ }
return;
}
while (at(startIndex).kind() != Reset)
startIndex--;
-#if DFG_ENABLE(DEBUG_VERBOSE)
- dataLogF("Computing OSR exit recoveries starting at seq#%u.\n", startIndex);
-#endif
-
// Step 2: Create a mock-up of the DFG's state and execute the events.
Operands<ValueSource> operandSources(codeBlock->numParameters(), numVariables);
+ for (unsigned i = operandSources.size(); i--;)
+ operandSources[i] = ValueSource(SourceIsDead);
HashMap<MinifiedID, MinifiedGenerationInfo> generationInfos;
for (unsigned i = startIndex; i < index; ++i) {
const VariableEvent& event = at(i);
// nothing to do.
break;
case BirthToFill:
- case BirthToSpill: {
+ case BirthToSpill:
+ case Birth: {
MinifiedGenerationInfo info;
info.update(event);
generationInfos.add(event.id(), info);
break;
}
case MovHintEvent:
- if (operandSources.hasOperand(event.operand()))
- operandSources.setOperand(event.operand(), ValueSource(event.id()));
+ if (operandSources.hasOperand(event.bytecodeRegister()))
+ operandSources.setOperand(event.bytecodeRegister(), ValueSource(event.id()));
break;
case SetLocalEvent:
- if (operandSources.hasOperand(event.operand()))
- operandSources.setOperand(event.operand(), ValueSource::forDataFormat(event.dataFormat()));
+ if (operandSources.hasOperand(event.bytecodeRegister()))
+ operandSources.setOperand(event.bytecodeRegister(), ValueSource::forDataFormat(event.machineRegister(), event.dataFormat()));
break;
default:
RELEASE_ASSERT_NOT_REACHED();
ASSERT(source.kind() == HaveNode);
MinifiedNode* node = graph.at(source.id());
- if (tryToSetConstantRecovery(valueRecoveries[i], codeBlock, node))
- continue;
-
MinifiedGenerationInfo info = generationInfos.get(source.id());
- if (info.format == DataFormatNone) {
- // Try to see if there is an alternate node that would contain the value we want.
- // There are four possibilities:
- //
- // Int32ToDouble: We can use this in place of the original node, but
- // we'd rather not; so we use it only if it is the only remaining
- // live version.
- //
- // ValueToInt32: If the only remaining live version of the value is
- // ValueToInt32, then we can use it.
- //
- // UInt32ToNumber: If the only live version of the value is a UInt32ToNumber
- // then the only remaining uses are ones that want a properly formed number
- // rather than a UInt32 intermediate.
- //
- // DoubleAsInt32: Same as UInt32ToNumber.
- //
- // The reverse of the above: This node could be a UInt32ToNumber, but its
- // alternative is still alive. This means that the only remaining uses of
- // the number would be fine with a UInt32 intermediate.
-
- bool found = false;
-
- if (node && node->op() == UInt32ToNumber) {
- MinifiedID id = node->child1();
- if (tryToSetConstantRecovery(valueRecoveries[i], codeBlock, graph.at(id)))
- continue;
- info = generationInfos.get(id);
- if (info.format != DataFormatNone)
- found = true;
- }
-
- if (!found) {
- MinifiedID int32ToDoubleID;
- MinifiedID valueToInt32ID;
- MinifiedID uint32ToNumberID;
- MinifiedID doubleAsInt32ID;
-
- HashMap<MinifiedID, MinifiedGenerationInfo>::iterator iter = generationInfos.begin();
- HashMap<MinifiedID, MinifiedGenerationInfo>::iterator end = generationInfos.end();
- for (; iter != end; ++iter) {
- MinifiedID id = iter->key;
- node = graph.at(id);
- if (!node)
- continue;
- if (!node->hasChild1())
- continue;
- if (node->child1() != source.id())
- continue;
- if (iter->value.format == DataFormatNone)
- continue;
- switch (node->op()) {
- case Int32ToDouble:
- case ForwardInt32ToDouble:
- int32ToDoubleID = id;
- break;
- case ValueToInt32:
- valueToInt32ID = id;
- break;
- case UInt32ToNumber:
- uint32ToNumberID = id;
- break;
- case DoubleAsInt32:
- doubleAsInt32ID = id;
- break;
- default:
- break;
- }
- }
-
- MinifiedID idToUse;
- if (!!doubleAsInt32ID)
- idToUse = doubleAsInt32ID;
- else if (!!int32ToDoubleID)
- idToUse = int32ToDoubleID;
- else if (!!valueToInt32ID)
- idToUse = valueToInt32ID;
- else if (!!uint32ToNumberID)
- idToUse = uint32ToNumberID;
-
- if (!!idToUse) {
- info = generationInfos.get(idToUse);
- ASSERT(info.format != DataFormatNone);
- found = true;
- }
- }
-
- if (!found) {
- valueRecoveries[i] = ValueRecovery::constant(jsUndefined());
- continue;
- }
+ if (!info.alive) {
+ valueRecoveries[i] = ValueRecovery::constant(jsUndefined());
+ continue;
}
+
+ if (tryToSetConstantRecovery(valueRecoveries[i], node))
+ continue;
ASSERT(info.format != DataFormatNone);
valueRecoveries[i] =
ValueRecovery::displacedInJSStack(static_cast<VirtualRegister>(info.u.virtualReg), info.format);
}
-
- // Step 4: Make sure that for locals that coincide with true call frame headers, the exit compiler knows
- // that those values don't have to be recovered. Signal this by using ValueRecovery::alreadyInJSStack()
- for (InlineCallFrame* inlineCallFrame = codeOrigin.inlineCallFrame; inlineCallFrame; inlineCallFrame = inlineCallFrame->caller.inlineCallFrame) {
- for (unsigned i = JSStack::CallFrameHeaderSize; i--;)
- valueRecoveries.setLocal(inlineCallFrame->stackOffset - i - 1, ValueRecovery::alreadyInJSStack());
- }
}
} } // namespace JSC::DFG
projects / apple / javascriptcore.git / blobdiff