Changeset 220921 in webkit for trunk/Source/JavaScriptCore/assembler/testmasm.cpp

Timestamp:

Aug 18, 2017, 10:54:50 AM (8 years ago)

Author:

[email protected]

Message:

Rename ProbeContext and ProbeFunction to Probe::State and Probe::Function.
​https://bugs.webkit.org/show_bug.cgi?id=175725
<rdar://problem/33965477>

Rubber-stamped by JF Bastien.

This is purely a refactoring patch (in preparation for the introduction of a
Probe::Context data structure in ​https://bugs.webkit.org/show_bug.cgi?id=175688
later). This patch does not change any semantics / behavior.

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

(JSC::stdFunctionCallback):
(JSC::MacroAssembler::probe):

• assembler/MacroAssembler.h:

(JSC::ProbeContext::gpr): Deleted.
(JSC::ProbeContext::spr): Deleted.
(JSC::ProbeContext::fpr): Deleted.
(JSC::ProbeContext::gprName): Deleted.
(JSC::ProbeContext::sprName): Deleted.
(JSC::ProbeContext::fprName): Deleted.
(JSC::ProbeContext::pc): Deleted.
(JSC::ProbeContext::fp): Deleted.
(JSC::ProbeContext::sp): Deleted.

• assembler/MacroAssemblerARM.cpp:

(JSC::MacroAssembler::probe):

• assembler/MacroAssemblerARM.h:

(JSC::MacroAssemblerARM::trustedImm32FromPtr):

• assembler/MacroAssemblerARM64.cpp:

(JSC::arm64ProbeError):
(JSC::MacroAssembler::probe):

• assembler/MacroAssemblerARMv7.cpp:

(JSC::MacroAssembler::probe):

• assembler/MacroAssemblerARMv7.h:

(JSC::MacroAssemblerARMv7::trustedImm32FromPtr):

• assembler/MacroAssemblerPrinter.cpp:

(JSC::Printer::printCallback):

• assembler/MacroAssemblerPrinter.h:
• assembler/MacroAssemblerX86Common.cpp:

(JSC::MacroAssembler::probe):

• assembler/Printer.h:

(JSC::Printer::Context::Context):

• assembler/testmasm.cpp:

(JSC::testProbeReadsArgumentRegisters):
(JSC::testProbeWritesArgumentRegisters):
(JSC::testProbePreservesGPRS):
(JSC::testProbeModifiesStackPointer):
(JSC::testProbeModifiesStackPointerToInsideProbeStateOnStack):
(JSC::testProbeModifiesStackPointerToNBytesBelowSP):
(JSC::testProbeModifiesProgramCounter):
(JSC::fillStack):
(JSC::testProbeModifiesStackWithCallback):
(JSC::run):
(JSC::testProbeModifiesStackPointerToInsideProbeContextOnStack): Deleted.

File:

• trunk/Source/JavaScriptCore/assembler/testmasm.cpp (modified) (25 diffs)

trunk/Source/JavaScriptCore/assembler/testmasm.cpp

@@ -185 +185 @@
 #endif
 
