Changeset 191700 in webkit

Timestamp:

Oct 28, 2015 3:59:03 PM (9 years ago)

Author:

mark.lam@apple.com

Message:

Rename MacroAssembler::callProbe() to probe().
​https://bugs.webkit.org/show_bug.cgi?id=150641

Reviewed by Saam Barati.

To do this, I needed to disambiguate between the low-level probe() from the
high-level version that takes a std::function. I did this by changing the low-
level version to not take default args anymore.

• assembler/AbstractMacroAssembler.h:
• assembler/MacroAssembler.cpp:

(JSC::stdFunctionCallback):
(JSC::MacroAssembler::probe):
(JSC::MacroAssembler::callProbe): Deleted.

• assembler/MacroAssembler.h:

(JSC::MacroAssembler::urshift32):

• assembler/MacroAssemblerARM.h:

(JSC::MacroAssemblerARM::repatchCall):

• assembler/MacroAssemblerARM64.h:

(JSC::MacroAssemblerARM64::repatchCall):

• assembler/MacroAssemblerARMv7.h:

(JSC::MacroAssemblerARMv7::repatchCall):

• assembler/MacroAssemblerPrinter.h:

(JSC::MacroAssemblerPrinter::print):

• assembler/MacroAssemblerX86Common.h:

(JSC::MacroAssemblerX86Common::maxJumpReplacementSize):

Location:

trunk/Source/JavaScriptCore

Files:

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

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2015-10-28  Mark Lam  <mark.lam@apple.com>
+
+        Rename MacroAssembler::callProbe() to probe().
+        https://bugs.webkit.org/show_bug.cgi?id=150641
+
+        Reviewed by Saam Barati.
+
+        To do this, I needed to disambiguate between the low-level probe() from the
+        high-level version that takes a std::function.  I did this by changing the low-
+        level version to not take default args anymore.
+
+        * assembler/AbstractMacroAssembler.h:
+        * assembler/MacroAssembler.cpp:
+        (JSC::stdFunctionCallback):
+        (JSC::MacroAssembler::probe):
+        (JSC::MacroAssembler::callProbe): Deleted.
+        * assembler/MacroAssembler.h:
+        (JSC::MacroAssembler::urshift32):
+        * assembler/MacroAssemblerARM.h:
+        (JSC::MacroAssemblerARM::repatchCall):
+        * assembler/MacroAssemblerARM64.h:
+        (JSC::MacroAssemblerARM64::repatchCall):
+        * assembler/MacroAssemblerARMv7.h:
+        (JSC::MacroAssemblerARMv7::repatchCall):
+        * assembler/MacroAssemblerPrinter.h:
+        (JSC::MacroAssemblerPrinter::print):
+        * assembler/MacroAssemblerX86Common.h:
+        (JSC::MacroAssemblerX86Common::maxJumpReplacementSize):
+
 2015-10-28  Timothy Hatcher  <timothy@apple.com>
 

trunk/Source/JavaScriptCore/assembler/AbstractMacroAssembler.h

@@ -941 +941 @@
     // This prototype is only provided here to document the interface.
 
-    void probe(ProbeFunction, void* arg1 = 0, void* arg2 = 0);
+    void probe(ProbeFunction, void* arg1, void* arg2);
 
 #endif // ENABLE(MASM_PROBE)

trunk/Source/JavaScriptCore/assembler/MacroAssembler.cpp

@@ -40 +40 @@
 }
     
-void MacroAssembler::callProbe(std::function<void (MacroAssembler::ProbeContext*)> func)
+void MacroAssembler::probe(std::function<void (MacroAssembler::ProbeContext*)> func)
 {
-    probe(stdFunctionCallback, new std::function<void (MacroAssembler::ProbeContext*)>(func));
+    probe(stdFunctionCallback, new std::function<void (MacroAssembler::ProbeContext*)>(func), 0);
 }
 #endif // ENABLE(MASM_PROBE)

trunk/Source/JavaScriptCore/assembler/MacroAssembler.h

@@ -1586 +1586 @@
 
 #if ENABLE(MASM_PROBE)
+    using MacroAssemblerBase::probe;
+
     // Let's you print from your JIT generated code.
     // See comments in MacroAssemblerPrinter.h for examples of how to use this.
@@ -1591 +1593 @@
     void print(Arguments... args);
 
-    void callProbe(std::function<void (ProbeContext*)>);
+    void probe(std::function<void (ProbeContext*)>);
 #endif
 };

trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM.h

@@ -1449 +1449 @@
 
 #if ENABLE(MASM_PROBE)
-    void probe(ProbeFunction, void* arg1 = 0, void* arg2 = 0);
+    void probe(ProbeFunction, void* arg1, void* arg2);
 #endif // ENABLE(MASM_PROBE)
 

trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM64.h

@@ -2534 +2534 @@
 
 #if ENABLE(MASM_PROBE)
-    void probe(ProbeFunction, void* arg1 = 0, void* arg2 = 0);
+    void probe(ProbeFunction, void* arg1, void* arg2);
 #endif // ENABLE(MASM_PROBE)
 

trunk/Source/JavaScriptCore/assembler/MacroAssemblerARMv7.h

@@ -1919 +1919 @@
 
 #if ENABLE(MASM_PROBE)
-    void probe(ProbeFunction, void* arg1 = 0, void* arg2 = 0);
+    void probe(ProbeFunction, void* arg1, void* arg2);
 #endif // ENABLE(MASM_PROBE)
 

trunk/Source/JavaScriptCore/assembler/MacroAssemblerPrinter.h

@@ -170 +170 @@
         auto argsList = std::make_unique<PrintArgsList>();
         appendPrintArg(argsList.get(), args...);
-        masm->probe(printCallback, argsList.release());
+        masm->probe(printCallback, argsList.release(), 0);
     }
     

trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86Common.h

@@ -1497 +1497 @@
 
 #if ENABLE(MASM_PROBE)
-    void probe(ProbeFunction, void* arg1 = 0, void* arg2 = 0);
+    void probe(ProbeFunction, void* arg1, void* arg2);
 #endif // ENABLE(MASM_PROBE)