Title: [101473] trunk/Source/_javascript_Core
- Revision
- 101473
- Author
- o...@webkit.org
- Date
- 2011-11-30 03:06:29 -0800 (Wed, 30 Nov 2011)
Log Message
MacroAssemblerARM does not implement readCallTarget
https://bugs.webkit.org/show_bug.cgi?id=73413
Based on Filip Pizlo's patch.
Buildfix. Rubber-stamped by Gabor Loki.
* assembler/ARMAssembler.h:
(JSC::ARMAssembler::readCallTarget):
* assembler/MacroAssemblerARM.h:
(JSC::MacroAssemblerARM::readCallTarget):
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (101472 => 101473)
--- trunk/Source/_javascript_Core/ChangeLog 2011-11-30 11:00:06 UTC (rev 101472)
+++ trunk/Source/_javascript_Core/ChangeLog 2011-11-30 11:06:29 UTC (rev 101473)
@@ -1,3 +1,17 @@
+2011-11-30 Csaba Osztrogonác <o...@webkit.org>
+
+ MacroAssemblerARM does not implement readCallTarget
+ https://bugs.webkit.org/show_bug.cgi?id=73413
+
+ Based on Filip Pizlo's patch.
+
+ Buildfix. Rubber-stamped by Gabor Loki.
+
+ * assembler/ARMAssembler.h:
+ (JSC::ARMAssembler::readCallTarget):
+ * assembler/MacroAssemblerARM.h:
+ (JSC::MacroAssemblerARM::readCallTarget):
+
2011-11-29 Filip Pizlo <fpi...@apple.com>
Resetting a put_by_id inline cache should preserve the "isDirect" bit
Modified: trunk/Source/_javascript_Core/assembler/ARMAssembler.h (101472 => 101473)
--- trunk/Source/_javascript_Core/assembler/ARMAssembler.h 2011-11-30 11:00:06 UTC (rev 101472)
+++ trunk/Source/_javascript_Core/assembler/ARMAssembler.h 2011-11-30 11:06:29 UTC (rev 101473)
@@ -795,6 +795,11 @@
patchPointerInternal(getAbsoluteJumpAddress(from), to);
}
+ static void* readCallTarget(void* from)
+ {
+ return reinterpret_cast<void*>(readPointer(reinterpret_cast<void*>(getAbsoluteJumpAddress(from))));
+ }
+
// Address operations
static void* getRelocatedAddress(void* code, AssemblerLabel label)
Modified: trunk/Source/_javascript_Core/assembler/MacroAssemblerARM.h (101472 => 101473)
--- trunk/Source/_javascript_Core/assembler/MacroAssemblerARM.h 2011-11-30 11:00:06 UTC (rev 101472)
+++ trunk/Source/_javascript_Core/assembler/MacroAssemblerARM.h 2011-11-30 11:06:29 UTC (rev 101473)
@@ -947,6 +947,11 @@
m_assembler.nop();
}
+ static FunctionPtr readCallTarget(CodeLocationCall call)
+ {
+ return FunctionPtr(reinterpret_cast<void(*)()>(ARMAssembler::readCallTarget(call.dataLocation())));
+ }
+
protected:
ARMAssembler::Condition ARMCondition(RelationalCondition cond)
{
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
