Changeset 213886 in webkit for trunk/Source/JavaScriptCore/tools/CodeProfiling.cpp

Timestamp:

Mar 14, 2017, 12:33:08 AM (8 years ago)

Author:

Yusuke Suzuki

Message:

[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:

File:

• trunk/Source/JavaScriptCore/tools/CodeProfiling.cpp (modified) (2 diffs)

trunk/Source/JavaScriptCore/tools/CodeProfiling.cpp

@@ -28 +28 @@
 
 #include "CodeProfile.h"
+#include "MachineContext.h"
 #include <wtf/MetaAllocator.h>
 
@@ -67 +68 @@
 #endif
 
-#if OS(DARWIN) && !PLATFORM(GTK) && CPU(X86_64)
+#if (OS(DARWIN) && !PLATFORM(GTK) && CPU(X86_64)) || (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->__ss.__rip),
-                          reinterpret_cast<void**>(context->__ss.__rbp));
-}
-#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]));
+    CodeProfiling::sample(
+        MachineContext::instructionPointer(context),
+        reinterpret_cast<void**>(MachineContext::framePointer(context)));
 }
 #endif