Title: [101693] trunk/Source/_javascript_Core
Revision
101693
Author
fpi...@apple.com
Date
2011-12-01 11:45:29 -0800 (Thu, 01 Dec 2011)

Log Message

ARMv7 only allows for one-shot patching of compact offsets, while the
JIT expects to be able to repatch
https://bugs.webkit.org/show_bug.cgi?id=73548

Reviewed by Oliver Hunt.

* assembler/ARMv7Assembler.h:
(JSC::ARMv7Assembler::setUInt7ForLoad):

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (101692 => 101693)


--- trunk/Source/_javascript_Core/ChangeLog	2011-12-01 19:31:51 UTC (rev 101692)
+++ trunk/Source/_javascript_Core/ChangeLog	2011-12-01 19:45:29 UTC (rev 101693)
@@ -1,3 +1,14 @@
+2011-12-01  Filip Pizlo  <fpi...@apple.com>
+
+        ARMv7 only allows for one-shot patching of compact offsets, while the
+        JIT expects to be able to repatch
+        https://bugs.webkit.org/show_bug.cgi?id=73548
+
+        Reviewed by Oliver Hunt.
+
+        * assembler/ARMv7Assembler.h:
+        (JSC::ARMv7Assembler::setUInt7ForLoad):
+
 2011-11-30  Benjamin Poulain  <benja...@webkit.org>
 
         URLs are encoded in UTF-8, then decoded as if they are Latin1

Modified: trunk/Source/_javascript_Core/assembler/ARMv7Assembler.h (101692 => 101693)


--- trunk/Source/_javascript_Core/assembler/ARMv7Assembler.h	2011-12-01 19:31:51 UTC (rev 101692)
+++ trunk/Source/_javascript_Core/assembler/ARMv7Assembler.h	2011-12-01 19:45:29 UTC (rev 101693)
@@ -2035,6 +2035,7 @@
         ASSERT(imm.isValid());
         ASSERT(imm.isUInt7());
         uint16_t* location = reinterpret_cast<uint16_t*>(code);
+        location[0] &= ~((static_cast<uint16_t>(0x7f) >> 2) << 6);
         location[0] |= (imm.getUInt7() >> 2) << 6;
         ExecutableAllocator::cacheFlush(location, sizeof(uint16_t));
     }
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to