pass calling convention down to asm

MarinPostma · MarinPostma · commit f4a6cf787087 · 2024-12-06T21:27:11.000+01:00
after #9757
diff --git a/winch/codegen/src/isa/aarch64/asm.rs b/winch/codegen/src/isa/aarch64/asm.rs
@@ -2,6 +2,7 @@
 
 use super::{address::Address, regs};
 use crate::masm::{ExtendKind, FloatCmpKind, IntCmpKind, RoundingMode, ShiftKind};
+use crate::CallingConvention;
 use crate::{
     masm::OperandSize,
     reg::{writable, Reg, WritableReg},
@@ -17,7 +18,6 @@ use cranelift_codegen::{
         FPUOpRIMod, FPURightShiftImm, FpuRoundMode, Imm12, ImmLogic, ImmShift, Inst, PairAMode,
         ScalarSize, VecLanesOp, VecMisc2, VectorSize,
     },
-    isa::CallConv,
     settings, Final, MachBuffer, MachBufferFinalized, MachInst, MachInstEmit, MachInstEmitState,
     MachLabel, Writable,
 };
@@ -911,35 +911,35 @@ impl Assembler {
 
     /// Emits a direct call to a function defined locally and
     /// referenced to by `name`.
-    pub fn call_with_name(&mut self, name: UserExternalNameRef) {
+    pub fn call_with_name(&mut self, name: UserExternalNameRef, call_conv: CallingConvention) {
         self.emit(Inst::Call {
             info: Box::new(cranelift_codegen::CallInfo::empty(
                 ExternalName::user(name),
-                CallConv::SystemV,
+                call_conv.into(),
             )),
         })
     }
 
-    /// Emits an indirect call to a function whose address is 
+    /// Emits an indirect call to a function whose address is
     /// stored the `callee` register.
-    pub fn call_with_reg(&mut self, callee: Reg) {
+    pub fn call_with_reg(&mut self, callee: Reg, call_conv: CallingConvention) {
         self.emit(Inst::CallInd {
             info: Box::new(cranelift_codegen::CallInfo::empty(
                 callee.into(),
-                CallConv::SystemV,
+                call_conv.into(),
             )),
         })
     }
 
     /// Emit a call to a well-known libcall.
     /// `dst` is used as a scratch register to hold the address of the libcall function
-    pub fn call_with_lib(&mut self, lib: LibCall, dst: Reg) {
+    pub fn call_with_lib(&mut self, lib: LibCall, dst: Reg, call_conv: CallingConvention) {
         let name = ExternalName::LibCall(lib);
         self.emit(Inst::LoadExtName {
             rd: writable!(dst.into()),
             name: name.into(),
             offset: 0,
         });
-        self.call_with_reg(dst)
+        self.call_with_reg(dst, call_conv)
     }
 }
diff --git a/winch/codegen/src/isa/aarch64/masm.rs b/winch/codegen/src/isa/aarch64/masm.rs
@@ -179,11 +179,11 @@ impl Masm for MacroAssembler {
         let aligned_args_size = align_to(stack_args_size, alignment);
         let total_stack = delta + aligned_args_size;
         self.reserve_stack(total_stack);
-        let callee = load_callee(self);
+        let (callee, call_conv) = load_callee(self);
         match callee {
-            CalleeKind::Indirect(reg) => self.asm.call_with_reg(reg),
-            CalleeKind::Direct(idx) => self.asm.call_with_name(idx),
-            CalleeKind::LibCall(lib) => self.asm.call_with_lib(lib, scratch()),
+            CalleeKind::Indirect(reg) => self.asm.call_with_reg(reg, call_conv),
+            CalleeKind::Direct(idx) => self.asm.call_with_name(idx, call_conv),
+            CalleeKind::LibCall(lib) => self.asm.call_with_lib(lib, scratch(), call_conv),
         }
 
         total_stack