-        jit.probe([&] (ProbeContext* context) {
+        jit.probe([&] (Probe::State* context) {
             auto& cpu = context->cpu;
             probeWasCalled = true;
@@ -227 +227 @@
 
         // Write expected values.
-        jit.probe([&] (ProbeContext* context) {
+        jit.probe([&] (Probe::State* context) {
             auto& cpu = context->cpu;
             probeCallCount++;
@@ -240 +240 @@
 
         // Validate that expected values were written.
-        jit.probe([&] (ProbeContext* context) {
+        jit.probe([&] (Probe::State* context) {
             auto& cpu = context->cpu;
             probeCallCount++;
@@ -283 +283 @@
 
         // Write expected values into the registers (except for sp, fp, and pc).
-        jit.probe([&] (ProbeContext* context) {
+        jit.probe([&] (Probe::State* context) {
             auto& cpu = context->cpu;
             probeCallCount++;
@@ -299 +299 @@
 
         // Invoke the probe to call a lot of functions and trash register values.
-        jit.probe([&] (ProbeContext*) {
+        jit.probe([&] (Probe::State*) {
             probeCallCount++;
             CHECK_EQ(testFunctionToTrashGPRs(0, 1, 2, 3, 4, 5, 6, 7, 8, 9), 10);
@@ -306 +306 @@
 
         // Validate that the registers have the expected values.
-        jit.probe([&] (ProbeContext* context) {
+        jit.probe([&] (Probe::State* context) {
             auto& cpu = context->cpu;
             probeCallCount++;
@@ -323 +323 @@
 
         // Restore the original state.
-        jit.probe([&] (ProbeContext* context) {
+        jit.probe([&] (Probe::State* context) {
             auto& cpu = context->cpu;
             probeCallCount++;
@@ -336 +336 @@
 
         // Validate that the original state was restored.
-        jit.probe([&] (ProbeContext* context) {
+        jit.probe([&] (Probe::State* context) {
             auto& cpu = context->cpu;
             probeCallCount++;
@@ -354 +354 @@
 }
 
-void testProbeModifiesStackPointer(WTF::Function<void*(ProbeContext*)> computeModifiedStack)
+void testProbeModifiesStackPointer(WTF::Function<void*(Probe::State*)> computeModifiedStack)
 {
     unsigned probeCallCount = 0;
@@ -378 +378 @@
         // Preserve original stack pointer and modify the sp, and
         // write expected values into other registers (except for fp, and pc).
-        jit.probe([&] (ProbeContext* context) {
+        jit.probe([&] (Probe::State* context) {
             auto& cpu = context->cpu;
             probeCallCount++;
@@ -402 +402 @@
 
         // Validate that the registers have the expected values.
-        jit.probe([&] (ProbeContext* context) {
+        jit.probe([&] (Probe::State* context) {
             auto& cpu = context->cpu;
             probeCallCount++;
@@ -421 +421 @@
 
         // Restore the original state.
-        jit.probe([&] (ProbeContext* context) {
+        jit.probe([&] (Probe::State* context) {
             auto& cpu = context->cpu;
             probeCallCount++;
@@ -436 +436 @@
 
         // Validate that the original state was restored.
-        jit.probe([&] (ProbeContext* context) {
+        jit.probe([&] (Probe::State* context) {
             auto& cpu = context->cpu;
             probeCallCount++;
@@ -456 +456 @@
 }
 
-void testProbeModifiesStackPointerToInsideProbeContextOnStack()
+void testProbeModifiesStackPointerToInsideProbeStateOnStack()
 {
     size_t increment = sizeof(uintptr_t);
@@ -463 +463 @@
     increment = 2 * sizeof(uintptr_t);
 #endif
-    for (size_t offset = 0; offset < sizeof(ProbeContext); offset += increment) {
-        testProbeModifiesStackPointer([=] (ProbeContext* context) -> void* {
+    for (size_t offset = 0; offset < sizeof(Probe::State); offset += increment) {
+        testProbeModifiesStackPointer([=] (Probe::State* context) -> void* {
             return reinterpret_cast<uint8_t*>(context) + offset;
         });
@@ -478 +478 @@
 #endif
     for (size_t offset = 0; offset < 1 * KB; offset += increment) {
-        testProbeModifiesStackPointer([=] (ProbeContext* context) -> void* {
+        testProbeModifiesStackPointer([=] (Probe::State* context) -> void* {
             return reinterpret_cast<uint8_t*>(context->cpu.sp()) - offset;
         });
@@ -494 +494 @@
     MacroAssemblerCodeRef continuation = compile([&] (CCallHelpers& jit) {
         // Validate that we reached the continuation.
-        jit.probe([&] (ProbeContext*) {
+        jit.probe([&] (Probe::State*) {
             probeCallCount++;
             continuationWasReached = true;
@@ -507 +507 @@
 
         // Write expected values into the registers.
-        jit.probe([&] (ProbeContext* context) {
+        jit.probe([&] (Probe::State* context) {
             probeCallCount++;
             context->pc() = continuation.code().executableAddress();
@@ -526 +526 @@
 };
 
-static void fillStack(ProbeContext* context)
+static void fillStack(Probe::State* context)
 {
     auto& cpu = context->cpu;
@@ -540 +540 @@
     CHECK_EQ(cpu.sp(), newSP);
 
-    // Verify that the probe has put the ProbeContext out of harm's way.
+    // Verify that the probe has put the Probe::State out of harm's way.
     CHECK_EQ((reinterpret_cast<void*>(context + 1) <= cpu.sp()), true);
 
@@ -590 +590 @@
 
         // Write expected values into the registers.
-        jit.probe([&] (ProbeContext* context) {
+        jit.probe([&] (Probe::State* context) {
             auto& cpu = context->cpu;
             probeCallCount++;
@@ -615 +615 @@
             context->initializeStackArg = &data;
 
-            // Ensure that we'll be writing over the regions of the stack where the ProbeContext is.
+            // Ensure that we'll be writing over the regions of the stack where the Probe::State is.
             originalSP = cpu.sp();
             newSP = reinterpret_cast<uintptr_t*>(context) - numberOfExtraEntriesToWrite;
@@ -622 +622 @@
 
         // Validate that the registers and stack have the expected values.
-        jit.probe([&] (ProbeContext* context) {
+        jit.probe([&] (Probe::State* context) {
             auto& cpu = context->cpu;
             probeCallCount++;
@@ -649 +649 @@
 
         // Restore the original state.
-        jit.probe([&] (ProbeContext* context) {
+        jit.probe([&] (Probe::State* context) {
             auto& cpu = context->cpu;
             probeCallCount++;
@@ -701 +701 @@
     RUN(testProbeWritesArgumentRegisters());
     RUN(testProbePreservesGPRS());
-    RUN(testProbeModifiesStackPointerToInsideProbeContextOnStack());
+    RUN(testProbeModifiesStackPointerToInsideProbeStateOnStack());
     RUN(testProbeModifiesStackPointerToNBytesBelowSP());
     RUN(testProbeModifiesProgramCounter());