Title: [164799] trunk/Source/_javascript_Core
- Revision
- 164799
- Author
- rga...@webkit.org
- Date
- 2014-02-27 06:01:45 -0800 (Thu, 27 Feb 2014)
Log Message
r164764 broke the ARM build
https://bugs.webkit.org/show_bug.cgi?id=129415
Reviewed by Zoltan Herczeg.
* assembler/MacroAssemblerARM.h:
(JSC::MacroAssemblerARM::moveWithPatch): Change reinterpret_cast to static_cast.
(JSC::MacroAssemblerARM::canJumpReplacePatchableBranch32WithPatch): Add missing function.
(JSC::MacroAssemblerARM::startOfPatchableBranch32WithPatchOnAddress): Add missing function.
(JSC::MacroAssemblerARM::revertJumpReplacementToPatchableBranch32WithPatch): Add missing function.
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (164798 => 164799)
--- trunk/Source/_javascript_Core/ChangeLog 2014-02-27 14:01:37 UTC (rev 164798)
+++ trunk/Source/_javascript_Core/ChangeLog 2014-02-27 14:01:45 UTC (rev 164799)
@@ -1,3 +1,16 @@
+2014-02-27 Gabor Rapcsanyi <rga...@webkit.org>
+
+ r164764 broke the ARM build
+ https://bugs.webkit.org/show_bug.cgi?id=129415
+
+ Reviewed by Zoltan Herczeg.
+
+ * assembler/MacroAssemblerARM.h:
+ (JSC::MacroAssemblerARM::moveWithPatch): Change reinterpret_cast to static_cast.
+ (JSC::MacroAssemblerARM::canJumpReplacePatchableBranch32WithPatch): Add missing function.
+ (JSC::MacroAssemblerARM::startOfPatchableBranch32WithPatchOnAddress): Add missing function.
+ (JSC::MacroAssemblerARM::revertJumpReplacementToPatchableBranch32WithPatch): Add missing function.
+
2014-02-27 Mark Hahnenberg <mhahnenb...@apple.com>
r164764 broke the ARM build
Modified: trunk/Source/_javascript_Core/assembler/MacroAssemblerARM.h (164798 => 164799)
--- trunk/Source/_javascript_Core/assembler/MacroAssemblerARM.h 2014-02-27 14:01:37 UTC (rev 164798)
+++ trunk/Source/_javascript_Core/assembler/MacroAssemblerARM.h 2014-02-27 14:01:45 UTC (rev 164799)
@@ -1031,7 +1031,7 @@
DataLabel32 moveWithPatch(TrustedImm32 initialValue, RegisterID dest)
{
DataLabel32 dataLabel(this);
- m_assembler.ldrUniqueImmediate(dest, reinterpret_cast<ARMWord>(initialValue.m_value));
+ m_assembler.ldrUniqueImmediate(dest, static_cast<ARMWord>(initialValue.m_value));
return dataLabel;
}
@@ -1370,7 +1370,14 @@
}
static bool canJumpReplacePatchableBranchPtrWithPatch() { return false; }
+ static bool canJumpReplacePatchableBranch32WithPatch() { return false; }
+ static CodeLocationLabel startOfPatchableBranch32WithPatchOnAddress(CodeLocationDataLabel32)
+ {
+ UNREACHABLE_FOR_PLATFORM();
+ return CodeLocationLabel();
+ }
+
static CodeLocationLabel startOfPatchableBranchPtrWithPatchOnAddress(CodeLocationDataLabelPtr)
{
UNREACHABLE_FOR_PLATFORM();
@@ -1387,6 +1394,11 @@
ARMAssembler::revertBranchPtrWithPatch(instructionStart.dataLocation(), reg, reinterpret_cast<uintptr_t>(initialValue) & 0xffff);
}
+ static void revertJumpReplacementToPatchableBranch32WithPatch(CodeLocationLabel, Address, int32_t)
+ {
+ UNREACHABLE_FOR_PLATFORM();
+ }
+
static void revertJumpReplacementToPatchableBranchPtrWithPatch(CodeLocationLabel, Address, void*)
{
UNREACHABLE_FOR_PLATFORM();
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
