<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[209392] trunk/Source/JavaScriptCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/209392">209392</a></dd>
<dt>Author</dt> <dd>ossy@webkit.org</dd>
<dt>Date</dt> <dd>2016-12-06 07:34:22 -0800 (Tue, 06 Dec 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add storeFence support for ARMv7
https://bugs.webkit.org/show_bug.cgi?id=164733
Reviewed by Saam Barati.
* assembler/ARMAssembler.h:
(JSC::ARMAssembler::dmbISHST): Added.
* assembler/ARMv7Assembler.h: Typo fixed, DMB has only T1 encoding.
(JSC::ARMv7Assembler::dmbSY):
(JSC::ARMv7Assembler::dmbISHST): Added.
* assembler/MacroAssemblerARM.h:
(JSC::MacroAssemblerARM::storeFence):
* assembler/MacroAssemblerARMv7.h:
(JSC::MacroAssemblerARMv7::storeFence):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerARMAssemblerh">trunk/Source/JavaScriptCore/assembler/ARMAssembler.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerARMv7Assemblerh">trunk/Source/JavaScriptCore/assembler/ARMv7Assembler.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerMacroAssemblerARMh">trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerMacroAssemblerARMv7h">trunk/Source/JavaScriptCore/assembler/MacroAssemblerARMv7.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (209391 => 209392)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-12-06 12:16:06 UTC (rev 209391)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-12-06 15:34:22 UTC (rev 209392)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-12-06 Csaba Osztrogonác <ossy@webkit.org>
+
+ Add storeFence support for ARMv7
+ https://bugs.webkit.org/show_bug.cgi?id=164733
+
+ Reviewed by Saam Barati.
+
+ * assembler/ARMAssembler.h:
+ (JSC::ARMAssembler::dmbISHST): Added.
+ * assembler/ARMv7Assembler.h: Typo fixed, DMB has only T1 encoding.
+ (JSC::ARMv7Assembler::dmbSY):
+ (JSC::ARMv7Assembler::dmbISHST): Added.
+ * assembler/MacroAssemblerARM.h:
+ (JSC::MacroAssemblerARM::storeFence):
+ * assembler/MacroAssemblerARMv7.h:
+ (JSC::MacroAssemblerARMv7::storeFence):
+
</ins><span class="cx"> 2016-12-05 Matt Baker <mattbaker@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: remove ASSERT from InspectorDebuggerAgent::derefAsyncCallData
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerARMAssemblerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/ARMAssembler.h (209391 => 209392)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/ARMAssembler.h 2016-12-06 12:16:06 UTC (rev 209391)
+++ trunk/Source/JavaScriptCore/assembler/ARMAssembler.h 2016-12-06 15:34:22 UTC (rev 209392)
</span><span class="lines">@@ -215,6 +215,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> NOP = 0xe1a00000,
</span><span class="cx"> DMB_SY = 0xf57ff05f,
</span><ins>+ DMB_ISHST = 0xf57ff05a,
</ins><span class="cx"> #if HAVE(ARM_IDIV_INSTRUCTIONS)
</span><span class="cx"> SDIV = 0x0710f010,
</span><span class="cx"> UDIV = 0x0730f010,
</span><span class="lines">@@ -722,6 +723,11 @@
</span><span class="cx"> m_buffer.putInt(DMB_SY);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ void dmbISHST()
+ {
+ m_buffer.putInt(DMB_ISHST);
+ }
+
</ins><span class="cx"> void bx(int rm, Condition cc = AL)
</span><span class="cx"> {
</span><span class="cx"> emitInstruction(toARMWord(cc) | BX, 0, 0, RM(rm));
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerARMv7Assemblerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/ARMv7Assembler.h (209391 => 209392)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/ARMv7Assembler.h 2016-12-06 12:16:06 UTC (rev 209391)
+++ trunk/Source/JavaScriptCore/assembler/ARMv7Assembler.h 2016-12-06 15:34:22 UTC (rev 209392)
</span><span class="lines">@@ -681,7 +681,7 @@
</span><span class="cx"> OP_MOVT = 0xF2C0,
</span><span class="cx"> OP_UBFX_T1 = 0xF3C0,
</span><span class="cx"> OP_NOP_T2a = 0xF3AF,
</span><del>- OP_DMB_SY_T2a = 0xF3BF,
</del><ins>+ OP_DMB_T1a = 0xF3BF,
</ins><span class="cx"> OP_STRB_imm_T3 = 0xF800,
</span><span class="cx"> OP_STRB_reg_T2 = 0xF800,
</span><span class="cx"> OP_LDRB_imm_T3 = 0xF810,
</span><span class="lines">@@ -715,32 +715,33 @@
</span><span class="cx"> } OpcodeID1;
</span><span class="cx">
</span><span class="cx"> typedef enum {
</span><del>- OP_VADD_T2b = 0x0A00,
- OP_VDIVb = 0x0A00,
- OP_FLDSb = 0x0A00,
- OP_VLDRb = 0x0A00,
- OP_VMOV_IMM_T2b = 0x0A00,
- OP_VMOV_T2b = 0x0A40,
- OP_VMUL_T2b = 0x0A00,
- OP_FSTSb = 0x0A00,
- OP_VSTRb = 0x0A00,
- OP_VMOV_StoCb = 0x0A10,
- OP_VMOV_CtoSb = 0x0A10,
- OP_VMOV_DtoCb = 0x0A10,
- OP_VMOV_CtoDb = 0x0A10,
- OP_VMRSb = 0x0A10,
- OP_VABS_T2b = 0x0A40,
- OP_VCMPb = 0x0A40,
- OP_VCVT_FPIVFPb = 0x0A40,
- OP_VNEG_T2b = 0x0A40,
- OP_VSUB_T2b = 0x0A40,
- OP_VSQRT_T1b = 0x0A40,
- OP_VCVTSD_T1b = 0x0A40,
- OP_VCVTDS_T1b = 0x0A40,
- OP_NOP_T2b = 0x8000,
- OP_DMB_SY_T2b = 0x8F5F,
- OP_B_T3b = 0x8000,
- OP_B_T4b = 0x9000,
</del><ins>+ OP_VADD_T2b = 0x0A00,
+ OP_VDIVb = 0x0A00,
+ OP_FLDSb = 0x0A00,
+ OP_VLDRb = 0x0A00,
+ OP_VMOV_IMM_T2b = 0x0A00,
+ OP_VMOV_T2b = 0x0A40,
+ OP_VMUL_T2b = 0x0A00,
+ OP_FSTSb = 0x0A00,
+ OP_VSTRb = 0x0A00,
+ OP_VMOV_StoCb = 0x0A10,
+ OP_VMOV_CtoSb = 0x0A10,
+ OP_VMOV_DtoCb = 0x0A10,
+ OP_VMOV_CtoDb = 0x0A10,
+ OP_VMRSb = 0x0A10,
+ OP_VABS_T2b = 0x0A40,
+ OP_VCMPb = 0x0A40,
+ OP_VCVT_FPIVFPb = 0x0A40,
+ OP_VNEG_T2b = 0x0A40,
+ OP_VSUB_T2b = 0x0A40,
+ OP_VSQRT_T1b = 0x0A40,
+ OP_VCVTSD_T1b = 0x0A40,
+ OP_VCVTDS_T1b = 0x0A40,
+ OP_NOP_T2b = 0x8000,
+ OP_DMB_SY_T1b = 0x8F5F,
+ OP_DMB_ISHST_T1b = 0x8F5A,
+ OP_B_T3b = 0x8000,
+ OP_B_T4b = 0x9000,
</ins><span class="cx"> } OpcodeID2;
</span><span class="cx">
</span><span class="cx"> struct FourFours {
</span><span class="lines">@@ -2042,9 +2043,14 @@
</span><span class="cx">
</span><span class="cx"> void dmbSY()
</span><span class="cx"> {
</span><del>- m_formatter.twoWordOp16Op16(OP_DMB_SY_T2a, OP_DMB_SY_T2b);
</del><ins>+ m_formatter.twoWordOp16Op16(OP_DMB_T1a, OP_DMB_SY_T1b);
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+ void dmbISHST()
+ {
+ m_formatter.twoWordOp16Op16(OP_DMB_T1a, OP_DMB_ISHST_T1b);
+ }
+
</ins><span class="cx"> AssemblerLabel labelIgnoringWatchpoints()
</span><span class="cx"> {
</span><span class="cx"> return m_formatter.label();
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerMacroAssemblerARMh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM.h (209391 => 209392)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM.h 2016-12-06 12:16:06 UTC (rev 209391)
+++ trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM.h 2016-12-06 15:34:22 UTC (rev 209392)
</span><span class="lines">@@ -1465,9 +1465,7 @@
</span><span class="cx">
</span><span class="cx"> void storeFence()
</span><span class="cx"> {
</span><del>- // FIXME: We should actually implement this. The only current caller is related to
- // concurrent GC, which is disabled on 32-bit systems.
- // https://bugs.webkit.org/show_bug.cgi?id=164733
</del><ins>+ m_assembler.dmbISHST();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static FunctionPtr readCallTarget(CodeLocationCall call)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerMacroAssemblerARMv7h"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/MacroAssemblerARMv7.h (209391 => 209392)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/MacroAssemblerARMv7.h 2016-12-06 12:16:06 UTC (rev 209391)
+++ trunk/Source/JavaScriptCore/assembler/MacroAssemblerARMv7.h 2016-12-06 15:34:22 UTC (rev 209392)
</span><span class="lines">@@ -1346,9 +1346,7 @@
</span><span class="cx">
</span><span class="cx"> void storeFence()
</span><span class="cx"> {
</span><del>- // FIXME: We should actually implement this. The only current caller is related to
- // concurrent GC, which is disabled on 32-bit systems.
- // https://bugs.webkit.org/show_bug.cgi?id=164733
</del><ins>+ m_assembler.dmbISHST();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void replaceWithJump(CodeLocationLabel instructionStart, CodeLocationLabel destination)
</span></span></pre>
</div>
</div>
</body>
</html>