Changeset 215196 in webkit for trunk/Source/JavaScriptCore/assembler/MacroAssembler.cpp

Timestamp:

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

Author:

[email protected]

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.

File:

• trunk/Source/JavaScriptCore/assembler/MacroAssembler.cpp (modified) (2 diffs)

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)