<!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>[215269] 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/215269">215269</a></dd>
<dt>Author</dt> <dd>utatane.tea@gmail.com</dd>
<dt>Date</dt> <dd>2017-04-12 09:59:26 -0700 (Wed, 12 Apr 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>[JSC] Clean up heap/MachineStackMarker by introducing USE(MACHINE_CONTEXT)
https://bugs.webkit.org/show_bug.cgi?id=170770
Reviewed by Mark Lam.
Source/JavaScriptCore:
We use USE(MACHINE_CONTEXT) to clean up runtime/MachineContext.h. And
we clean up heap/MachineStackMarker.cpp by using MachineContext functions.
* heap/MachineStackMarker.cpp:
(JSC::MachineThreads::MachineThread::Registers::stackPointer):
(JSC::MachineThreads::MachineThread::Registers::framePointer):
(JSC::MachineThreads::MachineThread::Registers::instructionPointer):
(JSC::MachineThreads::MachineThread::Registers::llintPC):
* heap/MachineStackMarker.h:
* runtime/MachineContext.h:
(JSC::MachineContext::stackPointer):
(JSC::MachineContext::framePointer):
(JSC::MachineContext::instructionPointer):
(JSC::MachineContext::argumentPointer<1>):
(JSC::MachineContext::llintInstructionPointer):
Source/WTF:
We add a new define USE_MACHINE_CONTEXT, which becomes true if mcontext_t exists
and we know the way to retrieve values from mcontext_t.
* wtf/Platform.h:
* wtf/PlatformRegisters.h:
* wtf/ThreadingPthreads.cpp:
(WTF::Thread::getRegisters):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</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="#trunkSourceJavaScriptCoreruntimeMachineContexth">trunk/Source/JavaScriptCore/runtime/MachineContext.h</a></li>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfPlatformh">trunk/Source/WTF/wtf/Platform.h</a></li>
<li><a href="#trunkSourceWTFwtfPlatformRegistersh">trunk/Source/WTF/wtf/PlatformRegisters.h</a></li>
<li><a href="#trunkSourceWTFwtfThreadingPthreadscpp">trunk/Source/WTF/wtf/ThreadingPthreads.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (215268 => 215269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2017-04-12 15:52:39 UTC (rev 215268)
+++ trunk/Source/JavaScriptCore/ChangeLog 2017-04-12 16:59:26 UTC (rev 215269)
</span><span class="lines">@@ -1,5 +1,28 @@
</span><span class="cx"> 2017-04-12 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><ins>+ [JSC] Clean up heap/MachineStackMarker by introducing USE(MACHINE_CONTEXT)
+ https://bugs.webkit.org/show_bug.cgi?id=170770
+
+ Reviewed by Mark Lam.
+
+ We use USE(MACHINE_CONTEXT) to clean up runtime/MachineContext.h. And
+ we clean up heap/MachineStackMarker.cpp by using MachineContext functions.
+
+ * heap/MachineStackMarker.cpp:
+ (JSC::MachineThreads::MachineThread::Registers::stackPointer):
+ (JSC::MachineThreads::MachineThread::Registers::framePointer):
+ (JSC::MachineThreads::MachineThread::Registers::instructionPointer):
+ (JSC::MachineThreads::MachineThread::Registers::llintPC):
+ * heap/MachineStackMarker.h:
+ * runtime/MachineContext.h:
+ (JSC::MachineContext::stackPointer):
+ (JSC::MachineContext::framePointer):
+ (JSC::MachineContext::instructionPointer):
+ (JSC::MachineContext::argumentPointer<1>):
+ (JSC::MachineContext::llintInstructionPointer):
+
+2017-04-12 Yusuke Suzuki <utatane.tea@gmail.com>
+
</ins><span class="cx"> [WTF] Introduce Thread class and use RefPtr<Thread> and align Windows Threading implementation semantics to Pthread one
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=170502
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapMachineStackMarkercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/MachineStackMarker.cpp (215268 => 215269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/MachineStackMarker.cpp 2017-04-12 15:52:39 UTC (rev 215268)
+++ trunk/Source/JavaScriptCore/heap/MachineStackMarker.cpp 2017-04-12 16:59:26 UTC (rev 215269)
</span><span class="lines">@@ -226,19 +226,13 @@
</span><span class="cx">
</span><span class="cx"> void* MachineThreads::MachineThread::Registers::stackPointer() const
</span><span class="cx"> {
</span><del>-#if OS(DARWIN) || OS(WINDOWS) || ((OS(FREEBSD) || defined(__GLIBC__)) && ENABLE(JIT))
</del><span class="cx"> return MachineContext::stackPointer(regs);
</span><del>-#elif USE(PTHREADS)
- return regs.stackPointer;
-#else
-#error Need a way to get the stack pointer for another thread on this platform
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(SAMPLING_PROFILER)
</span><span class="cx"> void* MachineThreads::MachineThread::Registers::framePointer() const
</span><span class="cx"> {
</span><del>-#if OS(DARWIN) || OS(WINDOWS) || (OS(FREEBSD) || defined(__GLIBC__))
</del><ins>+#if OS(WINDOWS) || USE(MACHINE_CONTEXT)
</ins><span class="cx"> return MachineContext::framePointer(regs);
</span><span class="cx"> #else
</span><span class="cx"> #error Need a way to get the frame pointer for another thread on this platform
</span><span class="lines">@@ -247,7 +241,7 @@
</span><span class="cx">
</span><span class="cx"> void* MachineThreads::MachineThread::Registers::instructionPointer() const
</span><span class="cx"> {
</span><del>-#if OS(DARWIN) || OS(WINDOWS) || (OS(FREEBSD) || defined(__GLIBC__))
</del><ins>+#if OS(WINDOWS) || USE(MACHINE_CONTEXT)
</ins><span class="cx"> return MachineContext::instructionPointer(regs);
</span><span class="cx"> #else
</span><span class="cx"> #error Need a way to get the instruction pointer for another thread on this platform
</span><span class="lines">@@ -257,7 +251,7 @@
</span><span class="cx"> void* MachineThreads::MachineThread::Registers::llintPC() const
</span><span class="cx"> {
</span><span class="cx"> // LLInt uses regT4 as PC.
</span><del>-#if OS(DARWIN) || OS(WINDOWS) || (OS(FREEBSD) || defined(__GLIBC__))
</del><ins>+#if OS(WINDOWS) || USE(MACHINE_CONTEXT)
</ins><span class="cx"> return MachineContext::llintInstructionPointer(regs);
</span><span class="cx"> #else
</span><span class="cx"> #error Need a way to get the LLIntPC for another thread on this platform
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapMachineStackMarkerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/MachineStackMarker.h (215268 => 215269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/MachineStackMarker.h 2017-04-12 15:52:39 UTC (rev 215268)
+++ trunk/Source/JavaScriptCore/heap/MachineStackMarker.h 2017-04-12 16:59:26 UTC (rev 215269)
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx"> void* instructionPointer() const;
</span><span class="cx"> void* llintPC() const;
</span><span class="cx"> #endif // ENABLE(SAMPLING_PROFILER)
</span><del>- WTF::PlatformRegisters regs;
</del><ins>+ PlatformRegisters regs;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> Expected<void, Thread::PlatformSuspendError> suspend() { return m_thread->suspend(); }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeMachineContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/MachineContext.h (215268 => 215269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/MachineContext.h 2017-04-12 15:52:39 UTC (rev 215268)
+++ trunk/Source/JavaScriptCore/runtime/MachineContext.h 2017-04-12 16:59:26 UTC (rev 215269)
</span><span class="lines">@@ -27,52 +27,43 @@
</span><span class="cx">
</span><span class="cx"> #include "GPRInfo.h"
</span><span class="cx"> #include "LLIntPCRanges.h"
</span><ins>+#include <wtf/PlatformRegisters.h>
</ins><span class="cx"> #include <wtf/StdLibExtras.h>
</span><span class="cx">
</span><del>-#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
-
-#if OS(DARWIN)
-#include <mach/thread_act.h>
-#endif
-
</del><span class="cx"> namespace JSC {
</span><span class="cx"> namespace MachineContext {
</span><span class="cx">
</span><del>-#if OS(DARWIN)
</del><span class="cx">
</span><del>-#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
</del><ins>+void*& stackPointer(PlatformRegisters&);
+void* stackPointer(const PlatformRegisters&);
</ins><span class="cx">
</span><del>-#elif OS(WINDOWS)
</del><ins>+#if OS(WINDOWS) || USE(MACHINE_CONTEXT)
+void*& framePointer(PlatformRegisters&);
+void* framePointer(const PlatformRegisters&);
+void*& instructionPointer(PlatformRegisters&);
+void* instructionPointer(const PlatformRegisters&);
+template<size_t N> void*& argumentPointer(PlatformRegisters&);
+template<size_t N> void* argumentPointer(const PlatformRegisters&);
+#if ENABLE(JIT)
+void*& llintInstructionPointer(PlatformRegisters&);
+void* llintInstructionPointer(const PlatformRegisters&);
+#endif // ENABLE(JIT)
+#if USE(MACHINE_CONTEXT)
+void*& stackPointer(mcontext_t&);
+void* stackPointer(const mcontext_t&);
+void*& framePointer(mcontext_t&);
+void* framePointer(const mcontext_t&);
+void*& instructionPointer(mcontext_t&);
+void* instructionPointer(const mcontext_t&);
+template<size_t N> void*& argumentPointer(mcontext_t&);
+template<size_t N> void* argumentPointer(const mcontext_t&);
+#if ENABLE(JIT)
+void*& llintInstructionPointer(mcontext_t&);
+void* llintInstructionPointer(const mcontext_t&);
+#endif // ENABLE(JIT)
+#endif // USE(MACHINE_CONTEXT)
+#endif // OS(WINDOWS) || USE(MACHINE_CONTEXT)
</ins><span class="cx">
</span><del>-typedef CONTEXT PlatformRegisters;
-
-#endif
-
-
-#if OS(DARWIN) || OS(WINDOWS)
</del><span class="cx"> inline void*& stackPointer(PlatformRegisters& regs)
</span><span class="cx"> {
</span><span class="cx"> #if OS(DARWIN)
</span><span class="lines">@@ -118,7 +109,11 @@
</span><span class="cx"> #error Unknown Architecture
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#endif // OS(DARWIN)
</del><ins>+#elif USE(MACHINE_CONTEXT)
+ return stackPointer(regs.machineContext);
+#else
+ return regs.stackPointer;
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline void* stackPointer(const PlatformRegisters& regs)
</span><span class="lines">@@ -125,10 +120,9 @@
</span><span class="cx"> {
</span><span class="cx"> return stackPointer(const_cast<PlatformRegisters&>(regs));
</span><span class="cx"> }
</span><del>-#endif // OS(DARWIN) || OS(WINDOWS)
</del><span class="cx">
</span><span class="cx">
</span><del>-#if OS(DARWIN) || ((OS(FREEBSD) || defined(__GLIBC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS)))
</del><ins>+#if USE(MACHINE_CONTEXT)
</ins><span class="cx"> inline void*& stackPointer(mcontext_t& machineContext)
</span><span class="cx"> {
</span><span class="cx"> #if OS(DARWIN)
</span><span class="lines">@@ -171,10 +165,10 @@
</span><span class="cx"> {
</span><span class="cx"> return stackPointer(const_cast<mcontext_t&>(machineContext));
</span><span class="cx"> }
</span><del>-#endif // OS(DARWIN) || ((OS(FREEBSD) || defined(__GLIBC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS)))
</del><ins>+#endif // USE(MACHINE_CONTEXT)
</ins><span class="cx">
</span><span class="cx">
</span><del>-#if OS(DARWIN) || OS(WINDOWS)
</del><ins>+#if OS(WINDOWS) || USE(MACHINE_CONTEXT)
</ins><span class="cx"> inline void*& framePointer(PlatformRegisters& regs)
</span><span class="cx"> {
</span><span class="cx"> #if OS(DARWIN)
</span><span class="lines">@@ -221,7 +215,9 @@
</span><span class="cx"> #error Unknown Architecture
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#endif // OS(DARWIN)
</del><ins>+#elif USE(MACHINE_CONTEXT)
+ return framePointer(regs.machineContext);
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline void* framePointer(const PlatformRegisters& regs)
</span><span class="lines">@@ -228,10 +224,10 @@
</span><span class="cx"> {
</span><span class="cx"> return framePointer(const_cast<PlatformRegisters&>(regs));
</span><span class="cx"> }
</span><del>-#endif // OS(DARWIN) || OS(WINDOWS)
</del><ins>+#endif // OS(WINDOWS) || USE(MACHINE_CONTEXT)
</ins><span class="cx">
</span><span class="cx">
</span><del>-#if OS(DARWIN) || ((OS(FREEBSD) || defined(__GLIBC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS)))
</del><ins>+#if USE(MACHINE_CONTEXT)
</ins><span class="cx"> inline void*& framePointer(mcontext_t& machineContext)
</span><span class="cx"> {
</span><span class="cx"> #if OS(DARWIN)
</span><span class="lines">@@ -278,10 +274,10 @@
</span><span class="cx"> {
</span><span class="cx"> return framePointer(const_cast<mcontext_t&>(machineContext));
</span><span class="cx"> }
</span><del>-#endif // OS(DARWIN) || ((OS(FREEBSD) || defined(__GLIBC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS)))
</del><ins>+#endif // USE(MACHINE_CONTEXT)
</ins><span class="cx">
</span><span class="cx">
</span><del>-#if OS(DARWIN) || OS(WINDOWS)
</del><ins>+#if OS(WINDOWS) || USE(MACHINE_CONTEXT)
</ins><span class="cx"> inline void*& instructionPointer(PlatformRegisters& regs)
</span><span class="cx"> {
</span><span class="cx"> #if OS(DARWIN)
</span><span class="lines">@@ -322,7 +318,9 @@
</span><span class="cx"> #error Unknown Architecture
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#endif // OS(DARWIN)
</del><ins>+#elif USE(MACHINE_CONTEXT)
+ return instructionPointer(regs.machineContext);
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline void* instructionPointer(const PlatformRegisters& regs)
</span><span class="lines">@@ -329,11 +327,10 @@
</span><span class="cx"> {
</span><span class="cx"> return instructionPointer(const_cast<PlatformRegisters&>(regs));
</span><span class="cx"> }
</span><del>-#endif // OS(DARWIN) || OS(WINDOWS)
</del><ins>+#endif // OS(WINDOWS) || USE(MACHINE_CONTEXT)
</ins><span class="cx">
</span><span class="cx">
</span><del>-#if OS(DARWIN) || ((OS(FREEBSD) || defined(__GLIBC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS)))
-
</del><ins>+#if USE(MACHINE_CONTEXT)
</ins><span class="cx"> inline void*& instructionPointer(mcontext_t& machineContext)
</span><span class="cx"> {
</span><span class="cx"> #if OS(DARWIN)
</span><span class="lines">@@ -380,12 +377,13 @@
</span><span class="cx"> {
</span><span class="cx"> return instructionPointer(const_cast<mcontext_t&>(machineContext));
</span><span class="cx"> }
</span><del>-#endif // OS(DARWIN) || ((OS(FREEBSD) || defined(__GLIBC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS)))
</del><ins>+#endif // USE(MACHINE_CONTEXT)
</ins><span class="cx">
</span><span class="cx">
</span><del>-#if OS(DARWIN) || OS(WINDOWS)
-template<size_t N>
-void*& argumentPointer(PlatformRegisters&);
</del><ins>+#if OS(WINDOWS) || USE(MACHINE_CONTEXT)
+#if USE(MACHINE_CONTEXT)
+template<> void*& argumentPointer<1>(mcontext_t&);
+#endif
</ins><span class="cx">
</span><span class="cx"> template<>
</span><span class="cx"> inline void*& argumentPointer<1>(PlatformRegisters& regs)
</span><span class="lines">@@ -431,7 +429,9 @@
</span><span class="cx"> #error Unknown Architecture
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#endif // OS(DARWIN)
</del><ins>+#elif USE(MACHINE_CONTEXT)
+ return argumentPointer<1>(regs.machineContext);
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<size_t N>
</span><span class="lines">@@ -439,13 +439,9 @@
</span><span class="cx"> {
</span><span class="cx"> return argumentPointer<N>(const_cast<PlatformRegisters&>(regs));
</span><span class="cx"> }
</span><del>-#endif // OS(DARWIN) || OS(WINDOWS)
</del><ins>+#endif // OS(WINDOWS) || USE(MACHINE_CONTEXT)
</ins><span class="cx">
</span><del>-
-#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&);
-
</del><ins>+#if USE(MACHINE_CONTEXT)
</ins><span class="cx"> template<>
</span><span class="cx"> inline void*& argumentPointer<1>(mcontext_t& machineContext)
</span><span class="cx"> {
</span><span class="lines">@@ -494,10 +490,10 @@
</span><span class="cx"> {
</span><span class="cx"> return argumentPointer<N>(const_cast<mcontext_t&>(machineContext));
</span><span class="cx"> }
</span><del>-#endif // OS(DARWIN) || ((OS(FREEBSD) || defined(__GLIBC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS)))
</del><ins>+#endif // USE(MACHINE_CONTEXT)
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(JIT)
</span><del>-#if OS(DARWIN) || OS(WINDOWS)
</del><ins>+#if OS(WINDOWS) || USE(MACHINE_CONTEXT)
</ins><span class="cx"> inline void*& llintInstructionPointer(PlatformRegisters& regs)
</span><span class="cx"> {
</span><span class="cx"> // LLInt uses regT4 as PC.
</span><span class="lines">@@ -550,7 +546,9 @@
</span><span class="cx"> #error Unknown Architecture
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#endif // OS(DARWIN)
</del><ins>+#elif USE(MACHINE_CONTEXT)
+ return llintInstructionPointer(regs.machineContext);
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline void* llintInstructionPointer(const PlatformRegisters& regs)
</span><span class="lines">@@ -557,10 +555,10 @@
</span><span class="cx"> {
</span><span class="cx"> return llintInstructionPointer(const_cast<PlatformRegisters&>(regs));
</span><span class="cx"> }
</span><del>-#endif // OS(DARWIN) || OS(WINDOWS)
</del><ins>+#endif // OS(WINDOWS) || USE(MACHINE_CONTEXT)
</ins><span class="cx">
</span><span class="cx">
</span><del>-#if OS(DARWIN) || ((OS(FREEBSD) || defined(__GLIBC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS)))
</del><ins>+#if USE(MACHINE_CONTEXT)
</ins><span class="cx"> inline void*& llintInstructionPointer(mcontext_t& machineContext)
</span><span class="cx"> {
</span><span class="cx"> // LLInt uses regT4 as PC.
</span><span class="lines">@@ -608,7 +606,7 @@
</span><span class="cx"> {
</span><span class="cx"> return llintInstructionPointer(const_cast<mcontext_t&>(machineContext));
</span><span class="cx"> }
</span><del>-#endif // OS(DARWIN) || ((OS(FREEBSD) || defined(__GLIBC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS)))
</del><ins>+#endif // USE(MACHINE_CONTEXT)
</ins><span class="cx"> #endif // ENABLE(JIT)
</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 (215268 => 215269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2017-04-12 15:52:39 UTC (rev 215268)
+++ trunk/Source/WTF/ChangeLog 2017-04-12 16:59:26 UTC (rev 215269)
</span><span class="lines">@@ -1,5 +1,20 @@
</span><span class="cx"> 2017-04-12 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><ins>+ [JSC] Clean up heap/MachineStackMarker by introducing USE(MACHINE_CONTEXT)
+ https://bugs.webkit.org/show_bug.cgi?id=170770
+
+ Reviewed by Mark Lam.
+
+ We add a new define USE_MACHINE_CONTEXT, which becomes true if mcontext_t exists
+ and we know the way to retrieve values from mcontext_t.
+
+ * wtf/Platform.h:
+ * wtf/PlatformRegisters.h:
+ * wtf/ThreadingPthreads.cpp:
+ (WTF::Thread::getRegisters):
+
+2017-04-12 Yusuke Suzuki <utatane.tea@gmail.com>
+
</ins><span class="cx"> [WTF] Introduce Thread class and use RefPtr<Thread> and align Windows Threading implementation semantics to Pthread one
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=170502
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWTFwtfPlatformh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Platform.h (215268 => 215269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Platform.h 2017-04-12 15:52:39 UTC (rev 215268)
+++ trunk/Source/WTF/wtf/Platform.h 2017-04-12 16:59:26 UTC (rev 215269)
</span><span class="lines">@@ -1214,4 +1214,8 @@
</span><span class="cx"> #define USE_LIBWEBRTC 1
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if OS(DARWIN) || ((OS(FREEBSD) || defined(__GLIBC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS)))
+#define USE_MACHINE_CONTEXT 1
+#endif
+
</ins><span class="cx"> #endif /* WTF_Platform_h */
</span></span></pre></div>
<a id="trunkSourceWTFwtfPlatformRegistersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/PlatformRegisters.h (215268 => 215269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/PlatformRegisters.h 2017-04-12 15:52:39 UTC (rev 215268)
+++ trunk/Source/WTF/wtf/PlatformRegisters.h 2017-04-12 16:59:26 UTC (rev 215269)
</span><span class="lines">@@ -59,9 +59,11 @@
</span><span class="cx">
</span><span class="cx"> using PlatformRegisters = CONTEXT;
</span><span class="cx">
</span><del>-#elif (OS(FREEBSD) || defined(__GLIBC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS))
</del><ins>+#elif USE(MACHINE_CONTEXT)
</ins><span class="cx">
</span><del>-using PlatformRegisters = mcontext_t;
</del><ins>+struct PlatformRegisters {
+ mcontext_t machineContext;
+};
</ins><span class="cx">
</span><span class="cx"> #else
</span><span class="cx">
</span><span class="lines">@@ -72,3 +74,5 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> } // namespace WTF
</span><ins>+
+using WTF::PlatformRegisters;
</ins></span></pre></div>
<a id="trunkSourceWTFwtfThreadingPthreadscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/ThreadingPthreads.cpp (215268 => 215269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/ThreadingPthreads.cpp 2017-04-12 15:52:39 UTC (rev 215268)
+++ trunk/Source/WTF/wtf/ThreadingPthreads.cpp 2017-04-12 16:59:26 UTC (rev 215269)
</span><span class="lines">@@ -387,8 +387,8 @@
</span><span class="cx"> CRASH();
</span><span class="cx"> }
</span><span class="cx"> return userCount * sizeof(uintptr_t);
</span><del>-#elif (OS(FREEBSD) || defined(__GLIBC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS))
- registers = m_suspendedMachineContext;
</del><ins>+#elif USE(MACHINE_CONTEXT)
+ registers.machineContext = m_suspendedMachineContext;
</ins><span class="cx"> return sizeof(PlatformRegisters);
</span><span class="cx"> #elif OS(OPENBSD)
</span><span class="cx"> // http://man.openbsd.org/pthread_stackseg_np.3
</span></span></pre>
</div>
</div>
</body>
</html>