Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 30 additions & 9 deletions majit/majit-backend-cranelift/src/compiler.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16822,13 +16822,19 @@ impl majit_backend::Backend for CraneliftBackend {
if func == 0 {
return 0;
}
let (classes, args) = majit_backend::call_stub::collect_call_args(
let collected = majit_backend::call_stub::collect_call_args(
&calldescr.arg_classes,
args_i,
args_r,
args_f,
);
unsafe { majit_backend::call_stub::bh_call_i_dispatch(func as usize, &classes, &args) }
unsafe {
majit_backend::call_stub::bh_call_i_dispatch(
func as usize,
collected.classes(),
collected.args(),
)
}
}

/// llmodel.py:818 bh_call_r: GcRef-returning parallel of `bh_call_i`.
Expand All @@ -16848,14 +16854,19 @@ impl majit_backend::Backend for CraneliftBackend {
if func == 0 {
return majit_ir::GcRef::NULL;
}
let (classes, args) = majit_backend::call_stub::collect_call_args(
let collected = majit_backend::call_stub::collect_call_args(
&calldescr.arg_classes,
args_i,
args_r,
args_f,
);
let raw =
unsafe { majit_backend::call_stub::bh_call_i_dispatch(func as usize, &classes, &args) };
let raw = unsafe {
majit_backend::call_stub::bh_call_i_dispatch(
func as usize,
collected.classes(),
collected.args(),
)
};
majit_ir::GcRef(raw as usize)
}

Expand All @@ -16876,13 +16887,19 @@ impl majit_backend::Backend for CraneliftBackend {
if func == 0 {
return 0.0;
}
let (classes, args) = majit_backend::call_stub::collect_call_args(
let collected = majit_backend::call_stub::collect_call_args(
&calldescr.arg_classes,
args_i,
args_r,
args_f,
);
unsafe { majit_backend::call_stub::bh_call_f_dispatch(func as usize, &classes, &args) }
unsafe {
majit_backend::call_stub::bh_call_f_dispatch(
func as usize,
collected.classes(),
collected.args(),
)
}
}

/// llmodel.py:834 bh_call_v / descr.py:590-605 create_call_stub
Expand All @@ -16907,14 +16924,18 @@ impl majit_backend::Backend for CraneliftBackend {
if func == 0 {
return;
}
let (classes, args) = majit_backend::call_stub::collect_call_args(
let collected = majit_backend::call_stub::collect_call_args(
&calldescr.arg_classes,
args_i,
args_r,
args_f,
);
unsafe {
majit_backend::call_stub::bh_call_v_dispatch(func as usize, &classes, &args);
majit_backend::call_stub::bh_call_v_dispatch(
func as usize,
collected.classes(),
collected.args(),
);
}
}

Expand Down
39 changes: 30 additions & 9 deletions majit/majit-backend-dynasm/src/runner.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3355,13 +3355,19 @@ impl Backend for DynasmBackend {
if func == 0 {
return 0;
}
let (classes, args) = majit_backend::call_stub::collect_call_args(
let collected = majit_backend::call_stub::collect_call_args(
&calldescr.arg_classes,
args_i,
args_r,
args_f,
);
unsafe { majit_backend::call_stub::bh_call_i_dispatch(func as usize, &classes, &args) }
unsafe {
majit_backend::call_stub::bh_call_i_dispatch(
func as usize,
collected.classes(),
collected.args(),
)
}
}

/// llmodel.py:818 bh_call_r: GcRef-returning parallel of `bh_call_i`.
Expand All @@ -3381,14 +3387,19 @@ impl Backend for DynasmBackend {
if func == 0 {
return majit_ir::GcRef::NULL;
}
let (classes, args) = majit_backend::call_stub::collect_call_args(
let collected = majit_backend::call_stub::collect_call_args(
&calldescr.arg_classes,
args_i,
args_r,
args_f,
);
let raw =
unsafe { majit_backend::call_stub::bh_call_i_dispatch(func as usize, &classes, &args) };
let raw = unsafe {
majit_backend::call_stub::bh_call_i_dispatch(
func as usize,
collected.classes(),
collected.args(),
)
};
majit_ir::GcRef(raw as usize)
}

Expand All @@ -3409,13 +3420,19 @@ impl Backend for DynasmBackend {
if func == 0 {
return 0.0;
}
let (classes, args) = majit_backend::call_stub::collect_call_args(
let collected = majit_backend::call_stub::collect_call_args(
&calldescr.arg_classes,
args_i,
args_r,
args_f,
);
unsafe { majit_backend::call_stub::bh_call_f_dispatch(func as usize, &classes, &args) }
unsafe {
majit_backend::call_stub::bh_call_f_dispatch(
func as usize,
collected.classes(),
collected.args(),
)
}
}

/// llmodel.py:834 bh_call_v / descr.py:590-605 create_call_stub
Expand All @@ -3439,14 +3456,18 @@ impl Backend for DynasmBackend {
if func == 0 {
return;
}
let (classes, args) = majit_backend::call_stub::collect_call_args(
let collected = majit_backend::call_stub::collect_call_args(
&calldescr.arg_classes,
args_i,
args_r,
args_f,
);
unsafe {
majit_backend::call_stub::bh_call_v_dispatch(func as usize, &classes, &args);
majit_backend::call_stub::bh_call_v_dispatch(
func as usize,
collected.classes(),
collected.args(),
);
}
}

Expand Down
Loading
Loading