Title: [151366] releases/WebKitGTK/webkit-2.0/Source
Revision
151366
Author
[email protected]
Date
2013-06-10 01:47:57 -0700 (Mon, 10 Jun 2013)

Log Message

Merge r145194 - Cache flush problem on ARMv7 JSC
https://bugs.webkit.org/show_bug.cgi?id=111441

Reviewed by Zoltan Herczeg.

Not proper cache flush causing random crashes on ARMv7 Linux with V8 tests.
The problem is similar to https://bugs.webkit.org/show_bug.cgi?id=77712.
Change the cache fulsh mechanism similar to ARM traditinal and revert the
temporary fix.

Source/_javascript_Core:

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

Source/WTF:

* wtf/OSAllocatorPosix.cpp:
(WTF::OSAllocator::reserveUncommitted):
(WTF::OSAllocator::decommit):

Modified Paths

Diff

Modified: releases/WebKitGTK/webkit-2.0/Source/_javascript_Core/ChangeLog (151365 => 151366)


--- releases/WebKitGTK/webkit-2.0/Source/_javascript_Core/ChangeLog	2013-06-10 08:04:04 UTC (rev 151365)
+++ releases/WebKitGTK/webkit-2.0/Source/_javascript_Core/ChangeLog	2013-06-10 08:47:57 UTC (rev 151366)
@@ -1,3 +1,18 @@
+2013-03-08  Gabor Rapcsanyi  <[email protected]>
+
+        Cache flush problem on ARMv7 JSC
+        https://bugs.webkit.org/show_bug.cgi?id=111441
+
+        Reviewed by Zoltan Herczeg.
+
+        Not proper cache flush causing random crashes on ARMv7 Linux with V8 tests.
+        The problem is similar to https://bugs.webkit.org/show_bug.cgi?id=77712.
+        Change the cache fulsh mechanism similar to ARM traditinal and revert the
+        temporary fix.
+
+        * assembler/ARMv7Assembler.h:
+        (JSC::ARMv7Assembler::cacheFlush):
+
 2013-04-04  Andras Becsi  <[email protected]>
 
         Fix the build with GCC 4.8

Modified: releases/WebKitGTK/webkit-2.0/Source/_javascript_Core/assembler/ARMv7Assembler.h (151365 => 151366)


--- releases/WebKitGTK/webkit-2.0/Source/_javascript_Core/assembler/ARMv7Assembler.h	2013-06-10 08:04:04 UTC (rev 151365)
+++ releases/WebKitGTK/webkit-2.0/Source/_javascript_Core/assembler/ARMv7Assembler.h	2013-06-10 08:47:57 UTC (rev 151366)
@@ -2218,18 +2218,23 @@
 #if OS(IOS)
         sys_cache_control(kCacheFunctionPrepareForExecution, code, size);
 #elif OS(LINUX)
-        asm volatile(
-            "push    {r7}\n"
-            "mov     r0, %0\n"
-            "mov     r1, %1\n"
-            "movw    r7, #0x2\n"
-            "movt    r7, #0xf\n"
-            "movs    r2, #0x0\n"
-            "svc     0x0\n"
-            "pop     {r7}\n"
-            :
-            : "r" (code), "r" (reinterpret_cast<char*>(code) + size)
-            : "r0", "r1", "r2");
+        uintptr_t currentPage = reinterpret_cast<uintptr_t>(code) & ~(pageSize() - 1);
+        uintptr_t lastPage = (reinterpret_cast<uintptr_t>(code) + size) & ~(pageSize() - 1);
+        do {
+            asm volatile(
+                "push    {r7}\n"
+                "mov     r0, %0\n"
+                "mov     r1, %1\n"
+                "movw    r7, #0x2\n"
+                "movt    r7, #0xf\n"
+                "movs    r2, #0x0\n"
+                "svc     0x0\n"
+                "pop     {r7}\n"
+                :
+                : "r" (currentPage), "r" (currentPage + pageSize())
+                : "r0", "r1", "r2");
+            currentPage += pageSize();
+        } while (lastPage >= currentPage);
 #elif OS(WINCE)
         CacheRangeFlush(code, size, CACHE_SYNC_ALL);
 #elif OS(QNX)

Modified: releases/WebKitGTK/webkit-2.0/Source/WTF/ChangeLog (151365 => 151366)


--- releases/WebKitGTK/webkit-2.0/Source/WTF/ChangeLog	2013-06-10 08:04:04 UTC (rev 151365)
+++ releases/WebKitGTK/webkit-2.0/Source/WTF/ChangeLog	2013-06-10 08:47:57 UTC (rev 151366)
@@ -1,3 +1,19 @@
+2013-03-08  Gabor Rapcsanyi  <[email protected]>
+
+        Cache flush problem on ARMv7 JSC
+        https://bugs.webkit.org/show_bug.cgi?id=111441
+
+        Reviewed by Zoltan Herczeg.
+
+        Not proper cache flush causing random crashes on ARMv7 Linux with V8 tests.
+        The problem is similar to https://bugs.webkit.org/show_bug.cgi?id=77712.
+        Change the cache fulsh mechanism similar to ARM traditinal and revert the
+        temporary fix.
+
+        * wtf/OSAllocatorPosix.cpp:
+        (WTF::OSAllocator::reserveUncommitted):
+        (WTF::OSAllocator::decommit):
+
 2013-04-04  Andras Becsi  <[email protected]>
 
         Fix the build with GCC 4.8
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to