<!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>[213709] 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/213709">213709</a></dd>
<dt>Author</dt> <dd>ossy@webkit.org</dd>
<dt>Date</dt> <dd>2017-03-10 05:32:18 -0800 (Fri, 10 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed ARM buildfix after <a href="http://trac.webkit.org/projects/webkit/changeset/213652">r213652</a>.
https://bugs.webkit.org/show_bug.cgi?id=168920
<a href="http://trac.webkit.org/projects/webkit/changeset/213652">r213652</a> used replaceWithBrk and replaceWithBkpt names for the same
function, which was inconsistent and caused build error in ARMAssembler.
* assembler/ARM64Assembler.h:
(JSC::ARM64Assembler::replaceWithBkpt): Renamed replaceWithBrk to replaceWithBkpt.
(JSC::ARM64Assembler::replaceWithBrk): Deleted.
* assembler/ARMAssembler.h:
(JSC::ARMAssembler::replaceWithBkpt): Renamed replaceWithBrk to replaceWithBkpt.
(JSC::ARMAssembler::replaceWithBrk): Deleted.
* assembler/MacroAssemblerARM64.h:
(JSC::MacroAssemblerARM64::replaceWithBreakpoint):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerARM64Assemblerh">trunk/Source/JavaScriptCore/assembler/ARM64Assembler.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerARMAssemblerh">trunk/Source/JavaScriptCore/assembler/ARMAssembler.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerMacroAssemblerARM64h">trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM64.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (213708 => 213709)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2017-03-10 13:02:16 UTC (rev 213708)
+++ trunk/Source/JavaScriptCore/ChangeLog 2017-03-10 13:32:18 UTC (rev 213709)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2017-03-10 Csaba Osztrogonác <ossy@webkit.org>
+
+ Unreviewed ARM buildfix after r213652.
+ https://bugs.webkit.org/show_bug.cgi?id=168920
+
+ r213652 used replaceWithBrk and replaceWithBkpt names for the same
+ function, which was inconsistent and caused build error in ARMAssembler.
+
+ * assembler/ARM64Assembler.h:
+ (JSC::ARM64Assembler::replaceWithBkpt): Renamed replaceWithBrk to replaceWithBkpt.
+ (JSC::ARM64Assembler::replaceWithBrk): Deleted.
+ * assembler/ARMAssembler.h:
+ (JSC::ARMAssembler::replaceWithBkpt): Renamed replaceWithBrk to replaceWithBkpt.
+ (JSC::ARMAssembler::replaceWithBrk): Deleted.
+ * assembler/MacroAssemblerARM64.h:
+ (JSC::MacroAssemblerARM64::replaceWithBreakpoint):
+
</ins><span class="cx"> 2017-03-10 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Win64 build fix.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerARM64Assemblerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/ARM64Assembler.h (213708 => 213709)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/ARM64Assembler.h 2017-03-10 13:02:16 UTC (rev 213708)
+++ trunk/Source/JavaScriptCore/assembler/ARM64Assembler.h 2017-03-10 13:32:18 UTC (rev 213709)
</span><span class="lines">@@ -2536,7 +2536,7 @@
</span><span class="cx"> linkPointer(addressOf(code, where), valuePtr);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- static void replaceWithBrk(void* where)
</del><ins>+ static void replaceWithBkpt(void* where)
</ins><span class="cx"> {
</span><span class="cx"> int insn = excepnGeneration(ExcepnOp_BREAKPOINT, 0, 0);
</span><span class="cx"> performJITMemcpy(where, &insn, sizeof(int));
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerARMAssemblerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/ARMAssembler.h (213708 => 213709)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/ARMAssembler.h 2017-03-10 13:02:16 UTC (rev 213708)
+++ trunk/Source/JavaScriptCore/assembler/ARMAssembler.h 2017-03-10 13:32:18 UTC (rev 213709)
</span><span class="lines">@@ -995,7 +995,7 @@
</span><span class="cx"> return reinterpret_cast<void*>(readPointer(reinterpret_cast<void*>(getAbsoluteJumpAddress(from))));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- static void replaceWithBrk(void* instructionStart)
</del><ins>+ static void replaceWithBkpt(void* instructionStart)
</ins><span class="cx"> {
</span><span class="cx"> ARMWord* instruction = reinterpret_cast<ARMWord*>(instructionStart);
</span><span class="cx"> instruction[0] = BKPT;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerMacroAssemblerARM64h"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM64.h (213708 => 213709)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM64.h 2017-03-10 13:02:16 UTC (rev 213708)
+++ trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM64.h 2017-03-10 13:32:18 UTC (rev 213709)
</span><span class="lines">@@ -3408,7 +3408,7 @@
</span><span class="cx">
</span><span class="cx"> static void replaceWithBreakpoint(CodeLocationLabel instructionStart)
</span><span class="cx"> {
</span><del>- ARM64Assembler::replaceWithBrk(instructionStart.executableAddress());
</del><ins>+ ARM64Assembler::replaceWithBkpt(instructionStart.executableAddress());
</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>