diff options
| -rw-r--r-- | insns.def | 32 | ||||
| -rw-r--r-- | vm_insnhelper.h | 2 |
2 files changed, 16 insertions, 18 deletions
@@ -1645,17 +1645,11 @@ opt_lt /* flonum is not NaN */ val = RFLOAT_VALUE(recv) < RFLOAT_VALUE(obj) ? Qtrue : Qfalse; } - else if (!SPECIAL_CONST_P(recv) && !SPECIAL_CONST_P(obj)) { - if (RBASIC_CLASS(recv) == rb_cFloat && RBASIC_CLASS(obj) == rb_cFloat && - BASIC_OP_UNREDEFINED_P(BOP_LT, FLOAT_REDEFINED_OP_FLAG)) { - val = double_cmp_lt(RFLOAT_VALUE(recv), RFLOAT_VALUE(obj)); - } - else { - goto INSN_LABEL(normal_dispatch); - } + else if (FLOAT_INSTANCE_P(recv) && FLOAT_INSTANCE_P(obj) && + BASIC_OP_UNREDEFINED_P(BOP_LT, FLOAT_REDEFINED_OP_FLAG)) { + val = double_cmp_lt(RFLOAT_VALUE(recv), RFLOAT_VALUE(obj)); } else { - INSN_LABEL(normal_dispatch): PUSH(recv); PUSH(obj); CALL_SIMPLE_METHOD(recv); @@ -1689,6 +1683,10 @@ opt_le /* flonum is not NaN */ val = RFLOAT_VALUE(recv) <= RFLOAT_VALUE(obj) ? Qtrue : Qfalse; } + else if (FLOAT_INSTANCE_P(recv) && FLOAT_INSTANCE_P(obj) && + BASIC_OP_UNREDEFINED_P(BOP_LT, FLOAT_REDEFINED_OP_FLAG)) { + val = double_cmp_le(RFLOAT_VALUE(recv), RFLOAT_VALUE(obj)); + } else { /* other */ PUSH(recv); @@ -1724,17 +1722,11 @@ opt_gt /* flonum is not NaN */ val = RFLOAT_VALUE(recv) > RFLOAT_VALUE(obj) ? Qtrue : Qfalse; } - else if (!SPECIAL_CONST_P(recv) && !SPECIAL_CONST_P(obj)) { - if (RBASIC_CLASS(recv) == rb_cFloat && RBASIC_CLASS(obj) == rb_cFloat && - BASIC_OP_UNREDEFINED_P(BOP_GT, FLOAT_REDEFINED_OP_FLAG)) { - val = double_cmp_gt(RFLOAT_VALUE(recv), RFLOAT_VALUE(obj)); - } - else { - goto INSN_LABEL(normal_dispatch); - } + else if (FLOAT_INSTANCE_P(recv) && FLOAT_INSTANCE_P(obj) && + BASIC_OP_UNREDEFINED_P(BOP_LT, FLOAT_REDEFINED_OP_FLAG)) { + val = double_cmp_gt(RFLOAT_VALUE(recv), RFLOAT_VALUE(obj)); } else { - INSN_LABEL(normal_dispatch): PUSH(recv); PUSH(obj); CALL_SIMPLE_METHOD(recv); @@ -1768,6 +1760,10 @@ opt_ge /* flonum is not NaN */ val = RFLOAT_VALUE(recv) >= RFLOAT_VALUE(obj) ? Qtrue : Qfalse; } + else if (FLOAT_INSTANCE_P(recv) && FLOAT_INSTANCE_P(obj) && + BASIC_OP_UNREDEFINED_P(BOP_LT, FLOAT_REDEFINED_OP_FLAG)) { + val = double_cmp_ge(RFLOAT_VALUE(recv), RFLOAT_VALUE(obj)); + } else { PUSH(recv); PUSH(obj); diff --git a/vm_insnhelper.h b/vm_insnhelper.h index de2fc5bd39..33e3f434cd 100644 --- a/vm_insnhelper.h +++ b/vm_insnhelper.h @@ -166,6 +166,8 @@ enum vm_regan_acttype { #else #define FLONUM_2_P(a, b) 0 #endif +#define FLOAT_HEAP_P(x) (!SPECIAL_CONST_P(x) && RBASIC_CLASS(x) == rb_cFloat) +#define FLOAT_INSTANCE_P(x) (FLONUM_P(x) || FLOAT_HEAP_P(x)) #ifndef USE_IC_FOR_SPECIALIZED_METHOD #define USE_IC_FOR_SPECIALIZED_METHOD 1 |