Skip to content

M
mruby
Unverified Commit c8cf9512 authored by Yukihiro "Matz" Matsumoto's avatar Yukihiro "Matz" Matsumoto
Browse files
Options

Update the PR #4992 to enable integer division always.

parent 1835753f
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 15 deletions
src/vm.c
View file @ c8cf9512
...@@ -2312,26 +2312,13 @@ RETRY_TRY_BLOCK: ...@@ -2312,26 +2312,13 @@ RETRY_TRY_BLOCK:
/* need to check if op is overridden */ /* need to check if op is overridden */
switch (TYPES2(mrb_type(regs[a]),mrb_type(regs[a+1]))) { switch (TYPES2(mrb_type(regs[a]),mrb_type(regs[a+1]))) {
case TYPES2(MRB_TT_FIXNUM,MRB_TT_FIXNUM): case TYPES2(MRB_TT_FIXNUM,MRB_TT_FIXNUM):
#ifdef MRB_NO_FLOAT
{ {
mrb_int x = mrb_fixnum(regs[a]); mrb_int x = mrb_fixnum(regs[a]);
mrb_int y = mrb_fixnum(regs[a+1]); mrb_int y = mrb_fixnum(regs[a+1]);
SET_INT_VALUE(regs[a], y ? x / y : 0); SET_INT_VALUE(regs[a], y ? x / y : 0);
} }
break;
#else
#ifdef MRB_INTEGER_DIVISION
{
mrb_int x = mrb_fixnum(regs[a]);
mrb_int y = mrb_fixnum(regs[a+1]);
SET_INT_VALUE(regs[a], y ? x / y : 0);
NEXT; NEXT;
} #ifndef MRB_NO_FLOAT
#else
x = (mrb_float)mrb_fixnum(regs[a]);
y = (mrb_float)mrb_fixnum(regs[a+1]);
#endif
break;
case TYPES2(MRB_TT_FIXNUM,MRB_TT_FLOAT): case TYPES2(MRB_TT_FIXNUM,MRB_TT_FLOAT):
x = (mrb_float)mrb_fixnum(regs[a]); x = (mrb_float)mrb_fixnum(regs[a]);
y = mrb_float(regs[a+1]); y = mrb_float(regs[a+1]);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment