Title: [97235] trunk/Source/_javascript_Core
- Revision
- 97235
- Author
- [email protected]
- Date
- 2011-10-11 23:09:21 -0700 (Tue, 11 Oct 2011)
Log Message
Unreviewed, temporarily reverted r97216 due to bug #69897.
* dfg/DFGJITCodeGenerator.h:
(JSC::DFG::JITCodeGenerator::silentFillGPR):
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (97234 => 97235)
--- trunk/Source/_javascript_Core/ChangeLog 2011-10-12 06:05:48 UTC (rev 97234)
+++ trunk/Source/_javascript_Core/ChangeLog 2011-10-12 06:09:21 UTC (rev 97235)
@@ -1,3 +1,10 @@
+2011-10-11 Gavin Barraclough <[email protected]>
+
+ Unreviewed, temporarily reverted r97216 due to bug #69897.
+
+ * dfg/DFGJITCodeGenerator.h:
+ (JSC::DFG::JITCodeGenerator::silentFillGPR):
+
2011-10-11 Yuqiang Xian <[email protected]>
DFG 32_64 - fix silentFillGPR
Modified: trunk/Source/_javascript_Core/dfg/DFGJITCodeGenerator.h (97234 => 97235)
--- trunk/Source/_javascript_Core/dfg/DFGJITCodeGenerator.h 2011-10-12 06:05:48 UTC (rev 97234)
+++ trunk/Source/_javascript_Core/dfg/DFGJITCodeGenerator.h 2011-10-12 06:09:21 UTC (rev 97235)
@@ -54,9 +54,7 @@
class JITCodeGenerator {
protected:
typedef JITCompiler::TrustedImm32 TrustedImm32;
- typedef JITCompiler::Imm32 Imm32;
- typedef JITCompiler::TrustedImmPtr TrustedImmPtr;
- typedef JITCompiler::ImmPtr ImmPtr;
+ typedef MacroAssembler::Imm32 Imm32;
// These constants are used to set priorities for spill order for
// the register allocator.
@@ -338,40 +336,31 @@
ASSERT(info.registerFormat() != DataFormatDouble);
DataFormat registerFormat = info.registerFormat();
+#if USE(JSVALUE64)
if (registerFormat == DataFormatInteger) {
if (node.hasConstant()) {
ASSERT(isInt32Constant(nodeIndex));
m_jit.move(Imm32(valueOfInt32Constant(nodeIndex)), info.gpr());
} else
- m_jit.load32(JITCompiler::payloadFor(spillMe), info.gpr());
+ m_jit.load32(JITCompiler::addressFor(spillMe), info.gpr());
return;
}
- if (registerFormat == DataFormatCell) {
- if (node.isConstant()) {
- JSValue value = valueOfJSConstant(nodeIndex);
- ASSERT(value.isCell());
- m_jit.move(ImmPtr(value.asCell()), info.gpr());
- } else
- m_jit.loadPtr(JITCompiler::payloadFor(spillMe), info.gpr());
- return;
- }
-
- if (registerFormat == DataFormatStorage) {
- m_jit.loadPtr(JITCompiler::addressFor(spillMe), info.gpr());
- return;
- }
-
- ASSERT(registerFormat & DataFormatJS);
-#if USE(JSVALUE64)
if (node.hasConstant())
m_jit.move(valueOfJSConstantAsImmPtr(nodeIndex), info.gpr());
- else
+ else {
+ ASSERT(registerFormat & DataFormatJS || registerFormat == DataFormatCell || registerFormat == DataFormatStorage);
m_jit.loadPtr(JITCompiler::addressFor(spillMe), info.gpr());
-#else
- if (node.hasConstant())
- m_jit.emitLoad(valueOfJSConstant(nodeIndex), info.tagGPR(), info.payloadGPR());
- else
+ }
+#elif USE(JSVALUE32_64)
+ if (registerFormat == DataFormatInteger || registerFormat == DataFormatCell) {
+ if (node.isConstant())
+ m_jit.move(Imm32(valueOfInt32Constant(nodeIndex)), info.gpr());
+ else
+ m_jit.load32(JITCompiler::payloadFor(spillMe), info.gpr());
+ } else if (registerFormat == DataFormatStorage)
+ m_jit.load32(JITCompiler::addressFor(spillMe), info.gpr());
+ else
m_jit.emitLoad(nodeIndex, info.tagGPR(), info.payloadGPR());
#endif
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
