naruse	2016-03-21 22:36:03 +0900 (Mon, 21 Mar 2016)

  New Revision: 54216

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=54216

  Log:
    * internal.h (rb_fix_divmod_fix): like r54213, use FIX2NUM only if
      x == FIXNUM_MIN && y == -1. This must be a rare case and it is
      expected compiler to handle well.

  Modified files:
    trunk/ChangeLog
    trunk/insns.def
    trunk/internal.h
    trunk/numeric.c
    trunk/time.c
Index: internal.h
===================================================================
--- internal.h	(revision 54215)
+++ internal.h	(revision 54216)
@@ -298,39 +298,46 @@ rb_fix_mul_fix(VALUE x, VALUE y) https://github.com/ruby/ruby/blob/trunk/internal.h#L298
  * Note that div may overflow fixnum.
  */
 static inline void
-rb_divmod(long x, long y, long *divp, long *modp) {
+rb_fix_divmod_fix(VALUE a, VALUE b, VALUE *divp, VALUE *modp) {
     /* assume / and % comply C99.
      * ldiv(3) won't be inlined by GCC and clang.
      * I expect / and % are compiled as single idiv.
      */
-    long div = x / y;
-    long mod = x % y;
+    long x = FIX2LONG(a);
+    long y = FIX2LONG(b);
+    long div, mod;
+    if (x == FIXNUM_MIN && y == -1) {
+	if (divp) *divp = LONG2NUM(-FIXNUM_MIN);
+	if (modp) *modp = LONG2FIX(0);
+	return;
+    }
+    div = x / y;
+    mod = x % y;
     if (y > 0 ? mod < 0 : mod > 0) {
 	mod += y;
 	div -= 1;
     }
-    if (divp) *divp = div;
-    if (modp) *modp = mod;
+    if (divp) *divp = LONG2FIX(div);
+    if (modp) *modp = LONG2FIX(mod);
 }
 
 /* div() for Ruby
  * This behaves different from C99 for negative arguments.
- * Note that div may overflow fixnum
  */
-static inline long
-rb_div(long x, long y) {
-    long div;
-    rb_divmod(x, y, &div, NULL);
+static inline VALUE
+rb_fix_div_fix(VALUE x, VALUE y) {
+    VALUE div;
+    rb_fix_divmod_fix(x, y, &div, NULL);
     return div;
 }
 
 /* mod() for Ruby
  * This behaves different from C99 for negative arguments.
  */
-static inline long
-rb_mod(long x, long y) {
-    long mod;
-    rb_divmod(x, y, NULL, &mod);
+static inline VALUE
+rb_fix_mod_fix(VALUE x, VALUE y) {
+    VALUE mod;
+    rb_fix_divmod_fix(x, y, NULL, &mod);
     return mod;
 }
 
Index: numeric.c
===================================================================
--- numeric.c	(revision 54215)
+++ numeric.c	(revision 54216)
@@ -3135,7 +3135,7 @@ fix_divide(VALUE x, VALUE y, ID op) https://github.com/ruby/ruby/blob/trunk/numeric.c#L3135
 {
     if (FIXNUM_P(y)) {
 	if (FIX2LONG(y) == 0) rb_num_zerodiv();
-	return LONG2NUM(rb_div(FIX2LONG(x), FIX2LONG(y)));
+	return rb_fix_div_fix(x, y);
     }
     else if (RB_TYPE_P(y, T_BIGNUM)) {
 	x = rb_int2big(FIX2LONG(x));
@@ -3207,7 +3207,7 @@ fix_mod(VALUE x, VALUE y) https://github.com/ruby/ruby/blob/trunk/numeric.c#L3207
 {
     if (FIXNUM_P(y)) {
 	if (FIX2LONG(y) == 0) rb_num_zerodiv();
-	return LONG2FIX(rb_mod(FIX2LONG(x), FIX2LONG(y)));
+	return rb_fix_mod_fix(x, y);
     }
     else if (RB_TYPE_P(y, T_BIGNUM)) {
 	x = rb_int2big(FIX2LONG(x));
@@ -3231,10 +3231,10 @@ static VALUE https://github.com/ruby/ruby/blob/trunk/numeric.c#L3231
 fix_divmod(VALUE x, VALUE y)
 {
     if (FIXNUM_P(y)) {
-	long div, mod;
+	VALUE div, mod;
 	if (FIX2LONG(y) == 0) rb_num_zerodiv();
-	rb_divmod(FIX2LONG(x), FIX2LONG(y), &div, &mod);
-	return rb_assoc_new(LONG2NUM(div), LONG2FIX(mod));
+	rb_fix_divmod_fix(x, y, &div, &mod);
+	return rb_assoc_new(div, mod);
     }
     else if (RB_TYPE_P(y, T_BIGNUM)) {
 	x = rb_int2big(FIX2LONG(x));
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 54215)
+++ ChangeLog	(revision 54216)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Mon Mar 21 22:32:50 2016  NARUSE, Yui  <naruse@r...>
+
+	* internal.h (rb_fix_divmod_fix): like r54213, use FIX2NUM only if
+	  x == FIXNUM_MIN && y == -1. This must be a rare case and it is
+	  expected compiler to handle well.
+
 Mon Mar 21 22:15:11 2016  NARUSE, Yui  <naruse@r...>
 
 	* time.c (mod): Add Fixnum case.
Index: insns.def
===================================================================
--- insns.def	(revision 54215)
+++ insns.def	(revision 54216)
@@ -1523,9 +1523,8 @@ opt_div https://github.com/ruby/ruby/blob/trunk/insns.def#L1523
 {
     if (FIXNUM_2_P(recv, obj) &&
 	BASIC_OP_UNREDEFINED_P(BOP_DIV, FIXNUM_REDEFINED_OP_FLAG)) {
-	long y = FIX2LONG(obj);
-	if (y == 0) goto INSN_LABEL(normal_dispatch);
-	val = LONG2NUM(rb_div(FIX2LONG(recv), y));
+	if (FIX2LONG(obj) == 0) goto INSN_LABEL(normal_dispatch);
+	val = rb_fix_div_fix(recv, obj);
     }
     else if (FLONUM_2_P(recv, obj) &&
 	     BASIC_OP_UNREDEFINED_P(BOP_DIV, FLOAT_REDEFINED_OP_FLAG)) {
@@ -1561,9 +1560,8 @@ opt_mod https://github.com/ruby/ruby/blob/trunk/insns.def#L1560
 {
     if (FIXNUM_2_P(recv, obj) &&
 	BASIC_OP_UNREDEFINED_P(BOP_MOD, FIXNUM_REDEFINED_OP_FLAG )) {
-	long y = FIX2LONG(obj);
-	if (y == 0) goto INSN_LABEL(normal_dispatch);
-	val = LONG2FIX(rb_mod(FIX2LONG(recv), y));
+	if (FIX2LONG(obj) == 0) goto INSN_LABEL(normal_dispatch);
+	val = rb_fix_mod_fix(recv, obj);
     }
     else if (FLONUM_2_P(recv, obj) &&
 	     BASIC_OP_UNREDEFINED_P(BOP_MOD, FLOAT_REDEFINED_OP_FLAG)) {
Index: time.c
===================================================================
--- time.c	(revision 54215)
+++ time.c	(revision 54216)
@@ -109,7 +109,7 @@ mod(VALUE x, VALUE y) https://github.com/ruby/ruby/blob/trunk/time.c#L109
 {
     if (FIXNUM_P(y)) {
 	if (FIX2LONG(y) == 0) rb_num_zerodiv();
-	if (FIXNUM_P(x)) return LONG2FIX(rb_mod(FIX2LONG(x), FIX2LONG(y)));
+	if (FIXNUM_P(x)) return rb_fix_mod_fix(x, y);
     }
     if (RB_TYPE_P(x, T_BIGNUM)) return rb_big_modulo(x, y);
     return rb_funcall(x, '%', 1, y);

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/