<!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>[215196] 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/215196">215196</a></dd>
<dt>Author</dt> <dd>mark.lam@apple.com</dd>
<dt>Date</dt> <dd>2017-04-10 12:38:44 -0700 (Mon, 10 Apr 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move ProbeContext and ProbeFunction out of AbstractMacroAssembler.
https://bugs.webkit.org/show_bug.cgi?id=170681
Reviewed by Michael Saboff.
This is a refactoring step towards enabling custom probe printers the way printInternal() works for dataLog.
* assembler/AbstractMacroAssembler.h:
(JSC::AbstractMacroAssembler::ProbeContext::gpr): Deleted.
(JSC::AbstractMacroAssembler::ProbeContext::fpr): Deleted.
(JSC::AbstractMacroAssembler::ProbeContext::gprName): Deleted.
(JSC::AbstractMacroAssembler::ProbeContext::fprName): Deleted.
* assembler/MacroAssembler.cpp:
(JSC::stdFunctionCallback):
(JSC::MacroAssembler::probe):
* assembler/MacroAssembler.h:
(JSC::ProbeContext::gpr):
(JSC::ProbeContext::fpr):
(JSC::ProbeContext::gprName):
(JSC::ProbeContext::fprName):
* assembler/MacroAssemblerARM.cpp:
(JSC::MacroAssemblerARM::probe):
* assembler/MacroAssemblerARM64.cpp:
(JSC::arm64ProbeTrampoline):
(JSC::MacroAssemblerARM64::probe):
* assembler/MacroAssemblerARMv7.cpp:
(JSC::MacroAssemblerARMv7::probe):
* assembler/MacroAssemblerPrinter.cpp:
* assembler/MacroAssemblerPrinter.h:
* assembler/MacroAssemblerX86Common.cpp:
(JSC::MacroAssemblerX86Common::probe):
* ftl/FTLLowerDFGToB3.cpp:
(JSC::FTL::DFG::LowerDFGToB3::abstractStructure):
(JSC::FTL::DFG::LowerDFGToB3::probe): Deleted.
- Deleted because this became a useless place-holder after the transition to B3.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerAbstractMacroAssemblerh">trunk/Source/JavaScriptCore/assembler/AbstractMacroAssembler.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerMacroAssemblercpp">trunk/Source/JavaScriptCore/assembler/MacroAssembler.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerMacroAssemblerh">trunk/Source/JavaScriptCore/assembler/MacroAssembler.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerMacroAssemblerARMcpp">trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerMacroAssemblerARM64cpp">trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM64.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerMacroAssemblerARMv7cpp">trunk/Source/JavaScriptCore/assembler/MacroAssemblerARMv7.cpp</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>
<li><a href="#trunkSourceJavaScriptCoreassemblerMacroAssemblerX86Commoncpp">trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86Common.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLLowerDFGToB3cpp">trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (215195 => 215196)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2017-04-10 19:01:57 UTC (rev 215195)
+++ trunk/Source/JavaScriptCore/ChangeLog 2017-04-10 19:38:44 UTC (rev 215196)
</span><span class="lines">@@ -1,3 +1,41 @@
</span><ins>+2017-04-10 Mark Lam <mark.lam@apple.com>
+
+ Move ProbeContext and ProbeFunction out of AbstractMacroAssembler.
+ https://bugs.webkit.org/show_bug.cgi?id=170681
+
+ Reviewed by Michael Saboff.
+
+ This is a refactoring step towards enabling custom probe printers the way printInternal() works for dataLog.
+
+ * assembler/AbstractMacroAssembler.h:
+ (JSC::AbstractMacroAssembler::ProbeContext::gpr): Deleted.
+ (JSC::AbstractMacroAssembler::ProbeContext::fpr): Deleted.
+ (JSC::AbstractMacroAssembler::ProbeContext::gprName): Deleted.
+ (JSC::AbstractMacroAssembler::ProbeContext::fprName): Deleted.
+ * assembler/MacroAssembler.cpp:
+ (JSC::stdFunctionCallback):
+ (JSC::MacroAssembler::probe):
+ * assembler/MacroAssembler.h:
+ (JSC::ProbeContext::gpr):
+ (JSC::ProbeContext::fpr):
+ (JSC::ProbeContext::gprName):
+ (JSC::ProbeContext::fprName):
+ * assembler/MacroAssemblerARM.cpp:
+ (JSC::MacroAssemblerARM::probe):
+ * assembler/MacroAssemblerARM64.cpp:
+ (JSC::arm64ProbeTrampoline):
+ (JSC::MacroAssemblerARM64::probe):
+ * assembler/MacroAssemblerARMv7.cpp:
+ (JSC::MacroAssemblerARMv7::probe):
+ * assembler/MacroAssemblerPrinter.cpp:
+ * assembler/MacroAssemblerPrinter.h:
+ * assembler/MacroAssemblerX86Common.cpp:
+ (JSC::MacroAssemblerX86Common::probe):
+ * ftl/FTLLowerDFGToB3.cpp:
+ (JSC::FTL::DFG::LowerDFGToB3::abstractStructure):
+ (JSC::FTL::DFG::LowerDFGToB3::probe): Deleted.
+ - Deleted because this became a useless place-holder after the transition to B3.
+
</ins><span class="cx"> 2017-04-10 Keith Miller <keith_miller@apple.com>
</span><span class="cx">
</span><span class="cx"> WebAssembly: Fix B3IRGenerator for BrTable
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerAbstractMacroAssemblerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/AbstractMacroAssembler.h (215195 => 215196)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/AbstractMacroAssembler.h 2017-04-10 19:01:57 UTC (rev 215195)
+++ trunk/Source/JavaScriptCore/assembler/AbstractMacroAssembler.h 2017-04-10 19:38:44 UTC (rev 215196)
</span><span class="lines">@@ -43,6 +43,11 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(ASSEMBLER)
</span><span class="cx">
</span><ins>+#if ENABLE(MASM_PROBE)
+struct ProbeContext;
+typedef void (*ProbeFunction)(struct ProbeContext*);
+#endif
+
</ins><span class="cx"> class AllowMacroScratchRegisterUsage;
</span><span class="cx"> class DisallowMacroScratchRegisterUsage;
</span><span class="cx"> class LinkBuffer;
</span><span class="lines">@@ -878,22 +883,6 @@
</span><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><del>- struct ProbeContext;
- typedef void (*ProbeFunction)(struct ProbeContext*);
-
- struct ProbeContext {
- ProbeFunction probeFunction;
- void* arg1;
- void* arg2;
- CPUState cpu;
-
- // Convenience methods:
- void*& gpr(RegisterID regID) { return cpu.gpr(regID); }
- double& fpr(FPRegisterID regID) { return cpu.fpr(regID); }
- const char* gprName(RegisterID regID) { return cpu.gprName(regID); }
- const char* fprName(FPRegisterID regID) { return cpu.fprName(regID); }
- };
-
</del><span class="cx"> // This function emits code to preserve the CPUState (e.g. registers),
</span><span class="cx"> // call a user supplied probe function, and restore the CPUState before
</span><span class="cx"> // continuing with other JIT generated code.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerMacroAssemblercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/MacroAssembler.cpp (215195 => 215196)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/MacroAssembler.cpp 2017-04-10 19:01:57 UTC (rev 215195)
+++ trunk/Source/JavaScriptCore/assembler/MacroAssembler.cpp 2017-04-10 19:38:44 UTC (rev 215196)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2012 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2012-2017 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -35,15 +35,15 @@
</span><span class="cx"> const double MacroAssembler::twoToThe32 = (double)0x100000000ull;
</span><span class="cx">
</span><span class="cx"> #if ENABLE(MASM_PROBE)
</span><del>-static void stdFunctionCallback(MacroAssembler::ProbeContext* context)
</del><ins>+static void stdFunctionCallback(ProbeContext* context)
</ins><span class="cx"> {
</span><del>- auto func = static_cast<const std::function<void (MacroAssembler::ProbeContext*)>*>(context->arg1);
</del><ins>+ auto func = static_cast<const std::function<void(ProbeContext*)>*>(context->arg1);
</ins><span class="cx"> (*func)(context);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MacroAssembler::probe(std::function<void (MacroAssembler::ProbeContext*)> func)
</del><ins>+void MacroAssembler::probe(std::function<void(ProbeContext*)> func)
</ins><span class="cx"> {
</span><del>- probe(stdFunctionCallback, new std::function<void (MacroAssembler::ProbeContext*)>(func), 0);
</del><ins>+ probe(stdFunctionCallback, new std::function<void(ProbeContext*)>(func), 0);
</ins><span class="cx"> }
</span><span class="cx"> #endif // ENABLE(MASM_PROBE)
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerMacroAssemblerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/MacroAssembler.h (215195 => 215196)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/MacroAssembler.h 2017-04-10 19:01:57 UTC (rev 215195)
+++ trunk/Source/JavaScriptCore/assembler/MacroAssembler.h 2017-04-10 19:38:44 UTC (rev 215196)
</span><span class="lines">@@ -1822,6 +1822,25 @@
</span><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+#if ENABLE(MASM_PROBE)
+struct ProbeContext {
+ using CPUState = MacroAssembler::CPUState;
+ using RegisterID = MacroAssembler::RegisterID;
+ using FPRegisterID = MacroAssembler::FPRegisterID;
+
+ ProbeFunction probeFunction;
+ void* arg1;
+ void* arg2;
+ CPUState cpu;
+
+ // Convenience methods:
+ void*& gpr(RegisterID regID) { return cpu.gpr(regID); }
+ double& fpr(FPRegisterID regID) { return cpu.fpr(regID); }
+ const char* gprName(RegisterID regID) { return cpu.gprName(regID); }
+ const char* fprName(FPRegisterID regID) { return cpu.fprName(regID); }
+};
+#endif // ENABLE(MASM_PROBE)
+
</ins><span class="cx"> } // namespace JSC
</span><span class="cx">
</span><span class="cx"> namespace WTF {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerMacroAssemblerARMcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp (215195 => 215196)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp 2017-04-10 19:01:57 UTC (rev 215195)
+++ trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp 2017-04-10 19:38:44 UTC (rev 215196)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2013-2015 Apple Inc.
</del><ins>+ * Copyright (C) 2013-2017 Apple Inc.
</ins><span class="cx"> * Copyright (C) 2009 University of Szeged
</span><span class="cx"> * All rights reserved.
</span><span class="cx"> *
</span><span class="lines">@@ -28,9 +28,8 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx">
</span><span class="cx"> #if ENABLE(ASSEMBLER) && CPU(ARM_TRADITIONAL)
</span><ins>+#include "MacroAssembler.h"
</ins><span class="cx">
</span><del>-#include "MacroAssemblerARM.h"
-
</del><span class="cx"> #include <wtf/InlineASM.h>
</span><span class="cx">
</span><span class="cx"> #if OS(LINUX)
</span><span class="lines">@@ -103,7 +102,7 @@
</span><span class="cx">
</span><span class="cx"> #if COMPILER(GCC_OR_CLANG)
</span><span class="cx">
</span><del>-// The following are offsets for MacroAssemblerARM::ProbeContext fields accessed
</del><ins>+// The following are offsets for ProbeContext fields accessed
</ins><span class="cx"> // by the ctiMasmProbeTrampoline stub.
</span><span class="cx">
</span><span class="cx"> #define PTR_SIZE 4
</span><span class="lines">@@ -158,7 +157,7 @@
</span><span class="cx">
</span><span class="cx"> // These ASSERTs remind you that if you change the layout of ProbeContext,
</span><span class="cx"> // you need to change ctiMasmProbeTrampoline offsets above to match.
</span><del>-#define PROBE_OFFSETOF(x) offsetof(struct MacroAssemblerARM::ProbeContext, x)
</del><ins>+#define PROBE_OFFSETOF(x) offsetof(struct ProbeContext, x)
</ins><span class="cx"> COMPILE_ASSERT(PROBE_OFFSETOF(probeFunction) == PROBE_PROBE_FUNCTION_OFFSET, ProbeContext_probeFunction_offset_matches_ctiMasmProbeTrampoline);
</span><span class="cx"> COMPILE_ASSERT(PROBE_OFFSETOF(arg1) == PROBE_ARG1_OFFSET, ProbeContext_arg1_offset_matches_ctiMasmProbeTrampoline);
</span><span class="cx"> COMPILE_ASSERT(PROBE_OFFSETOF(arg2) == PROBE_ARG2_OFFSET, ProbeContext_arg2_offset_matches_ctiMasmProbeTrampoline);
</span><span class="lines">@@ -199,7 +198,7 @@
</span><span class="cx"> COMPILE_ASSERT(PROBE_OFFSETOF(cpu.d13) == PROBE_CPU_D13_OFFSET, ProbeContext_cpu_d13_offset_matches_ctiMasmProbeTrampoline);
</span><span class="cx"> COMPILE_ASSERT(PROBE_OFFSETOF(cpu.d14) == PROBE_CPU_D14_OFFSET, ProbeContext_cpu_d14_offset_matches_ctiMasmProbeTrampoline);
</span><span class="cx"> COMPILE_ASSERT(PROBE_OFFSETOF(cpu.d15) == PROBE_CPU_D15_OFFSET, ProbeContext_cpu_d15_offset_matches_ctiMasmProbeTrampoline);
</span><del>-COMPILE_ASSERT(sizeof(MacroAssemblerARM::ProbeContext) == PROBE_SIZE, ProbeContext_size_matches_ctiMasmProbeTrampoline);
</del><ins>+COMPILE_ASSERT(sizeof(ProbeContext) == PROBE_SIZE, ProbeContext_size_matches_ctiMasmProbeTrampoline);
</ins><span class="cx"> #undef PROBE_OFFSETOF
</span><span class="cx">
</span><span class="cx"> asm (
</span><span class="lines">@@ -348,7 +347,7 @@
</span><span class="cx"> );
</span><span class="cx"> #endif // COMPILER(GCC_OR_CLANG)
</span><span class="cx">
</span><del>-void MacroAssemblerARM::probe(MacroAssemblerARM::ProbeFunction function, void* arg1, void* arg2)
</del><ins>+void MacroAssemblerARM::probe(ProbeFunction function, void* arg1, void* arg2)
</ins><span class="cx"> {
</span><span class="cx"> push(RegisterID::sp);
</span><span class="cx"> push(RegisterID::lr);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerMacroAssemblerARM64cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM64.cpp (215195 => 215196)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM64.cpp 2017-04-10 19:01:57 UTC (rev 215195)
+++ trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM64.cpp 2017-04-10 19:38:44 UTC (rev 215196)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2013-2015 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2017 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx">
</span><span class="cx"> #if ENABLE(ASSEMBLER) && CPU(ARM64)
</span><del>-#include "MacroAssemblerARM64.h"
</del><ins>+#include "MacroAssembler.h"
</ins><span class="cx">
</span><span class="cx"> #include <wtf/InlineASM.h>
</span><span class="cx">
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx">
</span><span class="cx"> #if COMPILER(GCC_OR_CLANG)
</span><span class="cx">
</span><del>-// The following are offsets for MacroAssemblerARM64::ProbeContext fields accessed
</del><ins>+// The following are offsets for ProbeContext fields accessed
</ins><span class="cx"> // by the ctiMasmProbeTrampoline stub.
</span><span class="cx"> #define PTR_SIZE 8
</span><span class="cx"> #define PROBE_PROBE_FUNCTION_OFFSET (0 * PTR_SIZE)
</span><span class="lines">@@ -128,7 +128,7 @@
</span><span class="cx">
</span><span class="cx"> // These ASSERTs remind you that if you change the layout of ProbeContext,
</span><span class="cx"> // you need to change ctiMasmProbeTrampoline offsets above to match.
</span><del>-#define PROBE_OFFSETOF(x) offsetof(struct MacroAssemblerARM64::ProbeContext, x)
</del><ins>+#define PROBE_OFFSETOF(x) offsetof(struct ProbeContext, x)
</ins><span class="cx"> COMPILE_ASSERT(PROBE_OFFSETOF(probeFunction) == PROBE_PROBE_FUNCTION_OFFSET, ProbeContext_probeFunction_offset_matches_ctiMasmProbeTrampoline);
</span><span class="cx"> COMPILE_ASSERT(PROBE_OFFSETOF(arg1) == PROBE_ARG1_OFFSET, ProbeContext_arg1_offset_matches_ctiMasmProbeTrampoline);
</span><span class="cx"> COMPILE_ASSERT(PROBE_OFFSETOF(arg2) == PROBE_ARG2_OFFSET, ProbeContext_arg2_offset_matches_ctiMasmProbeTrampoline);
</span><span class="lines">@@ -205,7 +205,7 @@
</span><span class="cx"> COMPILE_ASSERT(PROBE_OFFSETOF(cpu.q30) == PROBE_CPU_Q30_OFFSET, ProbeContext_cpu_q30_offset_matches_ctiMasmProbeTrampoline);
</span><span class="cx"> COMPILE_ASSERT(PROBE_OFFSETOF(cpu.q31) == PROBE_CPU_Q31_OFFSET, ProbeContext_cpu_q31_offset_matches_ctiMasmProbeTrampoline);
</span><span class="cx">
</span><del>-COMPILE_ASSERT(sizeof(MacroAssemblerARM64::ProbeContext) == PROBE_SIZE, ProbeContext_size_matches_ctiMasmProbeTrampoline);
</del><ins>+COMPILE_ASSERT(sizeof(ProbeContext) == PROBE_SIZE, ProbeContext_size_matches_ctiMasmProbeTrampoline);
</ins><span class="cx">
</span><span class="cx"> #undef PROBE_OFFSETOF
</span><span class="cx">
</span><span class="lines">@@ -454,7 +454,7 @@
</span><span class="cx"> );
</span><span class="cx"> #endif // COMPILER(GCC_OR_CLANG)
</span><span class="cx">
</span><del>-static void arm64ProbeTrampoline(MacroAssemblerARM64::ProbeContext* context)
</del><ins>+static void arm64ProbeTrampoline(ProbeContext* context)
</ins><span class="cx"> {
</span><span class="cx"> void* origSP = context->cpu.sp;
</span><span class="cx"> void* origPC = context->cpu.pc;
</span><span class="lines">@@ -471,7 +471,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MacroAssemblerARM64::probe(MacroAssemblerARM64::ProbeFunction function, void* arg1, void* arg2)
</del><ins>+void MacroAssemblerARM64::probe(ProbeFunction function, void* arg1, void* arg2)
</ins><span class="cx"> {
</span><span class="cx"> sub64(TrustedImm32(8 * 8), sp);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerMacroAssemblerARMv7cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/MacroAssemblerARMv7.cpp (215195 => 215196)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/MacroAssemblerARMv7.cpp 2017-04-10 19:01:57 UTC (rev 215195)
+++ trunk/Source/JavaScriptCore/assembler/MacroAssemblerARMv7.cpp 2017-04-10 19:38:44 UTC (rev 215196)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2013-2015 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2017 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx">
</span><span class="cx"> #if ENABLE(ASSEMBLER) && CPU(ARM_THUMB2)
</span><del>-#include "MacroAssemblerARMv7.h"
</del><ins>+#include "MacroAssembler.h"
</ins><span class="cx">
</span><span class="cx"> #include <wtf/InlineASM.h>
</span><span class="cx">
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx">
</span><span class="cx"> #if COMPILER(GCC_OR_CLANG)
</span><span class="cx">
</span><del>-// The following are offsets for MacroAssemblerARMv7::ProbeContext fields accessed
</del><ins>+// The following are offsets for ProbeContext fields accessed
</ins><span class="cx"> // by the ctiMasmProbeTrampoline stub.
</span><span class="cx">
</span><span class="cx"> #define PTR_SIZE 4
</span><span class="lines">@@ -108,7 +108,7 @@
</span><span class="cx">
</span><span class="cx"> // These ASSERTs remind you that if you change the layout of ProbeContext,
</span><span class="cx"> // you need to change ctiMasmProbeTrampoline offsets above to match.
</span><del>-#define PROBE_OFFSETOF(x) offsetof(struct MacroAssemblerARMv7::ProbeContext, x)
</del><ins>+#define PROBE_OFFSETOF(x) offsetof(struct ProbeContext, x)
</ins><span class="cx"> COMPILE_ASSERT(PROBE_OFFSETOF(probeFunction) == PROBE_PROBE_FUNCTION_OFFSET, ProbeContext_probeFunction_offset_matches_ctiMasmProbeTrampoline);
</span><span class="cx"> COMPILE_ASSERT(PROBE_OFFSETOF(arg1) == PROBE_ARG1_OFFSET, ProbeContext_arg1_offset_matches_ctiMasmProbeTrampoline);
</span><span class="cx"> COMPILE_ASSERT(PROBE_OFFSETOF(arg2) == PROBE_ARG2_OFFSET, ProbeContext_arg2_offset_matches_ctiMasmProbeTrampoline);
</span><span class="lines">@@ -167,7 +167,7 @@
</span><span class="cx"> COMPILE_ASSERT(PROBE_OFFSETOF(cpu.d30) == PROBE_CPU_D30_OFFSET, ProbeContext_cpu_d30_offset_matches_ctiMasmProbeTrampoline);
</span><span class="cx"> COMPILE_ASSERT(PROBE_OFFSETOF(cpu.d31) == PROBE_CPU_D31_OFFSET, ProbeContext_cpu_d31_offset_matches_ctiMasmProbeTrampoline);
</span><span class="cx">
</span><del>-COMPILE_ASSERT(sizeof(MacroAssemblerARMv7::ProbeContext) == PROBE_SIZE, ProbeContext_size_matches_ctiMasmProbeTrampoline);
</del><ins>+COMPILE_ASSERT(sizeof(ProbeContext) == PROBE_SIZE, ProbeContext_size_matches_ctiMasmProbeTrampoline);
</ins><span class="cx">
</span><span class="cx"> #undef PROBE_OFFSETOF
</span><span class="cx">
</span><span class="lines">@@ -324,7 +324,7 @@
</span><span class="cx"> );
</span><span class="cx"> #endif // COMPILER(GCC_OR_CLANG)
</span><span class="cx">
</span><del>-void MacroAssemblerARMv7::probe(MacroAssemblerARMv7::ProbeFunction function, void* arg1, void* arg2)
</del><ins>+void MacroAssemblerARMv7::probe(ProbeFunction function, void* arg1, void* arg2)
</ins><span class="cx"> {
</span><span class="cx"> push(RegisterID::lr);
</span><span class="cx"> push(RegisterID::lr);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerMacroAssemblerPrintercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/MacroAssemblerPrinter.cpp (215195 => 215196)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/MacroAssemblerPrinter.cpp 2017-04-10 19:01:57 UTC (rev 215195)
+++ trunk/Source/JavaScriptCore/assembler/MacroAssemblerPrinter.cpp 2017-04-10 19:38:44 UTC (rev 215196)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2015 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2015-2017 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -33,7 +33,6 @@
</span><span class="cx"> namespace JSC {
</span><span class="cx">
</span><span class="cx"> using CPUState = MacroAssembler::CPUState;
</span><del>-using ProbeContext = MacroAssembler::ProbeContext;
</del><span class="cx"> using RegisterID = MacroAssembler::RegisterID;
</span><span class="cx"> using FPRegisterID = MacroAssembler::FPRegisterID;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerMacroAssemblerPrinterh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/MacroAssemblerPrinter.h (215195 => 215196)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/MacroAssemblerPrinter.h 2017-04-10 19:01:57 UTC (rev 215195)
+++ trunk/Source/JavaScriptCore/assembler/MacroAssemblerPrinter.h 2017-04-10 19:38:44 UTC (rev 215196)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2015 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2015-2017 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -158,7 +158,6 @@
</span><span class="cx">
</span><span class="cx"> class MacroAssemblerPrinter {
</span><span class="cx"> using CPUState = MacroAssembler::CPUState;
</span><del>- using ProbeContext = MacroAssembler::ProbeContext;
</del><span class="cx"> using RegisterID = MacroAssembler::RegisterID;
</span><span class="cx"> using FPRegisterID = MacroAssembler::FPRegisterID;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerMacroAssemblerX86Commoncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86Common.cpp (215195 => 215196)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86Common.cpp 2017-04-10 19:01:57 UTC (rev 215195)
+++ trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86Common.cpp 2017-04-10 19:38:44 UTC (rev 215196)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2013-2015 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2017 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx">
</span><span class="cx"> #if ENABLE(ASSEMBLER) && (CPU(X86) || CPU(X86_64))
</span><del>-#include "MacroAssemblerX86Common.h"
</del><ins>+#include "MacroAssembler.h"
</ins><span class="cx">
</span><span class="cx"> #include <wtf/InlineASM.h>
</span><span class="cx">
</span><span class="lines">@@ -38,8 +38,7 @@
</span><span class="cx">
</span><span class="cx"> #if COMPILER(GCC_OR_CLANG)
</span><span class="cx">
</span><del>-// The following are offsets for MacroAssemblerX86Common::ProbeContext fields accessed
-// by the ctiMasmProbeTrampoline stub.
</del><ins>+// The following are offsets for ProbeContext fields accessed by the ctiMasmProbeTrampoline stub.
</ins><span class="cx">
</span><span class="cx"> #if CPU(X86)
</span><span class="cx"> #define PTR_SIZE 4
</span><span class="lines">@@ -105,7 +104,7 @@
</span><span class="cx">
</span><span class="cx"> // These ASSERTs remind you that if you change the layout of ProbeContext,
</span><span class="cx"> // you need to change ctiMasmProbeTrampoline offsets above to match.
</span><del>-#define PROBE_OFFSETOF(x) offsetof(struct MacroAssemblerX86Common::ProbeContext, x)
</del><ins>+#define PROBE_OFFSETOF(x) offsetof(struct ProbeContext, x)
</ins><span class="cx"> COMPILE_ASSERT(PROBE_OFFSETOF(probeFunction) == PROBE_PROBE_FUNCTION_OFFSET, ProbeContext_probeFunction_offset_matches_ctiMasmProbeTrampoline);
</span><span class="cx"> COMPILE_ASSERT(PROBE_OFFSETOF(arg1) == PROBE_ARG1_OFFSET, ProbeContext_arg1_offset_matches_ctiMasmProbeTrampoline);
</span><span class="cx"> COMPILE_ASSERT(PROBE_OFFSETOF(arg2) == PROBE_ARG2_OFFSET, ProbeContext_arg2_offset_matches_ctiMasmProbeTrampoline);
</span><span class="lines">@@ -152,7 +151,7 @@
</span><span class="cx"> COMPILE_ASSERT(PROBE_OFFSETOF(cpu.xmm15) == PROBE_CPU_XMM15_OFFSET, ProbeContext_cpu_xmm15_offset_matches_ctiMasmProbeTrampoline);
</span><span class="cx"> #endif // CPU(X86_64)
</span><span class="cx">
</span><del>-COMPILE_ASSERT(sizeof(MacroAssemblerX86Common::ProbeContext) == PROBE_SIZE, ProbeContext_size_matches_ctiMasmProbeTrampoline);
</del><ins>+COMPILE_ASSERT(sizeof(ProbeContext) == PROBE_SIZE, ProbeContext_size_matches_ctiMasmProbeTrampoline);
</ins><span class="cx">
</span><span class="cx"> #undef PROBE_OFFSETOF
</span><span class="cx">
</span><span class="lines">@@ -532,7 +531,7 @@
</span><span class="cx"> // position before we push the ProbeContext frame. The saved rip will point to
</span><span class="cx"> // the address of the instruction immediately following the probe.
</span><span class="cx">
</span><del>-void MacroAssemblerX86Common::probe(MacroAssemblerX86Common::ProbeFunction function, void* arg1, void* arg2)
</del><ins>+void MacroAssemblerX86Common::probe(ProbeFunction function, void* arg1, void* arg2)
</ins><span class="cx"> {
</span><span class="cx"> push(RegisterID::esp);
</span><span class="cx"> push(RegisterID::eax);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLLowerDFGToB3cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp (215195 => 215196)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp 2017-04-10 19:01:57 UTC (rev 215195)
+++ trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp 2017-04-10 19:38:44 UTC (rev 215196)
</span><span class="lines">@@ -13999,13 +13999,6 @@
</span><span class="cx"> {
</span><span class="cx"> return abstractStructure(edge.node());
</span><span class="cx"> }
</span><del>-
-#if ENABLE(MASM_PROBE)
- void probe(std::function<void (CCallHelpers::ProbeContext*)> probeFunc)
- {
- UNUSED_PARAM(probeFunc);
- }
-#endif
</del><span class="cx">
</span><span class="cx"> void crash()
</span><span class="cx"> {
</span></span></pre>
</div>
</div>
</body>
</html>