Title: [163859] trunk/Source
Revision
163859
Author
msab...@apple.com
Date
2014-02-10 21:43:48 -0800 (Mon, 10 Feb 2014)

Log Message

Re-enable ARM Thumb2 disassembler
https://bugs.webkit.org/show_bug.cgi?id=128577

Reviewed by Filip Pizlo.

Source/_javascript_Core: 

Changed signature of tryToDisassemble() to match updates.
Fixed typo in disassembler.

* disassembler/ARMv7/ARMv7DOpcode.cpp:
* disassembler/ARMv7Disassembler.cpp:
(JSC::tryToDisassemble):

Source/WTF: 

Added definition of WTF_USE_ARMV7_DISASSEMBLER back to Platform.h

* wtf/Platform.h:

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (163858 => 163859)


--- trunk/Source/_javascript_Core/ChangeLog	2014-02-11 05:24:44 UTC (rev 163858)
+++ trunk/Source/_javascript_Core/ChangeLog	2014-02-11 05:43:48 UTC (rev 163859)
@@ -1,3 +1,17 @@
+2014-02-10  Michael Saboff  <msab...@apple.com>
+
+        Re-enable ARM Thumb2 disassembler
+        https://bugs.webkit.org/show_bug.cgi?id=128577
+
+        Reviewed by Filip Pizlo.
+
+        Changed signature of tryToDisassemble() to match updates.
+        Fixed typo in disassembler.
+
+        * disassembler/ARMv7/ARMv7DOpcode.cpp:
+        * disassembler/ARMv7Disassembler.cpp:
+        (JSC::tryToDisassemble):
+
 2014-02-10  Mark Lam  <mark....@apple.com>
 
         Removing limitation on JSLock's lockDropDepth.

Modified: trunk/Source/_javascript_Core/disassembler/ARMv7/ARMv7DOpcode.cpp (163858 => 163859)


--- trunk/Source/_javascript_Core/disassembler/ARMv7/ARMv7DOpcode.cpp	2014-02-11 05:24:44 UTC (rev 163858)
+++ trunk/Source/_javascript_Core/disassembler/ARMv7/ARMv7DOpcode.cpp	2014-02-11 05:43:48 UTC (rev 163859)
@@ -48,7 +48,7 @@
 };
 
 const char* const ARMv7DOpcode::s_shiftNames[4] = {
-    "lsl", "lsr", "asl", "ror"
+    "lsl", "lsr", "asr", "ror"
 };
 
 const char* const ARMv7DOpcode::s_specialRegisterNames[3] = { "sp", "lr", "pc" };

Modified: trunk/Source/_javascript_Core/disassembler/ARMv7Disassembler.cpp (163858 => 163859)


--- trunk/Source/_javascript_Core/disassembler/ARMv7Disassembler.cpp	2014-02-11 05:24:44 UTC (rev 163858)
+++ trunk/Source/_javascript_Core/disassembler/ARMv7Disassembler.cpp	2014-02-11 05:43:48 UTC (rev 163859)
@@ -33,7 +33,7 @@
 
 namespace JSC {
 
-bool tryToDisassemble(const MacroAssemblerCodePtr& codePtr, size_t size, const char* prefix, PrintStream& out)
+bool tryToDisassemble(const MacroAssemblerCodePtr& codePtr, size_t size, const char* prefix, PrintStream& out, InstructionSubsetHint)
 {
     ARMv7DOpcode armOpcode;
 

Modified: trunk/Source/WTF/ChangeLog (163858 => 163859)


--- trunk/Source/WTF/ChangeLog	2014-02-11 05:24:44 UTC (rev 163858)
+++ trunk/Source/WTF/ChangeLog	2014-02-11 05:43:48 UTC (rev 163859)
@@ -1,3 +1,14 @@
+2014-02-10  Michael Saboff  <msab...@apple.com>
+
+        Re-enable ARM Thumb2 disassembler
+        https://bugs.webkit.org/show_bug.cgi?id=128577
+
+        Reviewed by Filip Pizlo.
+
+        Added definition of WTF_USE_ARMV7_DISASSEMBLER back to Platform.h
+
+        * wtf/Platform.h:
+
 2014-02-10  Benjamin Poulain  <benja...@webkit.org>
 
         Add the basic infrastructure to compile attributes matching in selectors

Modified: trunk/Source/WTF/wtf/Platform.h (163858 => 163859)


--- trunk/Source/WTF/wtf/Platform.h	2014-02-11 05:24:44 UTC (rev 163858)
+++ trunk/Source/WTF/wtf/Platform.h	2014-02-11 05:43:48 UTC (rev 163859)
@@ -693,6 +693,10 @@
 #define WTF_USE_ARM64_DISASSEMBLER 1
 #endif
 
+#if !defined(WTF_USE_ARMV7_DISASSEMBLER) && ENABLE(JIT) && PLATFORM(IOS) && CPU(ARM_THUMB2)
+#define WTF_USE_ARMV7_DISASSEMBLER 1
+#endif
+
 #if !defined(ENABLE_DISASSEMBLER) && (USE(UDIS86) || USE(ARMV7_DISASSEMBLER) || USE(ARM64_DISASSEMBLER))
 #define ENABLE_DISASSEMBLER 1
 #endif
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to