Skip to content

[mono][interp] Add implicit conversion of floating-point call args #89428

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 28, 2023
Merged

[mono][interp] Add implicit conversion of floating-point call args #89428

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a679bda
Add explicit conversion of call args
kotlarmilos Jul 25, 2023
90c5f5e
Merge branch 'dotnet:main' into bugfix/explicit-cast
kotlarmilos Jul 26, 2023
f1f64e8
Merge branch 'dotnet:main' into bugfix/explicit-cast
kotlarmilos Jul 28, 2023
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
30 changes: 26 additions & 4 deletions src/mono/mono/mini/interp/transform.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3258,6 +3258,26 @@ emit_convert (TransformData *td, StackInfo *sp, MonoType *target_type)
}
break;
}
case MONO_TYPE_R4: {
switch (stype) {
case STACK_TYPE_R8:
interp_add_conv (td, sp, NULL, STACK_TYPE_R4, MINT_CONV_R4_R8);
break;
default:
break;
}
break;
}
case MONO_TYPE_R8: {
switch (stype) {
case STACK_TYPE_R4:
interp_add_conv (td, sp, NULL, STACK_TYPE_R8, MINT_CONV_R8_R4);
break;
default:
break;
}
break;
}
#if SIZEOF_VOID_P == 8
case MONO_TYPE_U: {
switch (stype) {
Expand All @@ -3275,9 +3295,9 @@ emit_convert (TransformData *td, StackInfo *sp, MonoType *target_type)
}

static void
interp_emit_arg_conv (TransformData *td, MonoMethodSignature *csignature)
interp_emit_arg_conv (TransformData *td, MonoMethodSignature *csignature, int arg_start_offset)
{
StackInfo *arg_start = td->sp - csignature->param_count;
StackInfo *arg_start = td->sp - arg_start_offset - csignature->param_count;

for (int i = 0; i < csignature->param_count; i++)
emit_convert (td, &arg_start [i], csignature->params [i]);
Expand Down Expand Up @@ -3623,6 +3643,10 @@ interp_transform_call (TransformData *td, MonoMethod *method, MonoMethod *target
interp_ins_set_dreg (td->last_ins, sp->local);
}

/* Offset the function pointer when emitting convert instructions */
int arg_start_offset = calli ? 1 : 0;
interp_emit_arg_conv (td, csignature, arg_start_offset);

g_assert (csignature->call_convention != MONO_CALL_FASTCALL);
if ((mono_interp_opt & INTERP_OPT_INLINE) && op == -1 && !is_virtual && target_method && interp_method_check_inlining (td, target_method, csignature)) {
MonoMethodHeader *mheader = interp_method_get_header (target_method, error);
Expand Down Expand Up @@ -3679,8 +3703,6 @@ interp_transform_call (TransformData *td, MonoMethod *method, MonoMethod *target
fp_sreg = td->sp [0].local;
}

interp_emit_arg_conv (td, csignature);

int param_end_offset = 0;
if (!td->optimized && op == -1)
param_end_offset = get_tos_offset (td);
Expand Down