Modified: branches/jsCStack/Source/_javascript_Core/ChangeLog (161269 => 161270)
--- branches/jsCStack/Source/_javascript_Core/ChangeLog 2014-01-03 18:59:58 UTC (rev 161269)
+++ branches/jsCStack/Source/_javascript_Core/ChangeLog 2014-01-03 19:05:25 UTC (rev 161270)
@@ -1,3 +1,18 @@
+2014-01-03 Filip Pizlo <[email protected]>
+
+ Unreviewed, some trivial 32-bit build fixes.
+
+ 32-bit is still broken but this takes care of some easy things. This is part of
+ the work for https://bugs.webkit.org/show_bug.cgi?id=116888.
+
+ * assembler/MacroAssembler.h:
+ (JSC::MacroAssembler::storePtr):
+ * dfg/DFGSpeculativeJIT32_64.cpp:
+ (JSC::DFG::SpeculativeJIT::cachedGetById):
+ (JSC::DFG::SpeculativeJIT::cachedPutById):
+ * jit/RegisterPreservationWrapperGenerator.cpp:
+ (JSC::generateRegisterRestoration):
+
2014-01-02 Mark Lam <[email protected]>
Addressed review comments in https://bugs.webkit.org/show_bug.cgi?id=126393#c5.
Modified: branches/jsCStack/Source/_javascript_Core/assembler/MacroAssembler.h (161269 => 161270)
--- branches/jsCStack/Source/_javascript_Core/assembler/MacroAssembler.h 2014-01-03 18:59:58 UTC (rev 161269)
+++ branches/jsCStack/Source/_javascript_Core/assembler/MacroAssembler.h 2014-01-03 19:05:25 UTC (rev 161270)
@@ -592,6 +592,11 @@
store32(TrustedImm32(imm), address);
}
+ void storePtr(TrustedImm32 imm, ImplicitAddress address)
+ {
+ store32(imm, address);
+ }
+
DataLabel32 storePtrWithAddressOffsetPatch(RegisterID src, Address address)
{
return store32WithAddressOffsetPatch(src, address);
Modified: branches/jsCStack/Source/_javascript_Core/dfg/DFGSpeculativeJIT32_64.cpp (161269 => 161270)
--- branches/jsCStack/Source/_javascript_Core/dfg/DFGSpeculativeJIT32_64.cpp 2014-01-03 18:59:58 UTC (rev 161269)
+++ branches/jsCStack/Source/_javascript_Core/dfg/DFGSpeculativeJIT32_64.cpp 2014-01-03 19:05:25 UTC (rev 161270)
@@ -198,7 +198,7 @@
void SpeculativeJIT::cachedGetById(CodeOrigin codeOrigin, GPRReg baseTagGPROrNone, GPRReg basePayloadGPR, GPRReg resultTagGPR, GPRReg resultPayloadGPR, unsigned identifierNumber, JITCompiler::Jump slowPathTarget, SpillRegistersMode spillMode)
{
JITGetByIdGenerator gen(
- m_jit.codeBlock(), codeOrigin, usedRegisters(), GPRInfo::callFrameRegister,
+ m_jit.codeBlock(), codeOrigin, usedRegisters(),
JSValueRegs(baseTagGPROrNone, basePayloadGPR),
JSValueRegs(resultTagGPR, resultPayloadGPR), spillMode != NeedToSpill);
@@ -232,7 +232,7 @@
writeBarrier(basePayloadGPR, valueTagGPR, valueUse, WriteBarrierForPropertyAccess, scratchGPR);
JITPutByIdGenerator gen(
- m_jit.codeBlock(), codeOrigin, usedRegisters(), GPRInfo::callFrameRegister,
+ m_jit.codeBlock(), codeOrigin, usedRegisters(),
JSValueRegs::payloadOnly(basePayloadGPR), JSValueRegs(valueTagGPR, valuePayloadGPR),
scratchGPR, false, m_jit.ecmaModeFor(codeOrigin), putKind);
Modified: branches/jsCStack/Source/_javascript_Core/jit/RegisterPreservationWrapperGenerator.cpp (161269 => 161270)
--- branches/jsCStack/Source/_javascript_Core/jit/RegisterPreservationWrapperGenerator.cpp 2014-01-03 18:59:58 UTC (rev 161269)
+++ branches/jsCStack/Source/_javascript_Core/jit/RegisterPreservationWrapperGenerator.cpp 2014-01-03 19:05:25 UTC (rev 161270)
@@ -134,6 +134,7 @@
void generateRegisterRestoration(AssemblyHelpers& jit)
{
+#if ENABLE(FTL_JIT)
RegisterSet toSave = registersToPreserve();
ptrdiff_t offset = registerPreservationOffset();
@@ -196,6 +197,10 @@
}
jit.jump(GPRInfo::regT1);
+#else // ENABLE(FTL_JIT)
+ UNUSED_PARAM(jit);
+ UNREACHABLE_FOR_PLATFORM();
+#endif // ENABLE(FTL_JIT)
}
MacroAssemblerCodeRef registerRestorationThunkGenerator(VM* vm)
