[mini] Fix x86/arm build.
authorAlex Rønne Petersen <alexrp@xamarin.com>
Wed, 4 Feb 2015 13:13:00 +0000 (14:13 +0100)
committerAlex Rønne Petersen <alexrp@xamarin.com>
Wed, 4 Feb 2015 13:42:43 +0000 (14:42 +0100)
mono/mini/mini-arm.c
mono/mini/mini-x86.c

index 9d61985388f9d7752a0e5624800ed41b2dbe9831..ff445ba2b45c7444ad2d5f641167a5124fe5170c 100644 (file)
@@ -4833,10 +4833,10 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                        if (IS_VFP && ins->dreg != ins->sreg1)
                                ARM_CPYD (code, ins->dreg, ins->sreg1);
                        break;
-               case OP_MOVE_R4_TO_I4:
+               case OP_MOVE_F_TO_I4:
                        ARM_FMRS (code, ins->dreg, ins->sreg1);
                        break;
-               case OP_MOVE_I4_TO_R4:
+               case OP_MOVE_I4_TO_F:
                        ARM_FMSR (code, ins->dreg, ins->sreg1);
                        break;
                case OP_FCONV_TO_R4:
index 9a3e056bbe74d59961cb1a7cec60b045f18fbf76..9e03a1b805ab86dd555b03f606504972f3a2685f 100644 (file)
@@ -3701,12 +3701,12 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                case OP_FMOVE:
                        /* Not needed on the fp stack */
                        break;
-               case OP_MOVE_R4_TO_I4:
+               case OP_MOVE_F_TO_I4:
                        x86_push_reg (code, X86_EAX);
                        x86_fist_pop_membase (code, X86_ESP, 0, FALSE);
                        x86_pop_reg (code, ins->dreg);
                        break;
-               case OP_MOVE_I4_TO_R4:
+               case OP_MOVE_I4_TO_F:
                        x86_push_reg (code, ins->sreg1);
                        x86_fild_membase (code, X86_ESP, 0, FALSE);
                        x86_alu_reg_imm (code, X86_ADD, X86_ESP, 4);