Changeset 221012 in webkit

Timestamp:

Aug 22, 2017, 8:50:50 AM (9 years ago)

Author:

pvollan@apple.com

Message:

[Win][Release] Crash when running testmasm executable.
​https://bugs.webkit.org/show_bug.cgi?id=175772

Reviewed by Mark Lam.

We need to save and restore the modified registers in case one or more registers are callee saved
on the relevant platforms.

• assembler/testmasm.cpp:

(JSC::testProbeReadsArgumentRegisters):
(JSC::testProbeWritesArgumentRegisters):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• assembler/testmasm.cpp (modified) (4 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2017-08-22  Per Arne Vollan  <pvollan@apple.com>
+
+        [Win][Release] Crash when running testmasm executable.
+        https://bugs.webkit.org/show_bug.cgi?id=175772
+
+        Reviewed by Mark Lam.
+
+        We need to save and restore the modified registers in case one or more registers are callee saved
+        on the relevant platforms.
+
+        * assembler/testmasm.cpp:
+        (JSC::testProbeReadsArgumentRegisters):
+        (JSC::testProbeWritesArgumentRegisters):
+
 2017-08-21  Mark Lam  <mark.lam@apple.com>
 

trunk/Source/JavaScriptCore/assembler/testmasm.cpp

@@ -178 +178 @@
         jit.emitFunctionPrologue();
 
+        jit.push(GPRInfo::argumentGPR0);
+        jit.push(GPRInfo::argumentGPR1);
+        jit.push(GPRInfo::argumentGPR2);
+        jit.push(GPRInfo::argumentGPR3);
+
         jit.move(CCallHelpers::TrustedImm32(testWord32(0)), GPRInfo::argumentGPR0);
         jit.convertInt32ToDouble(GPRInfo::argumentGPR0, FPRInfo::fpRegT0);
@@ -205 +210 @@
             CHECK_EQ(cpu.fpr(FPRInfo::fpRegT1), testWord32(1));
         });
+
+        jit.pop(GPRInfo::argumentGPR3);
+        jit.pop(GPRInfo::argumentGPR2);
+        jit.pop(GPRInfo::argumentGPR1);
+        jit.pop(GPRInfo::argumentGPR0);
+
         jit.emitFunctionEpilogue();
         jit.ret();
@@ -219 +230 @@
     compileAndRun<void>([&] (CCallHelpers& jit) {
         jit.emitFunctionPrologue();
+
+        jit.push(GPRInfo::argumentGPR0);
+        jit.push(GPRInfo::argumentGPR1);
+        jit.push(GPRInfo::argumentGPR2);
+        jit.push(GPRInfo::argumentGPR3);
 
         // Pre-initialize with non-expected values.
@@ -260 +276 @@
             CHECK_EQ(cpu.fpr<uint64_t>(FPRInfo::fpRegT1), testWord64(1));
         });
+
+        jit.pop(GPRInfo::argumentGPR3);
+        jit.pop(GPRInfo::argumentGPR2);
+        jit.pop(GPRInfo::argumentGPR1);
+        jit.pop(GPRInfo::argumentGPR0);
 
         jit.emitFunctionEpilogue();