<!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>[191677] 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/191677">191677</a></dd>
<dt>Author</dt> <dd>mark.lam@apple.com</dd>
<dt>Date</dt> <dd>2015-10-28 10:48:10 -0700 (Wed, 28 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add ability to print the PC register from JIT'ed code.
https://bugs.webkit.org/show_bug.cgi?id=150561
Reviewed by Geoffrey Garen.
* assembler/MacroAssemblerPrinter.cpp:
(JSC::printPC):
(JSC::MacroAssemblerPrinter::printCallback):
* assembler/MacroAssemblerPrinter.h:
(JSC::MacroAssemblerPrinter::PrintArg::PrintArg):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerMacroAssemblerPrintercpp">trunk/Source/JavaScriptCore/assembler/MacroAssemblerPrinter.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerMacroAssemblerPrinterh">trunk/Source/JavaScriptCore/assembler/MacroAssemblerPrinter.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (191676 => 191677)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-10-28 17:44:00 UTC (rev 191676)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-10-28 17:48:10 UTC (rev 191677)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-10-28 Mark Lam <mark.lam@apple.com>
+
+ Add ability to print the PC register from JIT'ed code.
+ https://bugs.webkit.org/show_bug.cgi?id=150561
+
+ Reviewed by Geoffrey Garen.
+
+ * assembler/MacroAssemblerPrinter.cpp:
+ (JSC::printPC):
+ (JSC::MacroAssemblerPrinter::printCallback):
+ * assembler/MacroAssemblerPrinter.h:
+ (JSC::MacroAssemblerPrinter::PrintArg::PrintArg):
+
</ins><span class="cx"> 2015-10-27 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Remove Timeline MarkDOMContent and MarkLoad, data is already available
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerMacroAssemblerPrintercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/MacroAssemblerPrinter.cpp (191676 => 191677)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/MacroAssemblerPrinter.cpp 2015-10-28 17:44:00 UTC (rev 191676)
+++ trunk/Source/JavaScriptCore/assembler/MacroAssemblerPrinter.cpp 2015-10-28 17:48:10 UTC (rev 191677)
</span><span class="lines">@@ -89,6 +89,22 @@
</span><span class="cx"> #undef PRINT_FPREGISTER
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static void printPC(CPUState& cpu)
+{
+ union {
+ void* voidPtr;
+ intptr_t intptrValue;
+ } u;
+#if CPU(X86) || CPU(X86_64)
+ u.voidPtr = cpu.eip;
+#elif CPU(ARM_TRADITIONAL) || CPU(ARM_THUMB2) || CPU(ARM64)
+ u.voidPtr = cpu.pc;
+#else
+#error "Unsupported CPU"
+#endif
+ dataLogF("pc:<%p %ld>", u.voidPtr, u.intptrValue);
+}
+
</ins><span class="cx"> void printRegister(CPUState& cpu, RegisterID regID)
</span><span class="cx"> {
</span><span class="cx"> const char* name = CPUState::gprName(regID);
</span><span class="lines">@@ -178,6 +194,9 @@
</span><span class="cx"> case Arg::Type::AllRegisters:
</span><span class="cx"> printCPU(context->cpu, 1);
</span><span class="cx"> break;
</span><ins>+ case Arg::Type::PCRegister:
+ printPC(context->cpu);
+ break;
</ins><span class="cx"> case Arg::Type::RegisterID:
</span><span class="cx"> printRegister(context->cpu, arg.u.gpRegisterID);
</span><span class="cx"> break;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerMacroAssemblerPrinterh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/MacroAssemblerPrinter.h (191676 => 191677)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/MacroAssemblerPrinter.h 2015-10-28 17:44:00 UTC (rev 191676)
+++ trunk/Source/JavaScriptCore/assembler/MacroAssemblerPrinter.h 2015-10-28 17:48:10 UTC (rev 191677)
</span><span class="lines">@@ -89,6 +89,7 @@
</span><span class="cx"> // This is a marker type only used with MacroAssemblerPrinter::print().
</span><span class="cx"> // See MacroAssemblerPrinter::print() below for details.
</span><span class="cx"> struct AllRegisters { };
</span><ins>+struct PCRegister { };
</ins><span class="cx">
</span><span class="cx"> struct Memory {
</span><span class="cx"> using Address = MacroAssembler::Address;
</span><span class="lines">@@ -176,6 +177,7 @@
</span><span class="cx">
</span><span class="cx"> enum class Type {
</span><span class="cx"> AllRegisters,
</span><ins>+ PCRegister,
</ins><span class="cx"> RegisterID,
</span><span class="cx"> FPRegisterID,
</span><span class="cx"> Memory,
</span><span class="lines">@@ -190,6 +192,11 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ PrintArg(PCRegister&)
+ : type(Type::PCRegister)
+ {
+ }
+
</ins><span class="cx"> PrintArg(RegisterID regID)
</span><span class="cx"> : type(Type::RegisterID)
</span><span class="cx"> {
</span></span></pre>
</div>
</div>
</body>
</html>