Replaced more Fixnum, Bignum primitives.

rubinius · Jan 6, 2020 · d1b029c · d1b029c
1 parent a3e0c7d
commit d1b029c
Show file tree

Hide file tree

Showing 12 changed files with 279 additions and 167 deletions.
diff --git a/core/bignum.rb b/core/bignum.rb
@@ -13,11 +13,6 @@ def -@
 
   # binary math operators
 
-  def +(o)
-    Rubinius.primitive :bignum_add
-    redo_coerced :+, o
-  end
-
   def -(o)
     Rubinius.primitive :bignum_sub
     redo_coerced :-, o
@@ -99,26 +94,6 @@ def >>(other)
 
   # comparison operators
 
-  def <(other)
-    Rubinius.primitive :bignum_lt
-    redo_compare :<, other
-  end
-
-  def <=(other)
-    Rubinius.primitive :bignum_le
-    redo_compare :<=, other
-  end
-
-  def >(other)
-    Rubinius.primitive :bignum_gt
-    redo_compare :>, other
-  end
-
-  def >=(other)
-    Rubinius.primitive :bignum_ge
-    redo_compare :>=, other
-  end
-
   def <=>(other)
     Rubinius.primitive :bignum_compare
 

diff --git a/core/fixnum.rb b/core/fixnum.rb
@@ -75,32 +75,6 @@ def -@
 
   # binary math operators
 
-  def +(o)
-    Rubinius.asm(o) do |o|
-      add = new_label
-      done = new_label
-
-      r0 = new_register
-      r1 = new_register
-
-      r_load_m_binops r0, r1
-
-      b_if_int r0, r1, add
-      goto done
-
-      add.set!
-      n_iadd_o r0, r0, r1
-      r_ret r0
-
-      done.set!
-
-      # TODO: teach the bytecode compiler better
-      push_true
-    end
-
-    redo_coerced :+, o
-  end
-
   def -(o)
     Rubinius.asm(o) do |o|
       sub = new_label
@@ -229,122 +203,6 @@ def <=>(other)
     end
   end
 
-  def <(other)
-    Rubinius.asm do
-      cmp = new_label
-      done = new_label
-
-      r0 = new_register
-      r1 = new_register
-
-      r_load_m_binops r0, r1
-
-      b_if_int r0, r1, cmp
-      goto done
-
-      cmp.set!
-      n_ilt r0, r0, r1
-
-      r_load_bool r0, r0
-      r_ret r0
-
-      done.set!
-
-      # TODO: teach the bytecode compiler better
-      push_true
-    end
-
-    b, a = math_coerce other, :compare_error
-    a < b
-  end
-
-  def <=(other)
-    Rubinius.asm(o) do |o|
-      cmp = new_label
-      done = new_label
-
-      r0 = new_register
-      r1 = new_register
-
-      r_load_m_binops r0, r1
-
-      b_if_int r0, r1, cmp
-      goto done
-
-      cmp.set!
-      n_ile r0, r0, r1
-
-      r_load_bool r0, r0
-      r_ret r0
-
-      done.set!
-
-      # TODO: teach the bytecode compiler better
-      push_true
-    end
-
-    b, a = math_coerce other, :compare_error
-    a <= b
-  end
-
-  def >(other)
-    Rubinius.asm(o) do |o|
-      cmp = new_label
-      done = new_label
-
-      r0 = new_register
-      r1 = new_register
-
-      r_load_m_binops r0, r1
-
-      b_if_int r0, r1, cmp
-      goto done
-
-      cmp.set!
-      n_igt r0, r0, r1
-
-      r_load_bool r0, r0
-      r_ret r0
-
-      done.set!
-
-      # TODO: teach the bytecode compiler better
-      push_true
-    end
-
-    b, a = math_coerce other, :compare_error
-    a > b
-  end
-
-  def >=(other)
-    Rubinius.asm(o) do |o|
-      cmp = new_label
-      done = new_label
-
-      r0 = new_register
-      r1 = new_register
-
-      r_load_m_binops r0, r1
-
-      b_if_int r0, r1, cmp
-      goto done
-
-      cmp.set!
-      n_ige r0, r0, r1
-
-      r_load_bool r0, r0
-      r_ret r0
-
-      done.set!
-
-      # TODO: teach the bytecode compiler better
-      push_true
-    end
-
-    b, a = math_coerce other, :compare_error
-    a >= b
-  end
-
   # predicates
 
   def zero?