<!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>[213886] trunk/Source</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/213886">213886</a></dd>
<dt>Author</dt> <dd>utatane.tea@gmail.com</dd>
<dt>Date</dt> <dd>2017-03-14 00:33:08 -0700 (Tue, 14 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>[JSC][Linux] Implement VMTrap in Linux ports
https://bugs.webkit.org/show_bug.cgi?id=169436
Reviewed by Mark Lam.
Source/JavaScriptCore:
This patch port VMTrap to Linux ports.
We extract MachineContext accessors from various places (wasm/, heap/ and tools/)
and use them in all the JSC code.
* JavaScriptCore.xcodeproj/project.pbxproj:
* heap/MachineStackMarker.cpp:
(JSC::MachineThreads::Thread::Registers::stackPointer):
(JSC::MachineThreads::Thread::Registers::framePointer):
(JSC::MachineThreads::Thread::Registers::instructionPointer):
(JSC::MachineThreads::Thread::Registers::llintPC):
* heap/MachineStackMarker.h:
* runtime/MachineContext.h: Added.
(JSC::MachineContext::stackPointer):
(JSC::MachineContext::framePointer):
(JSC::MachineContext::instructionPointer):
(JSC::MachineContext::argumentPointer<1>):
(JSC::MachineContext::argumentPointer):
(JSC::MachineContext::llintInstructionPointer):
* runtime/PlatformThread.h:
(JSC::platformThreadSignal):
* runtime/VMTraps.cpp:
(JSC::SignalContext::SignalContext):
(JSC::SignalContext::adjustPCToPointToTrappingInstruction):
* tools/CodeProfiling.cpp:
(JSC::profilingTimer):
* tools/SigillCrashAnalyzer.cpp:
(JSC::SignalContext::SignalContext):
(JSC::SignalContext::dump):
* tools/VMInspector.cpp:
* wasm/WasmFaultSignalHandler.cpp:
(JSC::Wasm::trapHandler):
Source/WTF:
Enable VMTrap mechanism for Linux and FreeBSD.
* wtf/Platform.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreJavaScriptCorexcodeprojprojectpbxproj">trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapMachineStackMarkercpp">trunk/Source/JavaScriptCore/heap/MachineStackMarker.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapMachineStackMarkerh">trunk/Source/JavaScriptCore/heap/MachineStackMarker.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimePlatformThreadh">trunk/Source/JavaScriptCore/runtime/PlatformThread.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeVMTrapscpp">trunk/Source/JavaScriptCore/runtime/VMTraps.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoretoolsCodeProfilingcpp">trunk/Source/JavaScriptCore/tools/CodeProfiling.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoretoolsSigillCrashAnalyzercpp">trunk/Source/JavaScriptCore/tools/SigillCrashAnalyzer.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoretoolsVMInspectorcpp">trunk/Source/JavaScriptCore/tools/VMInspector.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorewasmWasmFaultSignalHandlercpp">trunk/Source/JavaScriptCore/wasm/WasmFaultSignalHandler.cpp</a></li>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfPlatformh">trunk/Source/WTF/wtf/Platform.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreruntimeMachineContexth">trunk/Source/JavaScriptCore/runtime/MachineContext.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (213885 => 213886)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2017-03-14 06:51:23 UTC (rev 213885)
+++ trunk/Source/JavaScriptCore/ChangeLog 2017-03-14 07:33:08 UTC (rev 213886)
</span><span class="lines">@@ -1,3 +1,42 @@
</span><ins>+2017-03-13 Yusuke Suzuki <utatane.tea@gmail.com>
+
+ [JSC][Linux] Implement VMTrap in Linux ports
+ https://bugs.webkit.org/show_bug.cgi?id=169436
+
+ Reviewed by Mark Lam.
+
+ This patch port VMTrap to Linux ports.
+ We extract MachineContext accessors from various places (wasm/, heap/ and tools/)
+ and use them in all the JSC code.
+
+ * JavaScriptCore.xcodeproj/project.pbxproj:
+ * heap/MachineStackMarker.cpp:
+ (JSC::MachineThreads::Thread::Registers::stackPointer):
+ (JSC::MachineThreads::Thread::Registers::framePointer):
+ (JSC::MachineThreads::Thread::Registers::instructionPointer):
+ (JSC::MachineThreads::Thread::Registers::llintPC):
+ * heap/MachineStackMarker.h:
+ * runtime/MachineContext.h: Added.
+ (JSC::MachineContext::stackPointer):
+ (JSC::MachineContext::framePointer):
+ (JSC::MachineContext::instructionPointer):
+ (JSC::MachineContext::argumentPointer<1>):
+ (JSC::MachineContext::argumentPointer):
+ (JSC::MachineContext::llintInstructionPointer):
+ * runtime/PlatformThread.h:
+ (JSC::platformThreadSignal):
+ * runtime/VMTraps.cpp:
+ (JSC::SignalContext::SignalContext):
+ (JSC::SignalContext::adjustPCToPointToTrappingInstruction):
+ * tools/CodeProfiling.cpp:
+ (JSC::profilingTimer):
+ * tools/SigillCrashAnalyzer.cpp:
+ (JSC::SignalContext::SignalContext):
+ (JSC::SignalContext::dump):
+ * tools/VMInspector.cpp:
+ * wasm/WasmFaultSignalHandler.cpp:
+ (JSC::Wasm::trapHandler):
+
</ins><span class="cx"> 2017-03-13 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><span class="cx"> Make the HeapVerifier useful again.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj (213885 => 213886)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj 2017-03-14 06:51:23 UTC (rev 213885)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj 2017-03-14 07:33:08 UTC (rev 213886)
</span><span class="lines">@@ -2439,6 +2439,7 @@
</span><span class="cx"> FEE43FCE1E6641710077D6D1 /* PlatformThread.h in Headers */ = {isa = PBXBuildFile; fileRef = FEE43FCD1E6641400077D6D1 /* PlatformThread.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> FEF040511AAE662D00BD28B0 /* CompareAndSwapTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FEF040501AAE662D00BD28B0 /* CompareAndSwapTest.cpp */; };
</span><span class="cx"> FEFD6FC61D5E7992008F2F0B /* JSStringInlines.h in Headers */ = {isa = PBXBuildFile; fileRef = FEFD6FC51D5E7970008F2F0B /* JSStringInlines.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><ins>+ 981ED82328234D91BAECCADE /* MachineContext.h in Headers */ = {isa = PBXBuildFile; fileRef = 28806E21155E478A93FA7B02 /* MachineContext.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> /* End PBXBuildFile section */
</span><span class="cx">
</span><span class="cx"> /* Begin PBXContainerItemProxy section */
</span><span class="lines">@@ -5034,6 +5035,7 @@
</span><span class="cx"> FEF040501AAE662D00BD28B0 /* CompareAndSwapTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CompareAndSwapTest.cpp; path = API/tests/CompareAndSwapTest.cpp; sourceTree = "<group>"; };
</span><span class="cx"> FEF040521AAEC4ED00BD28B0 /* CompareAndSwapTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CompareAndSwapTest.h; path = API/tests/CompareAndSwapTest.h; sourceTree = "<group>"; };
</span><span class="cx"> FEFD6FC51D5E7970008F2F0B /* JSStringInlines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSStringInlines.h; sourceTree = "<group>"; };
</span><ins>+ 28806E21155E478A93FA7B02 /* MachineContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MachineContext.h; path = MachineContext.h; sourceTree = "<group>"; };
</ins><span class="cx"> /* End PBXFileReference section */
</span><span class="cx">
</span><span class="cx"> /* Begin PBXFrameworksBuildPhase section */
</span><span class="lines">@@ -6933,6 +6935,7 @@
</span><span class="cx"> 709FB8661AE335C60039D069 /* WeakSetPrototype.h */,
</span><span class="cx"> A7DCB77912E3D90500911940 /* WriteBarrier.h */,
</span><span class="cx"> C2B6D75218A33793004A9301 /* WriteBarrierInlines.h */,
</span><ins>+ 28806E21155E478A93FA7B02 /* MachineContext.h */,
</ins><span class="cx"> );
</span><span class="cx"> path = runtime;
</span><span class="cx"> sourceTree = "<group>";
</span><span class="lines">@@ -9370,6 +9373,7 @@
</span><span class="cx"> 86704B8A12DBA33700A9FE7B /* YarrPattern.h in Headers */,
</span><span class="cx"> 86704B4312DB8A8100A9FE7B /* YarrSyntaxChecker.h in Headers */,
</span><span class="cx"> 9F63434577274FAFB9336C38 /* ModuleNamespaceAccessCase.h in Headers */,
</span><ins>+ 981ED82328234D91BAECCADE /* MachineContext.h in Headers */,
</ins><span class="cx"> );
</span><span class="cx"> runOnlyForDeploymentPostprocessing = 0;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapMachineStackMarkercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/MachineStackMarker.cpp (213885 => 213886)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/MachineStackMarker.cpp 2017-03-14 06:51:23 UTC (rev 213885)
+++ trunk/Source/JavaScriptCore/heap/MachineStackMarker.cpp 2017-03-14 07:33:08 UTC (rev 213886)
</span><span class="lines">@@ -481,88 +481,13 @@
</span><span class="cx">
</span><span class="cx"> void* MachineThreads::Thread::Registers::stackPointer() const
</span><span class="cx"> {
</span><del>-#if OS(DARWIN)
-
-#if __DARWIN_UNIX03
-
-#if CPU(X86)
- return reinterpret_cast<void*>(regs.__esp);
-#elif CPU(X86_64)
- return reinterpret_cast<void*>(regs.__rsp);
-#elif CPU(PPC) || CPU(PPC64)
- return reinterpret_cast<void*>(regs.__r1);
-#elif CPU(ARM)
- return reinterpret_cast<void*>(regs.__sp);
-#elif CPU(ARM64)
- return reinterpret_cast<void*>(regs.__sp);
-#else
-#error Unknown Architecture
-#endif
-
-#else // !__DARWIN_UNIX03
-
-#if CPU(X86)
- return reinterpret_cast<void*>(regs.esp);
-#elif CPU(X86_64)
- return reinterpret_cast<void*>(regs.rsp);
-#elif CPU(PPC) || CPU(PPC64)
- return reinterpret_cast<void*>(regs.r1);
-#else
-#error Unknown Architecture
-#endif
-
-#endif // __DARWIN_UNIX03
-
-// end OS(DARWIN)
-#elif OS(WINDOWS)
-
-#if CPU(ARM)
- return reinterpret_cast<void*>((uintptr_t) regs.Sp);
-#elif CPU(MIPS)
- return reinterpret_cast<void*>((uintptr_t) regs.IntSp);
-#elif CPU(X86)
- return reinterpret_cast<void*>((uintptr_t) regs.Esp);
-#elif CPU(X86_64)
- return reinterpret_cast<void*>((uintptr_t) regs.Rsp);
-#else
-#error Unknown Architecture
-#endif
-
</del><ins>+#if OS(DARWIN) || OS(WINDOWS)
+ return MachineContext::stackPointer(regs);
</ins><span class="cx"> #elif USE(PTHREADS)
</span><span class="cx">
</span><del>-#if OS(FREEBSD) && ENABLE(JIT)
-
-#if CPU(X86)
- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.mc_esp);
-#elif CPU(X86_64)
- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.mc_rsp);
-#elif CPU(ARM)
- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.__gregs[_REG_SP]);
-#elif CPU(ARM64)
- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.mc_gpregs.gp_sp);
-#elif CPU(MIPS)
- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.mc_regs[29]);
</del><ins>+#if (OS(FREEBSD) || defined(__GLIBC__)) && ENABLE(JIT)
+ return MachineContext::stackPointer(regs.machineContext);
</ins><span class="cx"> #else
</span><del>-#error Unknown Architecture
-#endif
-
-#elif defined(__GLIBC__) && ENABLE(JIT)
-
-#if CPU(X86)
- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.gregs[REG_ESP]);
-#elif CPU(X86_64)
- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.gregs[REG_RSP]);
-#elif CPU(ARM)
- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.arm_sp);
-#elif CPU(ARM64)
- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.sp);
-#elif CPU(MIPS)
- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.gregs[29]);
-#else
-#error Unknown Architecture
-#endif
-
-#else
</del><span class="cx"> void* stackBase = 0;
</span><span class="cx"> size_t stackSize = 0;
</span><span class="cx"> #if OS(OPENBSD)
</span><span class="lines">@@ -586,83 +511,11 @@
</span><span class="cx"> #if ENABLE(SAMPLING_PROFILER)
</span><span class="cx"> void* MachineThreads::Thread::Registers::framePointer() const
</span><span class="cx"> {
</span><del>-#if OS(DARWIN)
-
-#if __DARWIN_UNIX03
-
-#if CPU(X86)
- return reinterpret_cast<void*>(regs.__ebp);
-#elif CPU(X86_64)
- return reinterpret_cast<void*>(regs.__rbp);
-#elif CPU(ARM)
- return reinterpret_cast<void*>(regs.__r[11]);
-#elif CPU(ARM64)
- return reinterpret_cast<void*>(regs.__x[29]);
</del><ins>+#if OS(DARWIN) || OS(WINDOWS)
+ return MachineContext::framePointer(regs);
+#elif OS(FREEBSD) || defined(__GLIBC__)
+ return MachineContext::framePointer(regs.machineContext);
</ins><span class="cx"> #else
</span><del>-#error Unknown Architecture
-#endif
-
-#else // !__DARWIN_UNIX03
-
-#if CPU(X86)
- return reinterpret_cast<void*>(regs.esp);
-#elif CPU(X86_64)
- return reinterpret_cast<void*>(regs.rsp);
-#else
-#error Unknown Architecture
-#endif
-
-#endif // __DARWIN_UNIX03
-
-// end OS(DARWIN)
-#elif OS(WINDOWS)
-
-#if CPU(ARM)
- return reinterpret_cast<void*>((uintptr_t) regs.R11);
-#elif CPU(MIPS)
-#error Dont know what to do with mips. Do we even need this?
-#elif CPU(X86)
- return reinterpret_cast<void*>((uintptr_t) regs.Ebp);
-#elif CPU(X86_64)
- return reinterpret_cast<void*>((uintptr_t) regs.Rbp);
-#else
-#error Unknown Architecture
-#endif
-
-#elif OS(FREEBSD)
-
-#if CPU(X86)
- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.mc_ebp);
-#elif CPU(X86_64)
- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.mc_rbp);
-#elif CPU(ARM)
- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.__gregs[_REG_FP]);
-#elif CPU(ARM64)
- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.mc_gpregs.gp_x[29]);
-#elif CPU(MIPS)
- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.mc_regs[30]);
-#else
-#error Unknown Architecture
-#endif
-
-#elif defined(__GLIBC__)
-
-// The following sequence depends on glibc's sys/ucontext.h.
-#if CPU(X86)
- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.gregs[REG_EBP]);
-#elif CPU(X86_64)
- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.gregs[REG_RBP]);
-#elif CPU(ARM)
- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.arm_fp);
-#elif CPU(ARM64)
- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.regs[29]);
-#elif CPU(MIPS)
- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.gregs[30]);
-#else
-#error Unknown Architecture
-#endif
-
-#else
</del><span class="cx"> #error Need a way to get the frame pointer for another thread on this platform
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="lines">@@ -669,173 +522,23 @@
</span><span class="cx">
</span><span class="cx"> void* MachineThreads::Thread::Registers::instructionPointer() const
</span><span class="cx"> {
</span><del>-#if OS(DARWIN)
-
-#if __DARWIN_UNIX03
-
-#if CPU(X86)
- return reinterpret_cast<void*>(regs.__eip);
-#elif CPU(X86_64)
- return reinterpret_cast<void*>(regs.__rip);
-#elif CPU(ARM)
- return reinterpret_cast<void*>(regs.__pc);
-#elif CPU(ARM64)
- return reinterpret_cast<void*>(regs.__pc);
</del><ins>+#if OS(DARWIN) || OS(WINDOWS)
+ return MachineContext::instructionPointer(regs);
+#elif OS(FREEBSD) || defined(__GLIBC__)
+ return MachineContext::instructionPointer(regs.machineContext);
</ins><span class="cx"> #else
</span><del>-#error Unknown Architecture
-#endif
-
-#else // !__DARWIN_UNIX03
-#if CPU(X86)
- return reinterpret_cast<void*>(regs.eip);
-#elif CPU(X86_64)
- return reinterpret_cast<void*>(regs.rip);
-#else
-#error Unknown Architecture
-#endif
-
-#endif // __DARWIN_UNIX03
-
-// end OS(DARWIN)
-#elif OS(WINDOWS)
-
-#if CPU(ARM)
- return reinterpret_cast<void*>((uintptr_t) regs.Pc);
-#elif CPU(MIPS)
-#error Dont know what to do with mips. Do we even need this?
-#elif CPU(X86)
- return reinterpret_cast<void*>((uintptr_t) regs.Eip);
-#elif CPU(X86_64)
- return reinterpret_cast<void*>((uintptr_t) regs.Rip);
-#else
-#error Unknown Architecture
-#endif
-
-#elif OS(FREEBSD)
-
-#if CPU(X86)
- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.mc_eip);
-#elif CPU(X86_64)
- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.mc_rip);
-#elif CPU(ARM)
- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.__gregs[_REG_PC]);
-#elif CPU(ARM64)
- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.mc_gpregs.gp_elr);
-#elif CPU(MIPS)
- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.mc_pc);
-#else
-#error Unknown Architecture
-#endif
-
-#elif defined(__GLIBC__)
-
-// The following sequence depends on glibc's sys/ucontext.h.
-#if CPU(X86)
- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.gregs[REG_EIP]);
-#elif CPU(X86_64)
- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.gregs[REG_RIP]);
-#elif CPU(ARM)
- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.arm_pc);
-#elif CPU(ARM64)
- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.pc);
-#elif CPU(MIPS)
- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.pc);
-#else
-#error Unknown Architecture
-#endif
-
-#else
</del><span class="cx"> #error Need a way to get the instruction pointer for another thread on this platform
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> void* MachineThreads::Thread::Registers::llintPC() const
</span><span class="cx"> {
</span><span class="cx"> // LLInt uses regT4 as PC.
</span><del>-#if OS(DARWIN)
-
-#if __DARWIN_UNIX03
-
-#if CPU(X86)
- static_assert(LLInt::LLIntPC == X86Registers::esi, "Wrong LLInt PC.");
- return reinterpret_cast<void*>(regs.__esi);
-#elif CPU(X86_64)
- static_assert(LLInt::LLIntPC == X86Registers::r8, "Wrong LLInt PC.");
- return reinterpret_cast<void*>(regs.__r8);
-#elif CPU(ARM)
- static_assert(LLInt::LLIntPC == ARMRegisters::r8, "Wrong LLInt PC.");
- return reinterpret_cast<void*>(regs.__r[8]);
-#elif CPU(ARM64)
- static_assert(LLInt::LLIntPC == ARM64Registers::x4, "Wrong LLInt PC.");
- return reinterpret_cast<void*>(regs.__x[4]);
</del><ins>+#if OS(DARWIN) || OS(WINDOWS)
+ return MachineContext::llintInstructionPointer(regs);
+#elif OS(FREEBSD) || defined(__GLIBC__)
+ return MachineContext::llintInstructionPointer(regs.machineContext);
</ins><span class="cx"> #else
</span><del>-#error Unknown Architecture
-#endif
-
-#else // !__DARWIN_UNIX03
-#if CPU(X86)
- static_assert(LLInt::LLIntPC == X86Registers::esi, "Wrong LLInt PC.");
- return reinterpret_cast<void*>(regs.esi);
-#elif CPU(X86_64)
- static_assert(LLInt::LLIntPC == X86Registers::r8, "Wrong LLInt PC.");
- return reinterpret_cast<void*>(regs.r8);
-#else
-#error Unknown Architecture
-#endif
-
-#endif // __DARWIN_UNIX03
-
-// end OS(DARWIN)
-#elif OS(WINDOWS)
-
-#if CPU(ARM)
- static_assert(LLInt::LLIntPC == ARMRegisters::r8, "Wrong LLInt PC.");
- return reinterpret_cast<void*>((uintptr_t) regs.R8);
-#elif CPU(MIPS)
-#error Dont know what to do with mips. Do we even need this?
-#elif CPU(X86)
- static_assert(LLInt::LLIntPC == X86Registers::esi, "Wrong LLInt PC.");
- return reinterpret_cast<void*>((uintptr_t) regs.Esi);
-#elif CPU(X86_64)
- static_assert(LLInt::LLIntPC == X86Registers::r10, "Wrong LLInt PC.");
- return reinterpret_cast<void*>((uintptr_t) regs.R10);
-#else
-#error Unknown Architecture
-#endif
-
-#elif OS(FREEBSD)
-
-#if CPU(X86)
- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.mc_esi);
-#elif CPU(X86_64)
- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.mc_r8);
-#elif CPU(ARM)
- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.__gregs[_REG_R8]);
-#elif CPU(ARM64)
- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.mc_gpregs.gp_x[4]);
-#elif CPU(MIPS)
- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.mc_regs[12]);
-#else
-#error Unknown Architecture
-#endif
-
-#elif defined(__GLIBC__)
-
-// The following sequence depends on glibc's sys/ucontext.h.
-#if CPU(X86)
- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.gregs[REG_ESI]);
-#elif CPU(X86_64)
- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.gregs[REG_R8]);
-#elif CPU(ARM)
- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.arm_r8);
-#elif CPU(ARM64)
- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.regs[4]);
-#elif CPU(MIPS)
- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.gregs[12]);
-#else
-#error Unknown Architecture
-#endif
-
-#else
</del><span class="cx"> #error Need a way to get the LLIntPC for another thread on this platform
</span><span class="cx"> #endif
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapMachineStackMarkerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/MachineStackMarker.h (213885 => 213886)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/MachineStackMarker.h 2017-03-14 06:51:23 UTC (rev 213885)
+++ trunk/Source/JavaScriptCore/heap/MachineStackMarker.h 2017-03-14 07:33:08 UTC (rev 213886)
</span><span class="lines">@@ -21,6 +21,7 @@
</span><span class="cx">
</span><span class="cx"> #pragma once
</span><span class="cx">
</span><ins>+#include "MachineContext.h"
</ins><span class="cx"> #include "PlatformThread.h"
</span><span class="cx"> #include "RegisterState.h"
</span><span class="cx"> #include <wtf/Lock.h>
</span><span class="lines">@@ -80,25 +81,8 @@
</span><span class="cx"> void* llintPC() const;
</span><span class="cx"> #endif // ENABLE(SAMPLING_PROFILER)
</span><span class="cx">
</span><del>-#if OS(DARWIN)
-#if CPU(X86)
- typedef i386_thread_state_t PlatformRegisters;
-#elif CPU(X86_64)
- typedef x86_thread_state64_t PlatformRegisters;
-#elif CPU(PPC)
- typedef ppc_thread_state_t PlatformRegisters;
-#elif CPU(PPC64)
- typedef ppc_thread_state64_t PlatformRegisters;
-#elif CPU(ARM)
- typedef arm_thread_state_t PlatformRegisters;
-#elif CPU(ARM64)
- typedef arm_thread_state64_t PlatformRegisters;
-#else
-#error Unknown Architecture
-#endif
-
-#elif OS(WINDOWS)
- typedef CONTEXT PlatformRegisters;
</del><ins>+#if OS(DARWIN) || OS(WINDOWS)
+ using PlatformRegisters = MachineContext::PlatformRegisters;
</ins><span class="cx"> #elif USE(PTHREADS)
</span><span class="cx"> struct PlatformRegisters {
</span><span class="cx"> pthread_attr_t attribute;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeMachineContexth"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/runtime/MachineContext.h (0 => 213886)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/MachineContext.h (rev 0)
+++ trunk/Source/JavaScriptCore/runtime/MachineContext.h 2017-03-14 07:33:08 UTC (rev 213886)
</span><span class="lines">@@ -0,0 +1,611 @@
</span><ins>+/*
+ * Copyright (C) 2017 Yusuke Suzuki <utatane.tea@gmail.com>.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#pragma once
+
+#include "GPRInfo.h"
+#include "LLIntPCRanges.h"
+#include <wtf/StdLibExtras.h>
+
+#if OS(DARWIN) || OS(FREEBSD) || defined(__GLIBC__)
+#include <signal.h>
+// Using signal.h didn't make mcontext_t and ucontext_t available on FreeBSD.
+// This bug has been fixed in FreeBSD 11.0-CURRENT, so this workaround can be
+// removed after FreeBSD 10.x goes EOL.
+// https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=207079
+#if OS(FREEBSD)
+#include <ucontext.h>
+#endif
+#endif
+
+namespace JSC {
+namespace MachineContext {
+
+#if OS(DARWIN)
+
+#if CPU(X86)
+typedef i386_thread_state_t PlatformRegisters;
+#elif CPU(X86_64)
+typedef x86_thread_state64_t PlatformRegisters;
+#elif CPU(PPC)
+typedef ppc_thread_state_t PlatformRegisters;
+#elif CPU(PPC64)
+typedef ppc_thread_state64_t PlatformRegisters;
+#elif CPU(ARM)
+typedef arm_thread_state_t PlatformRegisters;
+#elif CPU(ARM64)
+typedef arm_thread_state64_t PlatformRegisters;
+#else
+#error Unknown Architecture
+#endif
+
+#elif OS(WINDOWS)
+
+typedef CONTEXT PlatformRegisters;
+
+#endif
+
+
+#if OS(DARWIN) || OS(WINDOWS)
+inline void*& stackPointer(PlatformRegisters& regs)
+{
+#if OS(DARWIN)
+#if __DARWIN_UNIX03
+
+#if CPU(X86)
+ return reinterpret_cast<void*&>(regs.__esp);
+#elif CPU(X86_64)
+ return reinterpret_cast<void*&>(regs.__rsp);
+#elif CPU(PPC) || CPU(PPC64)
+ return reinterpret_cast<void*&>(regs.__r1);
+#elif CPU(ARM_THUMB2) || CPU(ARM) || CPU(ARM64)
+ return reinterpret_cast<void*&>(regs.__sp);
+#else
+#error Unknown Architecture
+#endif
+
+#else // !__DARWIN_UNIX03
+
+#if CPU(X86)
+ return reinterpret_cast<void*&>(regs.esp);
+#elif CPU(X86_64)
+ return reinterpret_cast<void*&>(regs.rsp);
+#elif CPU(PPC) || CPU(PPC64)
+ return reinterpret_cast<void*&>(regs.r1);
+#else
+#error Unknown Architecture
+#endif
+
+#endif // __DARWIN_UNIX03
+
+#elif OS(WINDOWS)
+
+#if CPU(ARM)
+ return reinterpret_cast<void*&>((uintptr_t&) regs.Sp);
+#elif CPU(MIPS)
+ return reinterpret_cast<void*&>((uintptr_t&) regs.IntSp);
+#elif CPU(X86)
+ return reinterpret_cast<void*&>((uintptr_t&) regs.Esp);
+#elif CPU(X86_64)
+ return reinterpret_cast<void*&>((uintptr_t&) regs.Rsp);
+#else
+#error Unknown Architecture
+#endif
+
+#endif // OS(DARWIN)
+}
+
+inline void* stackPointer(const PlatformRegisters& regs)
+{
+ return stackPointer(const_cast<PlatformRegisters&>(regs));
+}
+#endif // OS(DARWIN) || OS(WINDOWS)
+
+
+#if OS(DARWIN) || ((OS(FREEBSD) || defined(__GLIBC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS)))
+inline void*& stackPointer(mcontext_t& machineContext)
+{
+#if OS(DARWIN)
+ return stackPointer(machineContext->__ss);
+#elif OS(FREEBSD)
+
+#if CPU(X86)
+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.mc_esp);
+#elif CPU(X86_64)
+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.mc_rsp);
+#elif CPU(ARM)
+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_SP]);
+#elif CPU(ARM64)
+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.mc_gpregs.gp_sp);
+#elif CPU(MIPS)
+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.mc_regs[29]);
+#else
+#error Unknown Architecture
+#endif
+
+#elif defined(__GLIBC__)
+
+#if CPU(X86)
+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.gregs[REG_ESP]);
+#elif CPU(X86_64)
+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.gregs[REG_RSP]);
+#elif CPU(ARM)
+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.arm_sp);
+#elif CPU(ARM64)
+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.sp);
+#elif CPU(MIPS)
+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.gregs[29]);
+#else
+#error Unknown Architecture
+#endif
+#endif
+}
+
+inline void* stackPointer(const mcontext_t& machineContext)
+{
+ return stackPointer(const_cast<mcontext_t&>(machineContext));
+}
+#endif // OS(DARWIN) || ((OS(FREEBSD) || defined(__GLIBC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS)))
+
+
+#if OS(DARWIN) || OS(WINDOWS)
+inline void*& framePointer(PlatformRegisters& regs)
+{
+#if OS(DARWIN)
+
+#if __DARWIN_UNIX03
+
+#if CPU(X86)
+ return reinterpret_cast<void*&>(regs.__ebp);
+#elif CPU(X86_64)
+ return reinterpret_cast<void*&>(regs.__rbp);
+#elif CPU(ARM_THUMB2)
+ return reinterpret_cast<void*&>(regs.__r[7]);
+#elif CPU(ARM)
+ return reinterpret_cast<void*&>(regs.__r[11]);
+#elif CPU(ARM64)
+ return reinterpret_cast<void*&>(regs.__x[29]);
+#else
+#error Unknown Architecture
+#endif
+
+#else // !__DARWIN_UNIX03
+
+#if CPU(X86)
+ return reinterpret_cast<void*&>(regs.esp);
+#elif CPU(X86_64)
+ return reinterpret_cast<void*&>(regs.rsp);
+#else
+#error Unknown Architecture
+#endif
+
+#endif // __DARWIN_UNIX03
+
+#elif OS(WINDOWS)
+
+#if CPU(ARM)
+ return reinterpret_cast<void*&>((uintptr_t&) regs.R11);
+#elif CPU(MIPS)
+#error Dont know what to do with mips. Do we even need this?
+#elif CPU(X86)
+ return reinterpret_cast<void*&>((uintptr_t&) regs.Ebp);
+#elif CPU(X86_64)
+ return reinterpret_cast<void*&>((uintptr_t&) regs.Rbp);
+#else
+#error Unknown Architecture
+#endif
+
+#endif // OS(DARWIN)
+}
+
+inline void* framePointer(const PlatformRegisters& regs)
+{
+ return framePointer(const_cast<PlatformRegisters&>(regs));
+}
+#endif // OS(DARWIN) || OS(WINDOWS)
+
+
+#if OS(DARWIN) || ((OS(FREEBSD) || defined(__GLIBC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS)))
+inline void*& framePointer(mcontext_t& machineContext)
+{
+#if OS(DARWIN)
+ return framePointer(machineContext->__ss);
+#elif OS(FREEBSD)
+
+#if CPU(X86)
+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.mc_ebp);
+#elif CPU(X86_64)
+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.mc_rbp);
+#elif CPU(ARM)
+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_FP]);
+#elif CPU(ARM64)
+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.mc_gpregs.gp_x[29]);
+#elif CPU(MIPS)
+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.mc_regs[30]);
+#else
+#error Unknown Architecture
+#endif
+
+#elif defined(__GLIBC__)
+
+// The following sequence depends on glibc's sys/ucontext.h.
+#if CPU(X86)
+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.gregs[REG_EBP]);
+#elif CPU(X86_64)
+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.gregs[REG_RBP]);
+#elif CPU(ARM)
+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.arm_fp);
+#elif CPU(ARM64)
+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.regs[29]);
+#elif CPU(MIPS)
+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.gregs[30]);
+#else
+#error Unknown Architecture
+#endif
+
+#else
+#error Need a way to get the frame pointer for another thread on this platform
+#endif
+}
+
+inline void* framePointer(const mcontext_t& machineContext)
+{
+ return framePointer(const_cast<mcontext_t&>(machineContext));
+}
+#endif // OS(DARWIN) || ((OS(FREEBSD) || defined(__GLIBC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS)))
+
+
+#if OS(DARWIN) || OS(WINDOWS)
+inline void*& instructionPointer(PlatformRegisters& regs)
+{
+#if OS(DARWIN)
+#if __DARWIN_UNIX03
+
+#if CPU(X86)
+ return reinterpret_cast<void*&>(regs.__eip);
+#elif CPU(X86_64)
+ return reinterpret_cast<void*&>(regs.__rip);
+#elif CPU(ARM_THUMB2) || CPU(ARM) || CPU(ARM64)
+ return reinterpret_cast<void*&>(regs.__pc);
+#else
+#error Unknown Architecture
+#endif
+
+#else // !__DARWIN_UNIX03
+#if CPU(X86)
+ return reinterpret_cast<void*&>(regs.eip);
+#elif CPU(X86_64)
+ return reinterpret_cast<void*&>(regs.rip);
+#else
+#error Unknown Architecture
+#endif
+
+#endif // __DARWIN_UNIX03
+
+#elif OS(WINDOWS)
+
+#if CPU(ARM)
+ return reinterpret_cast<void*&>((uintptr_t&) regs.Pc);
+#elif CPU(MIPS)
+#error Dont know what to do with mips. Do we even need this?
+#elif CPU(X86)
+ return reinterpret_cast<void*&>((uintptr_t&) regs.Eip);
+#elif CPU(X86_64)
+ return reinterpret_cast<void*&>((uintptr_t&) regs.Rip);
+#else
+#error Unknown Architecture
+#endif
+
+#endif // OS(DARWIN)
+}
+
+inline void* instructionPointer(const PlatformRegisters& regs)
+{
+ return instructionPointer(const_cast<PlatformRegisters&>(regs));
+}
+#endif // OS(DARWIN) || OS(WINDOWS)
+
+
+#if OS(DARWIN) || ((OS(FREEBSD) || defined(__GLIBC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS)))
+
+inline void*& instructionPointer(mcontext_t& machineContext)
+{
+#if OS(DARWIN)
+ return instructionPointer(machineContext->__ss);
+#elif OS(FREEBSD)
+
+#if CPU(X86)
+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.mc_eip);
+#elif CPU(X86_64)
+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.mc_rip);
+#elif CPU(ARM)
+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_PC]);
+#elif CPU(ARM64)
+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.mc_gpregs.gp_elr);
+#elif CPU(MIPS)
+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.mc_pc);
+#else
+#error Unknown Architecture
+#endif
+
+#elif defined(__GLIBC__)
+
+// The following sequence depends on glibc's sys/ucontext.h.
+#if CPU(X86)
+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.gregs[REG_EIP]);
+#elif CPU(X86_64)
+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.gregs[REG_RIP]);
+#elif CPU(ARM)
+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.arm_pc);
+#elif CPU(ARM64)
+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.pc);
+#elif CPU(MIPS)
+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.pc);
+#else
+#error Unknown Architecture
+#endif
+
+#else
+#error Need a way to get the instruction pointer for another thread on this platform
+#endif
+}
+
+inline void* instructionPointer(const mcontext_t& machineContext)
+{
+ return instructionPointer(const_cast<mcontext_t&>(machineContext));
+}
+#endif // OS(DARWIN) || ((OS(FREEBSD) || defined(__GLIBC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS)))
+
+
+#if OS(DARWIN) || OS(WINDOWS)
+template<size_t N>
+void*& argumentPointer(PlatformRegisters&);
+
+template<>
+inline void*& argumentPointer<1>(PlatformRegisters& regs)
+{
+#if OS(DARWIN)
+#if __DARWIN_UNIX03
+
+#if CPU(X86)
+ return reinterpret_cast<void*&>(regs.__edx);
+#elif CPU(X86_64)
+ return reinterpret_cast<void*&>(regs.__rsi);
+#elif CPU(ARM_THUMB2) || CPU(ARM)
+ return reinterpret_cast<void*&>(regs.__r[1]);
+#elif CPU(ARM64)
+ return reinterpret_cast<void*&>(regs.__x[1]);
+#else
+#error Unknown Architecture
+#endif
+
+#else // !__DARWIN_UNIX03
+
+#if CPU(X86)
+ return reinterpret_cast<void*&>(regs.edx);
+#elif CPU(X86_64)
+ return reinterpret_cast<void*&>(regs.rsi);
+#else
+#error Unknown Architecture
+#endif
+
+#endif // __DARWIN_UNIX03
+
+#elif OS(WINDOWS)
+
+#if CPU(ARM)
+ return reinterpret_cast<void*&>((uintptr_t&) regs.R1);
+#elif CPU(MIPS)
+#error Dont know what to do with mips. Do we even need this?
+#elif CPU(X86)
+ return reinterpret_cast<void*&>((uintptr_t&) regs.Edx);
+#elif CPU(X86_64)
+ return reinterpret_cast<void*&>((uintptr_t&) regs.Rdx);
+#else
+#error Unknown Architecture
+#endif
+
+#endif // OS(DARWIN)
+}
+
+template<size_t N>
+inline void* argumentPointer(const PlatformRegisters& regs)
+{
+ return argumentPointer<N>(const_cast<PlatformRegisters&>(regs));
+}
+#endif // OS(DARWIN) || OS(WINDOWS)
+
+
+#if OS(DARWIN) || ((OS(FREEBSD) || defined(__GLIBC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS)))
+template<unsigned N>
+void*& argumentPointer(mcontext_t&);
+
+template<>
+inline void*& argumentPointer<1>(mcontext_t& machineContext)
+{
+#if OS(DARWIN)
+ return argumentPointer<1>(machineContext->__ss);
+#elif OS(FREEBSD)
+
+#if CPU(X86)
+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.mc_edx);
+#elif CPU(X86_64)
+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.mc_rsi);
+#elif CPU(ARM)
+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_R1]);
+#elif CPU(ARM64)
+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.mc_gpregs.gp_x[1]);
+#elif CPU(MIPS)
+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.mc_regs[5]);
+#else
+#error Unknown Architecture
+#endif
+
+#elif defined(__GLIBC__)
+
+// The following sequence depends on glibc's sys/ucontext.h.
+#if CPU(X86)
+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.gregs[REG_EDX]);
+#elif CPU(X86_64)
+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.gregs[REG_RSI]);
+#elif CPU(ARM)
+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.arm_r1);
+#elif CPU(ARM64)
+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.regs[1]);
+#elif CPU(MIPS)
+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.gregs[5]);
+#else
+#error Unknown Architecture
+#endif
+
+#else
+#error Need a way to get the frame pointer for another thread on this platform
+#endif
+}
+
+template<unsigned N>
+inline void* argumentPointer(const mcontext_t& machineContext)
+{
+ return argumentPointer<N>(const_cast<mcontext_t&>(machineContext));
+}
+#endif // OS(DARWIN) || ((OS(FREEBSD) || defined(__GLIBC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS)))
+
+#if ENABLE(JIT)
+#if OS(DARWIN) || OS(WINDOWS)
+inline void*& llintInstructionPointer(PlatformRegisters& regs)
+{
+ // LLInt uses regT4 as PC.
+#if OS(DARWIN)
+#if __DARWIN_UNIX03
+
+#if CPU(X86)
+ static_assert(LLInt::LLIntPC == X86Registers::esi, "Wrong LLInt PC.");
+ return reinterpret_cast<void*&>(regs.__esi);
+#elif CPU(X86_64)
+ static_assert(LLInt::LLIntPC == X86Registers::r8, "Wrong LLInt PC.");
+ return reinterpret_cast<void*&>(regs.__r8);
+#elif CPU(ARM)
+ static_assert(LLInt::LLIntPC == ARMRegisters::r8, "Wrong LLInt PC.");
+ return reinterpret_cast<void*&>(regs.__r[8]);
+#elif CPU(ARM64)
+ static_assert(LLInt::LLIntPC == ARM64Registers::x4, "Wrong LLInt PC.");
+ return reinterpret_cast<void*&>(regs.__x[4]);
+#else
+#error Unknown Architecture
+#endif
+
+#else // !__DARWIN_UNIX03
+#if CPU(X86)
+ static_assert(LLInt::LLIntPC == X86Registers::esi, "Wrong LLInt PC.");
+ return reinterpret_cast<void*&>(regs.esi);
+#elif CPU(X86_64)
+ static_assert(LLInt::LLIntPC == X86Registers::r8, "Wrong LLInt PC.");
+ return reinterpret_cast<void*&>(regs.r8);
+#else
+#error Unknown Architecture
+#endif
+
+#endif // __DARWIN_UNIX03
+
+#elif OS(WINDOWS)
+
+#if CPU(ARM)
+ static_assert(LLInt::LLIntPC == ARMRegisters::r8, "Wrong LLInt PC.");
+ return reinterpret_cast<void*&>((uintptr_t&) regs.R8);
+#elif CPU(MIPS)
+#error Dont know what to do with mips. Do we even need this?
+#elif CPU(X86)
+ static_assert(LLInt::LLIntPC == X86Registers::esi, "Wrong LLInt PC.");
+ return reinterpret_cast<void*&>((uintptr_t&) regs.Esi);
+#elif CPU(X86_64)
+ static_assert(LLInt::LLIntPC == X86Registers::r10, "Wrong LLInt PC.");
+ return reinterpret_cast<void*&>((uintptr_t&) regs.R10);
+#else
+#error Unknown Architecture
+#endif
+
+#endif // OS(DARWIN)
+}
+
+inline void* llintInstructionPointer(const PlatformRegisters& regs)
+{
+ return llintInstructionPointer(const_cast<PlatformRegisters&>(regs));
+}
+#endif // OS(DARWIN) || OS(WINDOWS)
+
+
+#if OS(DARWIN) || ((OS(FREEBSD) || defined(__GLIBC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS)))
+inline void*& llintInstructionPointer(mcontext_t& machineContext)
+{
+ // LLInt uses regT4 as PC.
+#if OS(DARWIN)
+ return llintInstructionPointer(machineContext->__ss);
+#elif OS(FREEBSD)
+
+#if CPU(X86)
+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.mc_esi);
+#elif CPU(X86_64)
+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.mc_r8);
+#elif CPU(ARM)
+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_R8]);
+#elif CPU(ARM64)
+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.mc_gpregs.gp_x[4]);
+#elif CPU(MIPS)
+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.mc_regs[12]);
+#else
+#error Unknown Architecture
+#endif
+
+#elif defined(__GLIBC__)
+
+// The following sequence depends on glibc's sys/ucontext.h.
+#if CPU(X86)
+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.gregs[REG_ESI]);
+#elif CPU(X86_64)
+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.gregs[REG_R8]);
+#elif CPU(ARM)
+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.arm_r8);
+#elif CPU(ARM64)
+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.regs[4]);
+#elif CPU(MIPS)
+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.gregs[12]);
+#else
+#error Unknown Architecture
+#endif
+
+#else
+#error Need a way to get the LLIntPC for another thread on this platform
+#endif
+}
+
+inline void* llintInstructionPointer(const mcontext_t& machineContext)
+{
+ return llintInstructionPointer(const_cast<mcontext_t&>(machineContext));
+}
+#endif // OS(DARWIN) || ((OS(FREEBSD) || defined(__GLIBC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS)))
+#endif // ENABLE(JIT)
+
+}
+}
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimePlatformThreadh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/PlatformThread.h (213885 => 213886)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/PlatformThread.h 2017-03-14 06:51:23 UTC (rev 213885)
+++ trunk/Source/JavaScriptCore/runtime/PlatformThread.h 2017-03-14 07:33:08 UTC (rev 213886)
</span><span class="lines">@@ -29,6 +29,10 @@
</span><span class="cx"> #include <pthread.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if USE(PTHREADS) && !OS(WINDOWS) && !OS(DARWIN)
+#include <signal.h>
+#endif
+
</ins><span class="cx"> #if OS(DARWIN)
</span><span class="cx"> #include <mach/thread_act.h>
</span><span class="cx"> #elif OS(WINDOWS)
</span><span class="lines">@@ -63,6 +67,12 @@
</span><span class="cx"> int errNo = pthread_kill(pthreadID, signalNumber);
</span><span class="cx"> return !errNo; // A 0 errNo means success.
</span><span class="cx"> }
</span><ins>+#elif USE(PTHREADS)
+inline bool platformThreadSignal(PlatformThread pthreadID, int signalNumber)
+{
+ int errNo = pthread_kill(pthreadID, signalNumber);
+ return !errNo; // A 0 errNo means success.
+}
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> } // namespace JSC
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeVMTrapscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/VMTraps.cpp (213885 => 213886)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/VMTraps.cpp 2017-03-14 06:51:23 UTC (rev 213885)
+++ trunk/Source/JavaScriptCore/runtime/VMTraps.cpp 2017-03-14 07:33:08 UTC (rev 213886)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx"> #include "ExceptionHelpers.h"
</span><span class="cx"> #include "HeapInlines.h"
</span><span class="cx"> #include "LLIntPCRanges.h"
</span><ins>+#include "MachineContext.h"
</ins><span class="cx"> #include "MachineStackMarker.h"
</span><span class="cx"> #include "MacroAssembler.h"
</span><span class="cx"> #include "VM.h"
</span><span class="lines">@@ -56,22 +57,24 @@
</span><span class="cx"> struct sigaction originalSigusr1Action;
</span><span class="cx"> struct sigaction originalSigtrapAction;
</span><span class="cx">
</span><del>-#if CPU(X86_64)
-
</del><span class="cx"> struct SignalContext {
</span><span class="cx"> SignalContext(mcontext_t& mcontext)
</span><span class="cx"> : mcontext(mcontext)
</span><del>- , trapPC(reinterpret_cast<void*>(mcontext->__ss.__rip))
- , stackPointer(reinterpret_cast<void*>(mcontext->__ss.__rsp))
- , framePointer(reinterpret_cast<void*>(mcontext->__ss.__rbp))
</del><ins>+ , trapPC(MachineContext::instructionPointer(mcontext))
+ , stackPointer(MachineContext::stackPointer(mcontext))
+ , framePointer(MachineContext::framePointer(mcontext))
</ins><span class="cx"> {
</span><ins>+#if CPU(X86_64) || CPU(X86)
</ins><span class="cx"> // On X86_64, SIGTRAP reports the address after the trapping PC. So, dec by 1.
</span><span class="cx"> trapPC = reinterpret_cast<uint8_t*>(trapPC) - 1;
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void adjustPCToPointToTrappingInstruction()
</span><span class="cx"> {
</span><del>- mcontext->__ss.__rip = reinterpret_cast<uintptr_t>(trapPC);
</del><ins>+#if CPU(X86_64) || CPU(X86)
+ MachineContext::instructionPointer(mcontext) = trapPC;
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> mcontext_t& mcontext;
</span><span class="lines">@@ -79,57 +82,7 @@
</span><span class="cx"> void* stackPointer;
</span><span class="cx"> void* framePointer;
</span><span class="cx"> };
</span><del>-
-#elif CPU(X86)
</del><span class="cx">
</span><del>-struct SignalContext {
- SignalContext(mcontext_t& mcontext)
- : mcontext(mcontext)
- , trapPC(reinterpret_cast<void*>(mcontext->__ss.__eip))
- , stackPointer(reinterpret_cast<void*>(mcontext->__ss.__esp))
- , framePointer(reinterpret_cast<void*>(mcontext->__ss.__ebp))
- {
- // On X86, SIGTRAP reports the address after the trapping PC. So, dec by 1.
- trapPC = reinterpret_cast<uint8_t*>(trapPC) - 1;
- }
-
- void adjustPCToPointToTrappingInstruction()
- {
- mcontext->__ss.__eip = reinterpret_cast<uintptr_t>(trapPC);
- }
-
- mcontext_t& mcontext;
- void* trapPC;
- void* stackPointer;
- void* framePointer;
-};
-
-#elif CPU(ARM64) || CPU(ARM_THUMB2) || CPU(ARM)
-
-struct SignalContext {
- SignalContext(mcontext_t& mcontext)
- : mcontext(mcontext)
- , trapPC(reinterpret_cast<void*>(mcontext->__ss.__pc))
- , stackPointer(reinterpret_cast<void*>(mcontext->__ss.__sp))
-#if CPU(ARM64)
- , framePointer(reinterpret_cast<void*>(mcontext->__ss.__fp))
-#elif CPU(ARM_THUMB2)
- , framePointer(reinterpret_cast<void*>(mcontext->__ss.__r[7]))
-#elif CPU(ARM)
- , framePointer(reinterpret_cast<void*>(mcontext->__ss.__r[11]))
-#endif
- { }
-
- void adjustPCToPointToTrappingInstruction() { }
-
- mcontext_t& mcontext;
- void* trapPC;
- void* stackPointer;
- void* framePointer;
-};
-
-#endif
-
</del><span class="cx"> inline static bool vmIsInactive(VM& vm)
</span><span class="cx"> {
</span><span class="cx"> return !vm.entryScope && !vm.ownerThread();
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretoolsCodeProfilingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/tools/CodeProfiling.cpp (213885 => 213886)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tools/CodeProfiling.cpp 2017-03-14 06:51:23 UTC (rev 213885)
+++ trunk/Source/JavaScriptCore/tools/CodeProfiling.cpp 2017-03-14 07:33:08 UTC (rev 213886)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> #include "CodeProfiling.h"
</span><span class="cx">
</span><span class="cx"> #include "CodeProfile.h"
</span><ins>+#include "MachineContext.h"
</ins><span class="cx"> #include <wtf/MetaAllocator.h>
</span><span class="cx">
</span><span class="cx"> #if HAVE(SIGNAL_H)
</span><span class="lines">@@ -66,20 +67,14 @@
</span><span class="cx"> #pragma clang diagnostic pop
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if OS(DARWIN) && !PLATFORM(GTK) && CPU(X86_64)
</del><ins>+#if (OS(DARWIN) && !PLATFORM(GTK) && CPU(X86_64)) || (OS(LINUX) && CPU(X86))
</ins><span class="cx"> static void profilingTimer(int, siginfo_t*, void* uap)
</span><span class="cx"> {
</span><span class="cx"> mcontext_t context = static_cast<ucontext_t*>(uap)->uc_mcontext;
</span><del>- CodeProfiling::sample(reinterpret_cast<void*>(context->__ss.__rip),
- reinterpret_cast<void**>(context->__ss.__rbp));
</del><ins>+ CodeProfiling::sample(
+ MachineContext::instructionPointer(context),
+ reinterpret_cast<void**>(MachineContext::framePointer(context)));
</ins><span class="cx"> }
</span><del>-#elif OS(LINUX) && CPU(X86)
-static void profilingTimer(int, siginfo_t*, void* uap)
-{
- mcontext_t context = static_cast<ucontext_t*>(uap)->uc_mcontext;
- CodeProfiling::sample(reinterpret_cast<void*>(context.gregs[REG_EIP]),
- reinterpret_cast<void**>(context.gregs[REG_EBP]));
-}
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> // Callback triggered when the timer is fired.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretoolsSigillCrashAnalyzercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/tools/SigillCrashAnalyzer.cpp (213885 => 213886)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tools/SigillCrashAnalyzer.cpp 2017-03-14 06:51:23 UTC (rev 213885)
+++ trunk/Source/JavaScriptCore/tools/SigillCrashAnalyzer.cpp 2017-03-14 07:33:08 UTC (rev 213886)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #include "CallFrame.h"
</span><span class="cx"> #include "CodeBlock.h"
</span><ins>+#include "MachineContext.h"
</ins><span class="cx"> #include "VMInspector.h"
</span><span class="cx"> #include <mutex>
</span><span class="cx"> #include <wtf/StdLibExtras.h>
</span><span class="lines">@@ -78,17 +79,17 @@
</span><span class="cx">
</span><span class="cx"> #endif // USE(OS_LOG)
</span><span class="cx">
</span><del>-#if CPU(X86_64)
</del><span class="cx"> struct SignalContext {
</span><span class="cx"> SignalContext(mcontext_t& mcontext)
</span><span class="cx"> : mcontext(mcontext)
</span><del>- , machinePC(reinterpret_cast<void*>(mcontext->__ss.__rip))
- , stackPointer(reinterpret_cast<void*>(mcontext->__ss.__rsp))
- , framePointer(reinterpret_cast<CallFrame*>(mcontext->__ss.__rbp))
</del><ins>+ , machinePC(MachineContext::instructionPointer(mcontext))
+ , stackPointer(MachineContext::stackPointer(mcontext))
+ , framePointer(MachineContext::framePointer(mcontext))
</ins><span class="cx"> { }
</span><span class="cx">
</span><span class="cx"> void dump()
</span><span class="cx"> {
</span><ins>+#if CPU(X86_64)
</ins><span class="cx"> #define FOR_EACH_REGISTER(v) \
</span><span class="cx"> v(rax) \
</span><span class="cx"> v(rbx) \
</span><span class="lines">@@ -116,26 +117,8 @@
</span><span class="cx"> log("Register " #__reg ": %p", reinterpret_cast<void*>(mcontext->__ss.__##__reg));
</span><span class="cx"> FOR_EACH_REGISTER(DUMP_REGISTER)
</span><span class="cx"> #undef FOR_EACH_REGISTER
</span><del>- }
</del><span class="cx">
</span><del>- mcontext_t& mcontext;
- void* machinePC;
- void* stackPointer;
- void* framePointer;
-};
-
</del><span class="cx"> #elif CPU(ARM64)
</span><del>-
-struct SignalContext {
- SignalContext(mcontext_t& mcontext)
- : mcontext(mcontext)
- , machinePC(reinterpret_cast<void*>(mcontext->__ss.__pc))
- , stackPointer(reinterpret_cast<void*>(mcontext->__ss.__sp))
- , framePointer(reinterpret_cast<CallFrame*>(mcontext->__ss.__fp))
- { }
-
- void dump()
- {
</del><span class="cx"> int i;
</span><span class="cx"> for (i = 0; i < 28; i += 4) {
</span><span class="cx"> log("x%d: %016llx x%d: %016llx x%d: %016llx x%d: %016llx",
</span><span class="lines">@@ -149,6 +132,7 @@
</span><span class="cx"> i, mcontext->__ss.__x[i], mcontext->__ss.__fp, mcontext->__ss.__lr);
</span><span class="cx"> log("sp: %016llx pc: %016llx cpsr: %08x",
</span><span class="cx"> mcontext->__ss.__sp, mcontext->__ss.__pc, mcontext->__ss.__cpsr);
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> mcontext_t& mcontext;
</span><span class="lines">@@ -157,20 +141,6 @@
</span><span class="cx"> void* framePointer;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-#else
-
-struct SignalContext {
- SignalContext(mcontext_t&) { }
-
- void dump() { }
-
- void* machinePC;
- void* stackPointer;
- void* framePointer;
-};
-
-#endif
-
</del><span class="cx"> struct sigaction originalSigIllAction;
</span><span class="cx">
</span><span class="cx"> static void handleCrash(int signalNumber, siginfo_t* info, void* uap)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretoolsVMInspectorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/tools/VMInspector.cpp (213885 => 213886)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tools/VMInspector.cpp 2017-03-14 06:51:23 UTC (rev 213885)
+++ trunk/Source/JavaScriptCore/tools/VMInspector.cpp 2017-03-14 07:33:08 UTC (rev 213886)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> #include "CodeBlock.h"
</span><span class="cx"> #include "CodeBlockSet.h"
</span><span class="cx"> #include "HeapInlines.h"
</span><ins>+#include "MachineContext.h"
</ins><span class="cx"> #include <mutex>
</span><span class="cx"> #include <wtf/Expected.h>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmWasmFaultSignalHandlercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/wasm/WasmFaultSignalHandler.cpp (213885 => 213886)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/WasmFaultSignalHandler.cpp 2017-03-14 06:51:23 UTC (rev 213885)
+++ trunk/Source/JavaScriptCore/wasm/WasmFaultSignalHandler.cpp 2017-03-14 07:33:08 UTC (rev 213886)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> #if ENABLE(WEBASSEMBLY)
</span><span class="cx">
</span><span class="cx"> #include "ExecutableAllocator.h"
</span><ins>+#include "MachineContext.h"
</ins><span class="cx"> #include "VM.h"
</span><span class="cx"> #include "WasmExceptionType.h"
</span><span class="cx"> #include "WasmMemory.h"
</span><span class="lines">@@ -50,40 +51,10 @@
</span><span class="cx"> static StaticLock codeLocationsLock;
</span><span class="cx"> static LazyNeverDestroyed<HashSet<std::tuple<VM*, void*, void*>>> codeLocations; // (vm, start, end)
</span><span class="cx">
</span><del>-// FIXME: Clean up mcontext_t handling code since it is scattered in heap/, tools/ and wasm/.
-// https://bugs.webkit.org/show_bug.cgi?id=169180
-#if CPU(X86_64)
-
-#if OS(DARWIN)
-#define InstructionPointerGPR context->__ss.__rip
-#define FirstArgumentGPR context->__ss.__rsi
-#elif OS(FREEBSD)
-#define InstructionPointerGPR context.mc_rip
-#define FirstArgumentGPR context.mc_rsi
-#elif defined(__GLIBC__)
-#define InstructionPointerGPR context.gregs[REG_RIP]
-#define FirstArgumentGPR context.gregs[REG_RSI]
-#endif
-
-#else
-
-#if OS(DARWIN)
-#define InstructionPointerGPR context->__ss.__pc
-#define FirstArgumentGPR context->__ss.__x[1]
-#elif OS(FREEBSD)
-#define InstructionPointerGPR context.mc_gpregs.gp_elr
-#define FirstArgumentGPR context.mc_gpregs.gp_x[1]
-#elif defined(__GLIBC__)
-#define InstructionPointerGPR context.pc
-#define FirstArgumentGPR context.regs[1]
-#endif
-
-#endif
-
</del><span class="cx"> static void trapHandler(int signal, siginfo_t* sigInfo, void* ucontext)
</span><span class="cx"> {
</span><span class="cx"> mcontext_t& context = static_cast<ucontext_t*>(ucontext)->uc_mcontext;
</span><del>- void* faultingInstruction = reinterpret_cast<void*>(InstructionPointerGPR);
</del><ins>+ void* faultingInstruction = MachineContext::instructionPointer(context);
</ins><span class="cx"> dataLogLnIf(verbose, "starting handler for fault at: ", RawPointer(faultingInstruction));
</span><span class="cx">
</span><span class="cx"> dataLogLnIf(verbose, "JIT memory start: ", RawPointer(reinterpret_cast<void*>(startOfFixedExecutableMemoryPool)), " end: ", RawPointer(reinterpret_cast<void*>(endOfFixedExecutableMemoryPool)));
</span><span class="lines">@@ -122,8 +93,8 @@
</span><span class="cx"> if (!exceptionStub)
</span><span class="cx"> break;
</span><span class="cx"> dataLogLnIf(verbose, "found stub: ", RawPointer(exceptionStub.code().executableAddress()));
</span><del>- FirstArgumentGPR = static_cast<uint64_t>(ExceptionType::OutOfBoundsMemoryAccess);
- InstructionPointerGPR = reinterpret_cast<uint64_t>(exceptionStub.code().executableAddress());
</del><ins>+ MachineContext::argumentPointer<1>(context) = reinterpret_cast<void*>(ExceptionType::OutOfBoundsMemoryAccess);
+ MachineContext::instructionPointer(context) = exceptionStub.code().executableAddress();
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (213885 => 213886)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2017-03-14 06:51:23 UTC (rev 213885)
+++ trunk/Source/WTF/ChangeLog 2017-03-14 07:33:08 UTC (rev 213886)
</span><span class="lines">@@ -1,5 +1,16 @@
</span><span class="cx"> 2017-03-13 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><ins>+ [JSC][Linux] Implement VMTrap in Linux ports
+ https://bugs.webkit.org/show_bug.cgi?id=169436
+
+ Reviewed by Mark Lam.
+
+ Enable VMTrap mechanism for Linux and FreeBSD.
+
+ * wtf/Platform.h:
+
+2017-03-13 Yusuke Suzuki <utatane.tea@gmail.com>
+
</ins><span class="cx"> [WTF] Clean up RunLoop and WorkQueue with Seconds and Function
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=169537
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWTFwtfPlatformh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Platform.h (213885 => 213886)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Platform.h 2017-03-14 06:51:23 UTC (rev 213885)
+++ trunk/Source/WTF/wtf/Platform.h 2017-03-14 07:33:08 UTC (rev 213886)
</span><span class="lines">@@ -922,7 +922,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if OS(DARWIN) && ENABLE(JIT)
</del><ins>+#if (OS(DARWIN) || OS(LINUX) || OS(FREEBSD)) && ENABLE(JIT)
</ins><span class="cx"> #define ENABLE_SIGNAL_BASED_VM_TRAPS 1
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>