Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (215195 => 215196)
--- trunk/Source/_javascript_Core/ChangeLog 2017-04-10 19:01:57 UTC (rev 215195)
+++ trunk/Source/_javascript_Core/ChangeLog 2017-04-10 19:38:44 UTC (rev 215196)
@@ -1,3 +1,41 @@
+2017-04-10 Mark Lam <mark....@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.
+
2017-04-10 Keith Miller <keith_mil...@apple.com>
WebAssembly: Fix B3IRGenerator for BrTable
Modified: trunk/Source/_javascript_Core/assembler/AbstractMacroAssembler.h (215195 => 215196)
--- trunk/Source/_javascript_Core/assembler/AbstractMacroAssembler.h 2017-04-10 19:01:57 UTC (rev 215195)
+++ trunk/Source/_javascript_Core/assembler/AbstractMacroAssembler.h 2017-04-10 19:38:44 UTC (rev 215196)
@@ -43,6 +43,11 @@
#if ENABLE(ASSEMBLER)
+#if ENABLE(MASM_PROBE)
+struct ProbeContext;
+typedef void (*ProbeFunction)(struct ProbeContext*);
+#endif
+
class AllowMacroScratchRegisterUsage;
class DisallowMacroScratchRegisterUsage;
class LinkBuffer;
@@ -878,22 +883,6 @@
}
};
- 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); }
- };
-
// This function emits code to preserve the CPUState (e.g. registers),
// call a user supplied probe function, and restore the CPUState before
// continuing with other JIT generated code.
Modified: trunk/Source/_javascript_Core/assembler/MacroAssembler.cpp (215195 => 215196)
--- trunk/Source/_javascript_Core/assembler/MacroAssembler.cpp 2017-04-10 19:01:57 UTC (rev 215195)
+++ trunk/Source/_javascript_Core/assembler/MacroAssembler.cpp 2017-04-10 19:38:44 UTC (rev 215196)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2012 Apple Inc. All rights reserved.
+ * Copyright (C) 2012-2017 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -35,15 +35,15 @@
const double MacroAssembler::twoToThe32 = (double)0x100000000ull;
#if ENABLE(MASM_PROBE)
-static void stdFunctionCallback(MacroAssembler::ProbeContext* context)
+static void stdFunctionCallback(ProbeContext* context)
{
- auto func = static_cast<const std::function<void (MacroAssembler::ProbeContext*)>*>(context->arg1);
+ auto func = static_cast<const std::function<void(ProbeContext*)>*>(context->arg1);
(*func)(context);
}
-void MacroAssembler::probe(std::function<void (MacroAssembler::ProbeContext*)> func)
+void MacroAssembler::probe(std::function<void(ProbeContext*)> func)
{
- probe(stdFunctionCallback, new std::function<void (MacroAssembler::ProbeContext*)>(func), 0);
+ probe(stdFunctionCallback, new std::function<void(ProbeContext*)>(func), 0);
}
#endif // ENABLE(MASM_PROBE)
Modified: trunk/Source/_javascript_Core/assembler/MacroAssembler.h (215195 => 215196)
--- trunk/Source/_javascript_Core/assembler/MacroAssembler.h 2017-04-10 19:01:57 UTC (rev 215195)
+++ trunk/Source/_javascript_Core/assembler/MacroAssembler.h 2017-04-10 19:38:44 UTC (rev 215196)
@@ -1822,6 +1822,25 @@
#endif
};
+#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)
+
} // namespace JSC
namespace WTF {
Modified: trunk/Source/_javascript_Core/assembler/MacroAssemblerARM.cpp (215195 => 215196)
--- trunk/Source/_javascript_Core/assembler/MacroAssemblerARM.cpp 2017-04-10 19:01:57 UTC (rev 215195)
+++ trunk/Source/_javascript_Core/assembler/MacroAssemblerARM.cpp 2017-04-10 19:38:44 UTC (rev 215196)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2013-2015 Apple Inc.
+ * Copyright (C) 2013-2017 Apple Inc.
* Copyright (C) 2009 University of Szeged
* All rights reserved.
*
@@ -28,9 +28,8 @@
#include "config.h"
#if ENABLE(ASSEMBLER) && CPU(ARM_TRADITIONAL)
+#include "MacroAssembler.h"
-#include "MacroAssemblerARM.h"
-
#include <wtf/InlineASM.h>
#if OS(LINUX)
@@ -103,7 +102,7 @@
#if COMPILER(GCC_OR_CLANG)
-// The following are offsets for MacroAssemblerARM::ProbeContext fields accessed
+// The following are offsets for ProbeContext fields accessed
// by the ctiMasmProbeTrampoline stub.
#define PTR_SIZE 4
@@ -158,7 +157,7 @@
// These ASSERTs remind you that if you change the layout of ProbeContext,
// you need to change ctiMasmProbeTrampoline offsets above to match.
-#define PROBE_OFFSETOF(x) offsetof(struct MacroAssemblerARM::ProbeContext, x)
+#define PROBE_OFFSETOF(x) offsetof(struct ProbeContext, x)
COMPILE_ASSERT(PROBE_OFFSETOF(probeFunction) == PROBE_PROBE_FUNCTION_OFFSET, ProbeContext_probeFunction_offset_matches_ctiMasmProbeTrampoline);
COMPILE_ASSERT(PROBE_OFFSETOF(arg1) == PROBE_ARG1_OFFSET, ProbeContext_arg1_offset_matches_ctiMasmProbeTrampoline);
COMPILE_ASSERT(PROBE_OFFSETOF(arg2) == PROBE_ARG2_OFFSET, ProbeContext_arg2_offset_matches_ctiMasmProbeTrampoline);
@@ -199,7 +198,7 @@
COMPILE_ASSERT(PROBE_OFFSETOF(cpu.d13) == PROBE_CPU_D13_OFFSET, ProbeContext_cpu_d13_offset_matches_ctiMasmProbeTrampoline);
COMPILE_ASSERT(PROBE_OFFSETOF(cpu.d14) == PROBE_CPU_D14_OFFSET, ProbeContext_cpu_d14_offset_matches_ctiMasmProbeTrampoline);
COMPILE_ASSERT(PROBE_OFFSETOF(cpu.d15) == PROBE_CPU_D15_OFFSET, ProbeContext_cpu_d15_offset_matches_ctiMasmProbeTrampoline);
-COMPILE_ASSERT(sizeof(MacroAssemblerARM::ProbeContext) == PROBE_SIZE, ProbeContext_size_matches_ctiMasmProbeTrampoline);
+COMPILE_ASSERT(sizeof(ProbeContext) == PROBE_SIZE, ProbeContext_size_matches_ctiMasmProbeTrampoline);
#undef PROBE_OFFSETOF
asm (
@@ -348,7 +347,7 @@
);
#endif // COMPILER(GCC_OR_CLANG)
-void MacroAssemblerARM::probe(MacroAssemblerARM::ProbeFunction function, void* arg1, void* arg2)
+void MacroAssemblerARM::probe(ProbeFunction function, void* arg1, void* arg2)
{
push(RegisterID::sp);
push(RegisterID::lr);
Modified: trunk/Source/_javascript_Core/assembler/MacroAssemblerARM64.cpp (215195 => 215196)
--- trunk/Source/_javascript_Core/assembler/MacroAssemblerARM64.cpp 2017-04-10 19:01:57 UTC (rev 215195)
+++ trunk/Source/_javascript_Core/assembler/MacroAssemblerARM64.cpp 2017-04-10 19:38:44 UTC (rev 215196)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2013-2015 Apple Inc. All rights reserved.
+ * Copyright (C) 2013-2017 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -26,7 +26,7 @@
#include "config.h"
#if ENABLE(ASSEMBLER) && CPU(ARM64)
-#include "MacroAssemblerARM64.h"
+#include "MacroAssembler.h"
#include <wtf/InlineASM.h>
@@ -40,7 +40,7 @@
#if COMPILER(GCC_OR_CLANG)
-// The following are offsets for MacroAssemblerARM64::ProbeContext fields accessed
+// The following are offsets for ProbeContext fields accessed
// by the ctiMasmProbeTrampoline stub.
#define PTR_SIZE 8
#define PROBE_PROBE_FUNCTION_OFFSET (0 * PTR_SIZE)
@@ -128,7 +128,7 @@
// These ASSERTs remind you that if you change the layout of ProbeContext,
// you need to change ctiMasmProbeTrampoline offsets above to match.
-#define PROBE_OFFSETOF(x) offsetof(struct MacroAssemblerARM64::ProbeContext, x)
+#define PROBE_OFFSETOF(x) offsetof(struct ProbeContext, x)
COMPILE_ASSERT(PROBE_OFFSETOF(probeFunction) == PROBE_PROBE_FUNCTION_OFFSET, ProbeContext_probeFunction_offset_matches_ctiMasmProbeTrampoline);
COMPILE_ASSERT(PROBE_OFFSETOF(arg1) == PROBE_ARG1_OFFSET, ProbeContext_arg1_offset_matches_ctiMasmProbeTrampoline);
COMPILE_ASSERT(PROBE_OFFSETOF(arg2) == PROBE_ARG2_OFFSET, ProbeContext_arg2_offset_matches_ctiMasmProbeTrampoline);
@@ -205,7 +205,7 @@
COMPILE_ASSERT(PROBE_OFFSETOF(cpu.q30) == PROBE_CPU_Q30_OFFSET, ProbeContext_cpu_q30_offset_matches_ctiMasmProbeTrampoline);
COMPILE_ASSERT(PROBE_OFFSETOF(cpu.q31) == PROBE_CPU_Q31_OFFSET, ProbeContext_cpu_q31_offset_matches_ctiMasmProbeTrampoline);
-COMPILE_ASSERT(sizeof(MacroAssemblerARM64::ProbeContext) == PROBE_SIZE, ProbeContext_size_matches_ctiMasmProbeTrampoline);
+COMPILE_ASSERT(sizeof(ProbeContext) == PROBE_SIZE, ProbeContext_size_matches_ctiMasmProbeTrampoline);
#undef PROBE_OFFSETOF
@@ -454,7 +454,7 @@
);
#endif // COMPILER(GCC_OR_CLANG)
-static void arm64ProbeTrampoline(MacroAssemblerARM64::ProbeContext* context)
+static void arm64ProbeTrampoline(ProbeContext* context)
{
void* origSP = context->cpu.sp;
void* origPC = context->cpu.pc;
@@ -471,7 +471,7 @@
}
}
-void MacroAssemblerARM64::probe(MacroAssemblerARM64::ProbeFunction function, void* arg1, void* arg2)
+void MacroAssemblerARM64::probe(ProbeFunction function, void* arg1, void* arg2)
{
sub64(TrustedImm32(8 * 8), sp);
Modified: trunk/Source/_javascript_Core/assembler/MacroAssemblerARMv7.cpp (215195 => 215196)
--- trunk/Source/_javascript_Core/assembler/MacroAssemblerARMv7.cpp 2017-04-10 19:01:57 UTC (rev 215195)
+++ trunk/Source/_javascript_Core/assembler/MacroAssemblerARMv7.cpp 2017-04-10 19:38:44 UTC (rev 215196)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2013-2015 Apple Inc. All rights reserved.
+ * Copyright (C) 2013-2017 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -26,7 +26,7 @@
#include "config.h"
#if ENABLE(ASSEMBLER) && CPU(ARM_THUMB2)
-#include "MacroAssemblerARMv7.h"
+#include "MacroAssembler.h"
#include <wtf/InlineASM.h>
@@ -38,7 +38,7 @@
#if COMPILER(GCC_OR_CLANG)
-// The following are offsets for MacroAssemblerARMv7::ProbeContext fields accessed
+// The following are offsets for ProbeContext fields accessed
// by the ctiMasmProbeTrampoline stub.
#define PTR_SIZE 4
@@ -108,7 +108,7 @@
// These ASSERTs remind you that if you change the layout of ProbeContext,
// you need to change ctiMasmProbeTrampoline offsets above to match.
-#define PROBE_OFFSETOF(x) offsetof(struct MacroAssemblerARMv7::ProbeContext, x)
+#define PROBE_OFFSETOF(x) offsetof(struct ProbeContext, x)
COMPILE_ASSERT(PROBE_OFFSETOF(probeFunction) == PROBE_PROBE_FUNCTION_OFFSET, ProbeContext_probeFunction_offset_matches_ctiMasmProbeTrampoline);
COMPILE_ASSERT(PROBE_OFFSETOF(arg1) == PROBE_ARG1_OFFSET, ProbeContext_arg1_offset_matches_ctiMasmProbeTrampoline);
COMPILE_ASSERT(PROBE_OFFSETOF(arg2) == PROBE_ARG2_OFFSET, ProbeContext_arg2_offset_matches_ctiMasmProbeTrampoline);
@@ -167,7 +167,7 @@
COMPILE_ASSERT(PROBE_OFFSETOF(cpu.d30) == PROBE_CPU_D30_OFFSET, ProbeContext_cpu_d30_offset_matches_ctiMasmProbeTrampoline);
COMPILE_ASSERT(PROBE_OFFSETOF(cpu.d31) == PROBE_CPU_D31_OFFSET, ProbeContext_cpu_d31_offset_matches_ctiMasmProbeTrampoline);
-COMPILE_ASSERT(sizeof(MacroAssemblerARMv7::ProbeContext) == PROBE_SIZE, ProbeContext_size_matches_ctiMasmProbeTrampoline);
+COMPILE_ASSERT(sizeof(ProbeContext) == PROBE_SIZE, ProbeContext_size_matches_ctiMasmProbeTrampoline);
#undef PROBE_OFFSETOF
@@ -324,7 +324,7 @@
);
#endif // COMPILER(GCC_OR_CLANG)
-void MacroAssemblerARMv7::probe(MacroAssemblerARMv7::ProbeFunction function, void* arg1, void* arg2)
+void MacroAssemblerARMv7::probe(ProbeFunction function, void* arg1, void* arg2)
{
push(RegisterID::lr);
push(RegisterID::lr);
Modified: trunk/Source/_javascript_Core/assembler/MacroAssemblerPrinter.cpp (215195 => 215196)
--- trunk/Source/_javascript_Core/assembler/MacroAssemblerPrinter.cpp 2017-04-10 19:01:57 UTC (rev 215195)
+++ trunk/Source/_javascript_Core/assembler/MacroAssemblerPrinter.cpp 2017-04-10 19:38:44 UTC (rev 215196)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015 Apple Inc. All rights reserved.
+ * Copyright (C) 2015-2017 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -33,7 +33,6 @@
namespace JSC {
using CPUState = MacroAssembler::CPUState;
-using ProbeContext = MacroAssembler::ProbeContext;
using RegisterID = MacroAssembler::RegisterID;
using FPRegisterID = MacroAssembler::FPRegisterID;
Modified: trunk/Source/_javascript_Core/assembler/MacroAssemblerPrinter.h (215195 => 215196)
--- trunk/Source/_javascript_Core/assembler/MacroAssemblerPrinter.h 2017-04-10 19:01:57 UTC (rev 215195)
+++ trunk/Source/_javascript_Core/assembler/MacroAssemblerPrinter.h 2017-04-10 19:38:44 UTC (rev 215196)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015 Apple Inc. All rights reserved.
+ * Copyright (C) 2015-2017 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -158,7 +158,6 @@
class MacroAssemblerPrinter {
using CPUState = MacroAssembler::CPUState;
- using ProbeContext = MacroAssembler::ProbeContext;
using RegisterID = MacroAssembler::RegisterID;
using FPRegisterID = MacroAssembler::FPRegisterID;
Modified: trunk/Source/_javascript_Core/assembler/MacroAssemblerX86Common.cpp (215195 => 215196)
--- trunk/Source/_javascript_Core/assembler/MacroAssemblerX86Common.cpp 2017-04-10 19:01:57 UTC (rev 215195)
+++ trunk/Source/_javascript_Core/assembler/MacroAssemblerX86Common.cpp 2017-04-10 19:38:44 UTC (rev 215196)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2013-2015 Apple Inc. All rights reserved.
+ * Copyright (C) 2013-2017 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -26,7 +26,7 @@
#include "config.h"
#if ENABLE(ASSEMBLER) && (CPU(X86) || CPU(X86_64))
-#include "MacroAssemblerX86Common.h"
+#include "MacroAssembler.h"
#include <wtf/InlineASM.h>
@@ -38,8 +38,7 @@
#if COMPILER(GCC_OR_CLANG)
-// The following are offsets for MacroAssemblerX86Common::ProbeContext fields accessed
-// by the ctiMasmProbeTrampoline stub.
+// The following are offsets for ProbeContext fields accessed by the ctiMasmProbeTrampoline stub.
#if CPU(X86)
#define PTR_SIZE 4
@@ -105,7 +104,7 @@
// These ASSERTs remind you that if you change the layout of ProbeContext,
// you need to change ctiMasmProbeTrampoline offsets above to match.
-#define PROBE_OFFSETOF(x) offsetof(struct MacroAssemblerX86Common::ProbeContext, x)
+#define PROBE_OFFSETOF(x) offsetof(struct ProbeContext, x)
COMPILE_ASSERT(PROBE_OFFSETOF(probeFunction) == PROBE_PROBE_FUNCTION_OFFSET, ProbeContext_probeFunction_offset_matches_ctiMasmProbeTrampoline);
COMPILE_ASSERT(PROBE_OFFSETOF(arg1) == PROBE_ARG1_OFFSET, ProbeContext_arg1_offset_matches_ctiMasmProbeTrampoline);
COMPILE_ASSERT(PROBE_OFFSETOF(arg2) == PROBE_ARG2_OFFSET, ProbeContext_arg2_offset_matches_ctiMasmProbeTrampoline);
@@ -152,7 +151,7 @@
COMPILE_ASSERT(PROBE_OFFSETOF(cpu.xmm15) == PROBE_CPU_XMM15_OFFSET, ProbeContext_cpu_xmm15_offset_matches_ctiMasmProbeTrampoline);
#endif // CPU(X86_64)
-COMPILE_ASSERT(sizeof(MacroAssemblerX86Common::ProbeContext) == PROBE_SIZE, ProbeContext_size_matches_ctiMasmProbeTrampoline);
+COMPILE_ASSERT(sizeof(ProbeContext) == PROBE_SIZE, ProbeContext_size_matches_ctiMasmProbeTrampoline);
#undef PROBE_OFFSETOF
@@ -532,7 +531,7 @@
// position before we push the ProbeContext frame. The saved rip will point to
// the address of the instruction immediately following the probe.
-void MacroAssemblerX86Common::probe(MacroAssemblerX86Common::ProbeFunction function, void* arg1, void* arg2)
+void MacroAssemblerX86Common::probe(ProbeFunction function, void* arg1, void* arg2)
{
push(RegisterID::esp);
push(RegisterID::eax);
Modified: trunk/Source/_javascript_Core/ftl/FTLLowerDFGToB3.cpp (215195 => 215196)
--- trunk/Source/_javascript_Core/ftl/FTLLowerDFGToB3.cpp 2017-04-10 19:01:57 UTC (rev 215195)
+++ trunk/Source/_javascript_Core/ftl/FTLLowerDFGToB3.cpp 2017-04-10 19:38:44 UTC (rev 215196)
@@ -13999,13 +13999,6 @@
{
return abstractStructure(edge.node());
}
-
-#if ENABLE(MASM_PROBE)
- void probe(std::function<void (CCallHelpers::ProbeContext*)> probeFunc)
- {
- UNUSED_PARAM(probeFunc);
- }
-#endif
void crash()
{
