Removes REGISTER_OTHER_SCRATCH from ANCHOR_ANCHOR_INTERNAL_FUNCTION_C…

…ALL_REG.
solana-labs · Sep 25, 2024 · 4797a0d · 4797a0d
1 parent 64f9768
commit 4797a0d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/jit.rs b/src/jit.rs
@@ -1508,9 +1508,8 @@ impl<'a, C: ContextObject> JitCompiler<'a, C> {
         // Load the frame pointer again since we've clobbered REGISTER_MAP[FRAME_PTR_REG]
         self.emit_ins(X86Instruction::load(OperandSize::S64, REGISTER_PTR_TO_VM, REGISTER_MAP[FRAME_PTR_REG], stack_pointer_access));
         // Restore the clobbered REGISTER_MAP[0]
-        self.emit_ins(X86Instruction::mov(OperandSize::S64, REGISTER_MAP[0], REGISTER_OTHER_SCRATCH));
-        self.emit_ins(X86Instruction::pop(REGISTER_MAP[0]));
-        self.emit_ins(X86Instruction::jump_reg(REGISTER_OTHER_SCRATCH, None)); // Tail call to host_target_address
+        self.emit_ins(X86Instruction::xchg(OperandSize::S64, REGISTER_MAP[0], RSP, Some(X86IndirectAccess::OffsetIndexShift(0, RSP, 0)))); // Swap REGISTER_MAP[0] and host_target_address
+        self.emit_ins(X86Instruction::return_near()); // Tail call to host_target_address
 
         // Translates a vm memory address to a host memory address
         for (access_type, len) in &[

diff --git a/src/x86.rs b/src/x86.rs
@@ -614,6 +614,7 @@ impl X86Instruction {
     }
 
     /// Jump to absolute destination
+    #[allow(dead_code)]
     #[inline]
     pub const fn jump_reg(destination: u8, indirect: Option<X86IndirectAccess>) -> Self {
         Self {