Skip to content

Commit 267cb42

Browse files
authored
[mono] Add missing opcodes for r4 to native int conversions (#49427)
1 parent 9d94811 commit 267cb42

File tree

5 files changed

+4
-3
lines changed

5 files changed

+4
-3
lines changed

src/mono/mono/mini/cpu-arm.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,7 @@ rmove: dest:f src1:f len:4
227227
r4_conv_to_i1: dest:i src1:f len:88
228228
r4_conv_to_i2: dest:i src1:f len:88
229229
r4_conv_to_i4: dest:i src1:f len:88
230+
r4_conv_to_i: dest:i src1:f len:88
230231
r4_conv_to_u1: dest:i src1:f len:88
231232
r4_conv_to_u2: dest:i src1:f len:88
232233
r4_conv_to_u4: dest:i src1:f len:88

src/mono/mono/mini/cpu-arm64.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -229,6 +229,7 @@ r4_conv_to_u2: dest:i src1:f len:8
229229
r4_conv_to_i4: dest:i src1:f len:8
230230
r4_conv_to_u4: dest:i src1:f len:8
231231
r4_conv_to_i8: dest:l src1:f len:8
232+
r4_conv_to_i: dest:l src1:f len:8
232233
r4_conv_to_u8: dest:l src1:f len:8
233234
r4_conv_to_r4: dest:f src1:f len:4
234235
r4_conv_to_r8: dest:f src1:f len:4

src/mono/mono/mini/mini-arm.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5903,6 +5903,7 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
59035903
code = emit_r4_to_int (cfg, code, ins->dreg, ins->sreg1, 2, FALSE);
59045904
break;
59055905
case OP_RCONV_TO_I4:
5906+
case OP_RCONV_TO_I:
59065907
code = emit_r4_to_int (cfg, code, ins->dreg, ins->sreg1, 4, TRUE);
59075908
break;
59085909
case OP_RCONV_TO_U4:

src/mono/mono/mini/mini-arm64.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4335,6 +4335,7 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
43354335
arm_fcvtzu_sx (code, dreg, sreg1);
43364336
break;
43374337
case OP_RCONV_TO_I8:
4338+
case OP_RCONV_TO_I:
43384339
arm_fcvtzs_sx (code, dreg, sreg1);
43394340
break;
43404341
case OP_RCONV_TO_U8:

src/tests/issues.targets

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1312,9 +1312,6 @@
13121312
<ExcludeList Include="$(XunitTestBinBase)/Interop/StructPacking/StructPacking/**">
13131313
<Issue>needs triage</Issue>
13141314
</ExcludeList>
1315-
<ExcludeList Include="$(XunitTestBinBase)/Interop/PInvoke/Miscellaneous/ThisCall/ThisCallTest/**">
1316-
<Issue>https://github.com/dotnet/runtime/issues/46820</Issue>
1317-
</ExcludeList>
13181315
<ExcludeList Include="$(XunitTestBinBase)/JIT/Directed/Convert/ldind_conv/**">
13191316
<Issue>needs triage</Issue>
13201317
</ExcludeList>

0 commit comments

Comments
 (0)