Pacify Valgrind (by fixing a somewhat theoretical bug).

oven-sh · Mar 3, 2024 · 9d254ea · 9d254ea
1 parent 64b2fa7
commit 9d254ea
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 11 deletions.
diff --git a/Source/JavaScriptCore/llint/InPlaceInterpreter.asm b/Source/JavaScriptCore/llint/InPlaceInterpreter.asm
@@ -812,7 +812,8 @@ macro ipintCatchCommon()
     # 1 << 4 == StackValueSize
     lshiftq 4, t0
     addq IPIntCalleeSaveSpaceStackAligned, t0
-    subp cfr, t0, sp
+    subp cfr, t0, t0
+    move t0, sp
 end
 
 global _ipint_catch_entry

diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter.asm b/Source/JavaScriptCore/llint/LowLevelInterpreter.asm
@@ -1101,7 +1101,8 @@ macro restoreStackPointerAfterCall()
         subp cfr, t2, t2
         move t2, sp
     else
-        subp cfr, t2, sp
+        subp cfr, t2, t2
+        move t2, sp
     end
 end
 

diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm b/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
@@ -340,7 +340,8 @@ macro doVMEntry(makeCall)
         subp cfr, CalleeRegisterSaveSize, t5
         move t5, sp
     else
-        subp cfr, CalleeRegisterSaveSize, sp
+        subp cfr, CalleeRegisterSaveSize, t5
+        move t5, sp
     end
 
     popCalleeSaves()
@@ -379,7 +380,8 @@ _llint_throw_stack_overflow_error_from_vm_entry:
         subp cfr, CalleeRegisterSaveSize, t5
         move t5, sp
     else
-        subp cfr, CalleeRegisterSaveSize, sp
+        subp cfr, CalleeRegisterSaveSize, t5
+        move t5, sp
     end
 
     popCalleeSaves()
@@ -452,7 +454,8 @@ op(llint_handle_uncaught_exception, macro()
         subp cfr, CalleeRegisterSaveSize, t3
         move t3, sp
     else
-        subp cfr, CalleeRegisterSaveSize, sp
+        subp cfr, CalleeRegisterSaveSize, t3
+        move t3, sp
     end
 
     popCalleeSaves()

diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm b/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
@@ -357,7 +357,8 @@ macro doVMEntry(makeCall)
         storep t2, VM::topEntryFrame[vm]
     end
 
-    subp cfr, CalleeRegisterSaveSize, sp
+    subp cfr, CalleeRegisterSaveSize, t2
+    move t2, sp
 
     popCalleeSaves()
     functionEpilogue()
@@ -383,7 +384,8 @@ _llint_throw_stack_overflow_error_from_vm_entry:
 
     move ValueUndefined, r0
 
-    subp cfr, CalleeRegisterSaveSize, sp
+    subp cfr, CalleeRegisterSaveSize, t4
+    move t4, sp
     popCalleeSaves()
     functionEpilogue()
     ret
@@ -445,7 +447,8 @@ op(llint_handle_uncaught_exception, macro ()
 
     move ValueUndefined, r0
 
-    subp cfr, CalleeRegisterSaveSize, sp
+    subp cfr, CalleeRegisterSaveSize, t3
+    move t3, sp
     popCalleeSaves()
     functionEpilogue()
     ret

diff --git a/Source/JavaScriptCore/llint/WebAssembly.asm b/Source/JavaScriptCore/llint/WebAssembly.asm
@@ -381,7 +381,8 @@ if ARMv7
     subp cfr, ws1, ws1
     move ws1, sp
 else
-    subp cfr, ws1, sp
+    subp cfr, ws1, ws1
+    move ws1, sp
 end
 end
 
@@ -1012,7 +1013,8 @@ if ARMv7
             subp cfr, ws1, ws1
             move ws1, sp
 else
-            subp cfr, ws1, sp
+            subp cfr, ws1, ws1
+            move ws1, sp
 end
 
             wgetu(ctx, m_numberOfStackArgs, ws1)
@@ -1169,7 +1171,8 @@ if ARMv7
             subp cfr, ws1, ws1
             move ws1, sp
 else
-            subp cfr, ws1, sp
+            subp cfr, ws1, ws1
+            move ws1, sp
 end
 
             storeWasmInstance(targetWasmInstance)