Remove hardcoded alignment and addend

bytecodealliance · May 16, 2023 · 0eff833 · 0eff833
1 parent e9fecc4
commit 0eff833
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 5 deletions.
diff --git a/winch/codegen/src/codegen/call.rs b/winch/codegen/src/codegen/call.rs
@@ -147,8 +147,10 @@ impl<'a> FnCall<'a> {
         masm: &mut M,
         context: &mut CodeGenContext,
         callee: FuncIndex,
+        alignment: u32,
+        addend: u32,
     ) {
-        let reserved_stack = masm.call(16, 16, self.arg_stack_space, |masm| {
+        let reserved_stack = masm.call(alignment, addend, self.arg_stack_space, |masm| {
             self.assign_args(context, masm, <A as ABI>::scratch_reg());
             CalleeKind::Direct(callee.as_u32())
         });
@@ -161,8 +163,10 @@ impl<'a> FnCall<'a> {
         masm: &mut M,
         context: &mut CodeGenContext,
         addr: M::Address,
+        alignment: u32,
+        addend: u32,
     ) {
-        let reserved_stack = masm.call(16, 16, self.arg_stack_space, |masm| {
+        let reserved_stack = masm.call(alignment, addend, self.arg_stack_space, |masm| {
             let scratch = <A as ABI>::scratch_reg();
             self.assign_args(context, masm, scratch);
             masm.load(addr, scratch, OperandSize::S64);

diff --git a/winch/codegen/src/codegen/mod.rs b/winch/codegen/src/codegen/mod.rs
@@ -172,11 +172,24 @@ where
         };
 
         let fncall = FnCall::new::<A, M>(&sig, &mut self.context, self.masm);
-
+        let alignment = self.abi.call_stack_align();
+        let addend = self.abi.arg_base_offset();
         if let Some(addr) = callee_addr {
-            fncall.indirect::<M, A>(self.masm, &mut self.context, addr);
+            fncall.indirect::<M, A>(
+                self.masm,
+                &mut self.context,
+                addr,
+                alignment.into(),
+                addend.into(),
+            );
         } else {
-            fncall.direct::<M, A>(self.masm, &mut self.context, index);
+            fncall.direct::<M, A>(
+                self.masm,
+                &mut self.context,
+                index,
+                alignment.into(),
+                addend.into(),
+            );
         }
     }