[armv7][arm64] Speculative build fix after r159545.
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 20 Nov 2013 16:02:43 +0000 (16:02 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 20 Nov 2013 16:02:43 +0000 (16:02 +0000)
https://bugs.webkit.org/show_bug.cgi?id=124646

Patch by Julien Brianceau <jbriance@cisco.com> on 2013-11-20
Reviewed by Filip Pizlo.

* assembler/ARMv7Assembler.h:
* assembler/MacroAssemblerARM64.h:
(JSC::MacroAssemblerARM64::memoryFence):
* assembler/MacroAssemblerARMv7.h:
(JSC::MacroAssemblerARMv7::memoryFence):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@159564 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/assembler/ARMv7Assembler.h
Source/JavaScriptCore/assembler/MacroAssemblerARM64.h
Source/JavaScriptCore/assembler/MacroAssemblerARMv7.h

index a5db6fe..1e8dd57 100644 (file)
@@ -1,3 +1,16 @@
+2013-11-20  Julien Brianceau  <jbriance@cisco.com>
+
+        [armv7][arm64] Speculative build fix after r159545.
+        https://bugs.webkit.org/show_bug.cgi?id=124646
+
+        Reviewed by Filip Pizlo.
+
+        * assembler/ARMv7Assembler.h:
+        * assembler/MacroAssemblerARM64.h:
+        (JSC::MacroAssemblerARM64::memoryFence):
+        * assembler/MacroAssemblerARMv7.h:
+        (JSC::MacroAssemblerARMv7::memoryFence):
+
 2013-11-19  Ryosuke Niwa  <rniwa@webkit.org>
 
         Enable HTMLTemplateElement on Mac port
index 4058be1..f13b3c4 100644 (file)
@@ -770,7 +770,7 @@ private:
         OP_VCVTSD_T1b   = 0x0A40,
         OP_VCVTDS_T1b   = 0x0A40,
         OP_NOP_T2b      = 0x8000,
-        OP_DMB_SY_T2a   = 0x8F5F,
+        OP_DMB_SY_T2b   = 0x8F5F,
         OP_B_T3b        = 0x8000,
         OP_B_T4b        = 0x9000,
     } OpcodeID2;
index 76adec0..e6ac843 100644 (file)
@@ -2256,7 +2256,7 @@ public:
         m_assembler.nop();
     }
     
-    void memfence()
+    void memoryFence()
     {
         m_assembler.dmbSY();
     }
index 9a2df43..c93e732 100644 (file)
@@ -1237,7 +1237,7 @@ public:
         m_assembler.nop();
     }
     
-    void memfence()
+    void memoryFence()
     {
         m_assembler.dmbSY();
     }