aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--include/ruby/ruby.h10
2 files changed, 11 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index e203141bff..192b99f647 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Aug 27 18:19:36 2012 Koichi Sasada <ko1@atdot.net>
+
+ * include/ruby/ruby.h (rb_float_value): optimize it.
+ This technique was pointed by shinichiro.hamaji
+ <http://shinh.skr.jp/m/?date=20120825#p02>.
+
Mon Aug 27 15:08:25 2012 Yuki Yugui Sonoda <yugui@google.com>
* common.mk (vm_trace.o): Added a missing dependency.
diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h
index 3905b3294a..b8b2267006 100644
--- a/include/ruby/ruby.h
+++ b/include/ruby/ruby.h
@@ -733,10 +733,7 @@ static inline double
rb_float_value(VALUE v)
{
if (FLONUM_P(v)) {
- if (v == (VALUE)0x8000000000000002) {
- return 0.0;
- }
- else {
+ if (v != (VALUE)0x8000000000000002) { /* LIKELY */
union {
double d;
VALUE v;
@@ -746,9 +743,12 @@ rb_float_value(VALUE v)
/* e: xx1... -> 011... */
/* xx0... -> 100... */
/* ^b63 */
- t.v = RUBY_BIT_ROTR(((b63 ^ 1) << 1) | b63 | (v & ~0x03), 3);
+ t.v = RUBY_BIT_ROTR(2 - b63 | (v & ~0x03), 3);
return t.d;
}
+ else {
+ return 0.0;
+ }
}
else {
return ((struct RFloat *)v)->float_value;