Skip to content

[release/6.0] [mono][s390x] Fix OP_FCONV_TO_I and OP_RCONV_TO_I #65328

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
ericstj merged 1 commit into from
Mar 10, 2022
Merged

[release/6.0] [mono][s390x] Fix OP_FCONV_TO_I and OP_RCONV_TO_I #65328

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
[mono][s390x] Fix OP_FCONV_TO_I and OP_RCONV_TO_I 
* OP_[FR]CONV_TO_I should result in an 8-byte integer
  • Loading branch information
@uweigand
uweigand authored and github-actions committed Feb 14, 2022
commit 2086c20ef6f0df59cf1c45cd73ef950f7e167083
4 changes: 2 additions & 2 deletions src/mono/mono/mini/mini-s390x.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4282,7 +4282,6 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
}
break;
case OP_FCONV_TO_I4:
case OP_FCONV_TO_I:
s390_cfdbr (code, ins->dreg, 5, ins->sreg1);
break;
case OP_FCONV_TO_U4:
Expand All @@ -4293,6 +4292,7 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
}
break;
case OP_FCONV_TO_I8:
case OP_FCONV_TO_I:
s390_cgdbr (code, ins->dreg, 5, ins->sreg1);
break;
case OP_FCONV_TO_U8:
Expand Down Expand Up @@ -4337,7 +4337,6 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
}
break;
case OP_RCONV_TO_I4:
case OP_RCONV_TO_I:
s390_cfebr (code, ins->dreg, 5, ins->sreg1);
break;
case OP_RCONV_TO_U4:
Expand All @@ -4348,6 +4347,7 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
}
break;
case OP_RCONV_TO_I8:
case OP_RCONV_TO_I:
s390_cgebr (code, ins->dreg, 5, ins->sreg1);
break;
case OP_RCONV_TO_U8:
Expand Down