fixing scratch split

tenderlove · tenderlove · commit b66f4348e4d9 · 2026-02-24T12:31:44.000-08:00
diff --git a/zjit/src/backend/arm64/mod.rs b/zjit/src/backend/arm64/mod.rs
@@ -776,7 +776,7 @@ impl Assembler {
                     asm.push_insn(insn);
 
                     if let Some(mem_out) = mem_out {
-                        let mem_out = split_large_disp(asm, mem_out, SCRATCH1_OPND);
+                        let mem_out = split_stack_membase(asm, mem_out, SCRATCH1_OPND, &stack_state);
                         asm.store(mem_out, SCRATCH0_OPND);
                     }
                 }
@@ -789,7 +789,7 @@ impl Assembler {
                     asm.push_insn(insn);
 
                     if let Some(mem_out) = mem_out {
-                        let mem_out = split_large_disp(asm, mem_out, SCRATCH1_OPND);
+                        let mem_out = split_stack_membase(asm, mem_out, SCRATCH1_OPND, &stack_state);
                         asm.store(mem_out, SCRATCH0_OPND);
                     };
 
@@ -808,7 +808,7 @@ impl Assembler {
                     asm.push_insn(insn);
 
                     if let Some(mem_out) = mem_out {
-                        let mem_out = split_large_disp(asm, mem_out, SCRATCH1_OPND);
+                        let mem_out = split_stack_membase(asm, mem_out, SCRATCH1_OPND, &stack_state);
                         asm.store(mem_out, SCRATCH0_OPND);
                     }
                 }
@@ -841,7 +841,7 @@ impl Assembler {
                     asm.push_insn(insn);
 
                     if let Some(mem_out) = mem_out {
-                        let mem_out = split_large_disp(asm, mem_out, SCRATCH1_OPND);
+                        let mem_out = split_stack_membase(asm, mem_out, SCRATCH1_OPND, &stack_state);
                         asm.store(mem_out, SCRATCH0_OPND);
                     }
                 }

Original file line number	Diff line number	Diff line change
`@@ -776,7 +776,7 @@ impl Assembler {`
`776`	`776`	`asm.push_insn(insn);`
`777`	`777`
`778`	`778`	`if let Some(mem_out) = mem_out {`
`779`		`- let mem_out = split_large_disp(asm, mem_out, SCRATCH1_OPND);`
	`779`	`+ let mem_out = split_stack_membase(asm, mem_out, SCRATCH1_OPND, &stack_state);`
`780`	`780`	`asm.store(mem_out, SCRATCH0_OPND);`
`781`	`781`	`}`
`782`	`782`	`}`
`@@ -789,7 +789,7 @@ impl Assembler {`
`789`	`789`	`asm.push_insn(insn);`
`790`	`790`
`791`	`791`	`if let Some(mem_out) = mem_out {`
`792`		`- let mem_out = split_large_disp(asm, mem_out, SCRATCH1_OPND);`
	`792`	`+ let mem_out = split_stack_membase(asm, mem_out, SCRATCH1_OPND, &stack_state);`
`793`	`793`	`asm.store(mem_out, SCRATCH0_OPND);`
`794`	`794`	`};`
`795`	`795`
`@@ -808,7 +808,7 @@ impl Assembler {`
`808`	`808`	`asm.push_insn(insn);`
`809`	`809`
`810`	`810`	`if let Some(mem_out) = mem_out {`
`811`		`- let mem_out = split_large_disp(asm, mem_out, SCRATCH1_OPND);`
	`811`	`+ let mem_out = split_stack_membase(asm, mem_out, SCRATCH1_OPND, &stack_state);`
`812`	`812`	`asm.store(mem_out, SCRATCH0_OPND);`
`813`	`813`	`}`
`814`	`814`	`}`
`@@ -841,7 +841,7 @@ impl Assembler {`
`841`	`841`	`asm.push_insn(insn);`
`842`	`842`
`843`	`843`	`if let Some(mem_out) = mem_out {`
`844`		`- let mem_out = split_large_disp(asm, mem_out, SCRATCH1_OPND);`
	`844`	`+ let mem_out = split_stack_membase(asm, mem_out, SCRATCH1_OPND, &stack_state);`
`845`	`845`	`asm.store(mem_out, SCRATCH0_OPND);`
`846`	`846`	`}`
`847`	`847`	`}`