[pypy-svn] r25356 - pypy/branch/explicit-exceptions/rpython/lltypesystem

[mwh at codespeak.net]

Author: mwh
Date: Wed Apr  5 13:12:58 2006
New Revision: 25356

Modified:
   pypy/branch/explicit-exceptions/rpython/lltypesystem/lloperation.py
Log:
merging of http://codespeak.net/svn/pypy/dist/pypy/rpython/lltypesystem/lloperation.py
revisions 24785 to 25354:

    ------------------------------------------------------------------------
    r25000 | arigo | 2006-03-25 19:19:57 +0100 (Sat, 25 Mar 2006) | 7 lines
    
    Remove some of the division low-level operations.
    Now we only have xxx_floordiv for integer types,
    and float_truediv for floats.  The high-level
    operations are mapped to one of these, possibly
    with conversions (inserted automagically by the
    rtyper).
    
    ------------------------------------------------------------------------


Modified: pypy/branch/explicit-exceptions/rpython/lltypesystem/lloperation.py
==============================================================================
--- pypy/branch/explicit-exceptions/rpython/lltypesystem/lloperation.py	(original)
+++ pypy/branch/explicit-exceptions/rpython/lltypesystem/lloperation.py	Wed Apr  5 13:12:58 2006
@@ -63,7 +63,6 @@
 # XXX Some clean-ups are needed:
 #      * many exception-raising operations are being replaced by calls to helpers
 #      * there are still many _ovf operations that cannot really raise OverflowError
-#      * the div/truediv/floordiv mess needs to be sorted out and reduced
 #      * float_mod vs float_fmod ?
 # Run test_lloperation after changes.  Feel free to clean up LLInterpreter too :-)
 
@@ -96,8 +95,6 @@
     'int_add':              LLOp(canfold=True),
     'int_sub':              LLOp(canfold=True),
     'int_mul':              LLOp(canfold=True),
-    'int_div':              LLOp(canfold=True),
-    'int_truediv':          LLOp(canfold=True),
     'int_floordiv':         LLOp(canfold=True),
     'int_mod':              LLOp(canfold=True),
     'int_lt':               LLOp(canfold=True),
@@ -115,8 +112,6 @@
     'int_add_ovf':          LLOp(canfold=True, canraise=(OverflowError,)),
     'int_sub_ovf':          LLOp(canfold=True, canraise=(OverflowError,)),
     'int_mul_ovf':          LLOp(canfold=True, canraise=(OverflowError,)),
-    'int_div_ovf':          LLOp(canfold=True, canraise=(OverflowError,)),
-    'int_truediv_ovf':      LLOp(canfold=True, canraise=(OverflowError,)),
     'int_floordiv_ovf':     LLOp(canfold=True, canraise=(OverflowError,)),
     'int_mod_ovf':          LLOp(canfold=True, canraise=(OverflowError,)),
     'int_lt_ovf':           LLOp(canfold=True, canraise=(OverflowError,)),
@@ -145,10 +140,6 @@
     'uint_add':             LLOp(canfold=True),
     'uint_sub':             LLOp(canfold=True),
     'uint_mul':             LLOp(canfold=True),
-    'uint_div':             LLOp(canfold=True),
-    'uint_div_zer':         LLOp(canfold=True, canraise=(ZeroDivisionError,)),
-    'uint_truediv':         LLOp(canfold=True),
-    'uint_truediv_zer':     LLOp(canfold=True, canraise=(ZeroDivisionError,)),
     'uint_floordiv':        LLOp(canfold=True),
     'uint_floordiv_zer':    LLOp(canfold=True, canraise=(ZeroDivisionError,)),
     'uint_mod':             LLOp(canfold=True),
@@ -171,9 +162,7 @@
     'float_add':            LLOp(canfold=True),
     'float_sub':            LLOp(canfold=True),
     'float_mul':            LLOp(canfold=True),
-    'float_div':            LLOp(canfold=True),
     'float_truediv':        LLOp(canfold=True),
-    'float_floordiv':       LLOp(canfold=True),
     'float_mod':            LLOp(canfold=True),
     'float_lt':             LLOp(canfold=True),
     'float_le':             LLOp(canfold=True),
@@ -193,8 +182,6 @@
     'llong_add':            LLOp(canfold=True),
     'llong_sub':            LLOp(canfold=True),
     'llong_mul':            LLOp(canfold=True),
-    'llong_div':            LLOp(canfold=True),
-    'llong_truediv':        LLOp(canfold=True),
     'llong_floordiv':       LLOp(canfold=True),
     'llong_mod':            LLOp(canfold=True),
     'llong_lt':             LLOp(canfold=True),
@@ -217,8 +204,6 @@
     'ullong_add':           LLOp(canfold=True),
     'ullong_sub':           LLOp(canfold=True),
     'ullong_mul':           LLOp(canfold=True),
-    'ullong_div':           LLOp(canfold=True),
-    'ullong_truediv':       LLOp(canfold=True),
     'ullong_floordiv':      LLOp(canfold=True),
     'ullong_mod':           LLOp(canfold=True),
     'ullong_lt':            LLOp(canfold=True),