Changeset 215196 in webkit for trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86Common.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/MacroAssemblerX86Common.cpp (modified) (6 diffs)

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);