Title: [101324] trunk/Source/_javascript_Core
- Revision
- 101324
- Author
- fpi...@apple.com
- Date
- 2011-11-28 20:59:15 -0800 (Mon, 28 Nov 2011)
Log Message
Unreviewed build fixes for ARM.
* assembler/MacroAssemblerARMv7.h:
(JSC::MacroAssemblerARMv7::readCallTarget):
* dfg/DFGSpeculativeJIT.h:
(JSC::DFG::SpeculativeJIT::setupArgumentsWithExecState):
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (101323 => 101324)
--- trunk/Source/_javascript_Core/ChangeLog 2011-11-29 04:51:56 UTC (rev 101323)
+++ trunk/Source/_javascript_Core/ChangeLog 2011-11-29 04:59:15 UTC (rev 101324)
@@ -1,3 +1,12 @@
+2011-11-28 Filip Pizlo <fpi...@apple.com>
+
+ Unreviewed build fixes for ARM.
+
+ * assembler/MacroAssemblerARMv7.h:
+ (JSC::MacroAssemblerARMv7::readCallTarget):
+ * dfg/DFGSpeculativeJIT.h:
+ (JSC::DFG::SpeculativeJIT::setupArgumentsWithExecState):
+
2011-11-20 Roland Steiner <rolandstei...@chromium.org>
<style scoped>: add ENABLE(STYLE_SCOPED) flag to WebKit
Modified: trunk/Source/_javascript_Core/assembler/MacroAssemblerARMv7.h (101323 => 101324)
--- trunk/Source/_javascript_Core/assembler/MacroAssemblerARMv7.h 2011-11-29 04:51:56 UTC (rev 101323)
+++ trunk/Source/_javascript_Core/assembler/MacroAssemblerARMv7.h 2011-11-29 04:59:15 UTC (rev 101324)
@@ -1468,6 +1468,11 @@
return m_assembler.executableOffsetFor(location);
}
+ static FunctionPtr readCallTarget(CodeLocationCall call)
+ {
+ return FunctionPtr(reinterpret_cast<void(*)()>(ARMv7Assembler::readCallTarget(call.dataLocation())));
+ }
+
protected:
bool inUninterruptedSequence()
{
@@ -1562,11 +1567,6 @@
return static_cast<ARMv7Assembler::Condition>(cond);
}
- static FunctionPtr readCallTarget(CodeLocationCall call)
- {
- return ARMv7Assembler::readCallTarget(call.dataLocation());
- }
-
private:
friend class LinkBuffer;
friend class RepatchBuffer;
Modified: trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT.h (101323 => 101324)
--- trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT.h 2011-11-29 04:51:56 UTC (rev 101323)
+++ trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT.h 2011-11-29 04:59:15 UTC (rev 101324)
@@ -1432,7 +1432,7 @@
m_jit.move(GPRInfo::callFrameRegister, GPRInfo::argumentGPR0);
}
- ALWAYS_INLINE void setupArgumentsWithExecState(GPRReg arg1, TrustedImm32 arg2, TrustedImm32 arg3)
+ ALWAYS_INLINE void setupArgumentsWithExecState(GPRReg arg1, TrustedImm32 arg2, TrustedImmPtr arg3)
{
m_jit.move(arg1, GPRInfo::argumentGPR1);
m_jit.move(arg2, GPRInfo::argumentGPR2);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
