Changeset 215196 in webkit

Timestamp:

Apr 10, 2017 12:38:44 PM (7 years ago)

Author:

mark.lam@apple.com

Message:

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.

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• assembler/AbstractMacroAssembler.h (modified) (2 diffs)
• assembler/MacroAssembler.cpp (modified) (2 diffs)
• assembler/MacroAssembler.h (modified) (1 diff)
• assembler/MacroAssemblerARM.cpp (modified) (6 diffs)
• assembler/MacroAssemblerARM64.cpp (modified) (7 diffs)
• assembler/MacroAssemblerARMv7.cpp (modified) (6 diffs)
• assembler/MacroAssemblerPrinter.cpp (modified) (2 diffs)
• assembler/MacroAssemblerPrinter.h (modified) (2 diffs)
• assembler/MacroAssemblerX86Common.cpp (modified) (6 diffs)
• ftl/FTLLowerDFGToB3.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+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.
+
 2017-04-10  Keith Miller  <keith_miller@apple.com>
 

trunk/Source/JavaScriptCore/assembler/AbstractMacroAssembler.h

@@ -44 +44 @@
 #if ENABLE(ASSEMBLER)
 
+#if ENABLE(MASM_PROBE)
+struct ProbeContext;
+typedef void (*ProbeFunction)(struct ProbeContext*);
+#endif
+    
 class AllowMacroScratchRegisterUsage;
 class DisallowMacroScratchRegisterUsage;
@@ -879 +884 @@
     };
 
-    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

trunk/Source/JavaScriptCore/assembler/MacroAssembler.cpp

@@ -1 +1 @@
 /*
- * 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
@@ -36 +36 @@
 
 #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)

trunk/Source/JavaScriptCore/assembler/MacroAssembler.h

@@ -1823 +1823 @@
 };
 
+#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
 

trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp

@@ -1 +1 @@
 /*
- * Copyright (C) 2013-2015 Apple Inc.
+ * Copyright (C) 2013-2017 Apple Inc.
  * Copyright (C) 2009 University of Szeged
  * All rights reserved.
@@ -29 +29 @@
 
 #if ENABLE(ASSEMBLER) && CPU(ARM_TRADITIONAL)
-
-#include "MacroAssemblerARM.h"
+#include "MacroAssembler.h"
 
 #include <wtf/InlineASM.h>
@@ -104 +103 @@
 #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.
 
@@ -159 +158 @@
 // 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);
@@ -200 +199 @@
 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
 
@@ -349 +348 @@
 #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);

trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM64.cpp

@@ -1 +1 @@
 /*
- * 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
@@ -27 +27 @@
 
 #if ENABLE(ASSEMBLER) && CPU(ARM64)
-#include "MacroAssemblerARM64.h"
+#include "MacroAssembler.h"
 
 #include <wtf/InlineASM.h>
@@ -41 +41 @@
 #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
@@ -129 +129 @@
 // 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);
@@ -206 +206 @@
 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
@@ -455 +455 @@
 #endif // COMPILER(GCC_OR_CLANG)
 
-static void arm64ProbeTrampoline(MacroAssemblerARM64::ProbeContext* context)
+static void arm64ProbeTrampoline(ProbeContext* context)
 {
     void* origSP = context->cpu.sp;
@@ -472 +472 @@
 }
 
-void MacroAssemblerARM64::probe(MacroAssemblerARM64::ProbeFunction function, void* arg1, void* arg2)
+void MacroAssemblerARM64::probe(ProbeFunction function, void* arg1, void* arg2)
 {
     sub64(TrustedImm32(8 * 8), sp);

trunk/Source/JavaScriptCore/assembler/MacroAssemblerARMv7.cpp

@@ -1 +1 @@
 /*
- * 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
@@ -27 +27 @@
 
 #if ENABLE(ASSEMBLER) && CPU(ARM_THUMB2)
-#include "MacroAssemblerARMv7.h"
+#include "MacroAssembler.h"
 
 #include <wtf/InlineASM.h>
@@ -39 +39 @@
 #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.
 
@@ -109 +109 @@
 // 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);
@@ -168 +168 @@
 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
@@ -325 +325 @@
 #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);

trunk/Source/JavaScriptCore/assembler/MacroAssemblerPrinter.cpp

@@ -1 +1 @@
 /*
- * 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
@@ -34 +34 @@
 
 using CPUState = MacroAssembler::CPUState;
-using ProbeContext = MacroAssembler::ProbeContext;
 using RegisterID = MacroAssembler::RegisterID;
 using FPRegisterID = MacroAssembler::FPRegisterID;

trunk/Source/JavaScriptCore/assembler/MacroAssemblerPrinter.h

@@ -1 +1 @@
 /*
- * 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
@@ -159 +159 @@
 class MacroAssemblerPrinter {
     using CPUState = MacroAssembler::CPUState;
-    using ProbeContext = MacroAssembler::ProbeContext;
     using RegisterID = MacroAssembler::RegisterID;
     using FPRegisterID = MacroAssembler::FPRegisterID;

trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86Common.cpp

@@ -1 +1 @@
 /*
- * 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
@@ -27 +27 @@
 
 #if ENABLE(ASSEMBLER) && (CPU(X86) || CPU(X86_64))
-#include "MacroAssemblerX86Common.h"
+#include "MacroAssembler.h"
 
 #include <wtf/InlineASM.h>
@@ -39 +39 @@
 #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)
@@ -106 +105 @@
 // 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);
@@ -153 +152 @@
 #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
@@ -533 +532 @@
 // 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);

trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp

@@ -14000 +14000 @@
         return abstractStructure(edge.node());
     }
-    
-#if ENABLE(MASM_PROBE)
-    void probe(std::function<void (CCallHelpers::ProbeContext*)> probeFunc)
-    {
-        UNUSED_PARAM(probeFunc);
-    }
-#endif
 
     void crash()