Tue Oct 31 17:22:41 CET 2006

Author: cfbolz
Date: Tue Oct 31 17:22:11 2006
New Revision: 33968

Added:
   pypy/dist/pypy/rlib/rarithmetic.py
      - copied unchanged from r33917, pypy/dist/pypy/rpython/rarithmetic.py
   pypy/dist/pypy/rlib/test/test_rarithmetic.py
      - copied, changed from r33917, pypy/dist/pypy/rpython/test/test_rarithmetic.py
Removed:
   pypy/dist/pypy/rpython/rarithmetic.py
   pypy/dist/pypy/rpython/test/test_rarithmetic.py
Modified:
   pypy/dist/pypy/annotation/binaryop.py
   pypy/dist/pypy/annotation/bookkeeper.py
   pypy/dist/pypy/annotation/builtin.py
   pypy/dist/pypy/annotation/model.py
   pypy/dist/pypy/annotation/test/test_annrpython.py
   pypy/dist/pypy/annotation/test/test_model.py
   pypy/dist/pypy/bin/translatorshell.py
   pypy/dist/pypy/interpreter/miscutils.py
   pypy/dist/pypy/interpreter/pycode.py
   pypy/dist/pypy/interpreter/pyframe.py
   pypy/dist/pypy/interpreter/pyopcode.py
   pypy/dist/pypy/interpreter/typedef.py
   pypy/dist/pypy/module/__builtin__/functional.py
   pypy/dist/pypy/module/__builtin__/importing.py
   pypy/dist/pypy/module/__builtin__/special.py
   pypy/dist/pypy/module/_random/interp_random.py
   pypy/dist/pypy/module/_socket/interp_socket.py
   pypy/dist/pypy/module/_sre/interp_sre.py
   pypy/dist/pypy/module/_stackless/interp_stackless.py
   pypy/dist/pypy/module/_stackless/stackless_flags.py
   pypy/dist/pypy/module/marshal/interp_marshal.py
   pypy/dist/pypy/module/posix/interp_posix.py
   pypy/dist/pypy/module/rctime/interp_time.py
   pypy/dist/pypy/module/wraptest/interp_wraptest.py
   pypy/dist/pypy/objspace/cpy/objspace.py
   pypy/dist/pypy/objspace/cpy/test/test_objspace.py
   pypy/dist/pypy/objspace/flow/objspace.py
   pypy/dist/pypy/objspace/flow/operation.py
   pypy/dist/pypy/objspace/std/floatobject.py
   pypy/dist/pypy/objspace/std/intobject.py
   pypy/dist/pypy/objspace/std/listsort.py
   pypy/dist/pypy/objspace/std/marshal_impl.py
   pypy/dist/pypy/objspace/std/objspace.py
   pypy/dist/pypy/objspace/std/setobject.py
   pypy/dist/pypy/objspace/std/smallintobject.py
   pypy/dist/pypy/objspace/std/stringobject.py
   pypy/dist/pypy/objspace/std/strutil.py
   pypy/dist/pypy/objspace/std/test/test_intobject.py
   pypy/dist/pypy/objspace/std/test/test_longobject.py
   pypy/dist/pypy/objspace/std/test/test_smallintobject.py
   pypy/dist/pypy/objspace/std/tupleobject.py
   pypy/dist/pypy/objspace/std/unicodeobject.py
   pypy/dist/pypy/objspace/trace.py
   pypy/dist/pypy/rlib/rlong.py
   pypy/dist/pypy/rlib/rrandom.py
   pypy/dist/pypy/rlib/test/test_rlong.py
   pypy/dist/pypy/rpython/extfunctable.py
   pypy/dist/pypy/rpython/llinterp.py
   pypy/dist/pypy/rpython/lltypesystem/ll_str.py
   pypy/dist/pypy/rpython/lltypesystem/lltype.py
   pypy/dist/pypy/rpython/lltypesystem/module/ll_os.py
   pypy/dist/pypy/rpython/lltypesystem/module/ll_strtod.py
   pypy/dist/pypy/rpython/lltypesystem/opimpl.py
   pypy/dist/pypy/rpython/lltypesystem/rclass.py
   pypy/dist/pypy/rpython/lltypesystem/rdict.py
   pypy/dist/pypy/rpython/lltypesystem/rstr.py
   pypy/dist/pypy/rpython/memory/gc.py
   pypy/dist/pypy/rpython/memory/gctransform/framework.py
   pypy/dist/pypy/rpython/memory/gctransform/refcounting.py
   pypy/dist/pypy/rpython/memory/gctransform/transform.py
   pypy/dist/pypy/rpython/memory/lladdress.py
   pypy/dist/pypy/rpython/memory/test/test_llinterpsim.py
   pypy/dist/pypy/rpython/module/ll_os.py
   pypy/dist/pypy/rpython/module/ll_strtod.py
   pypy/dist/pypy/rpython/ootypesystem/module/ll_os.py
   pypy/dist/pypy/rpython/ootypesystem/module/ll_strtod.py
   pypy/dist/pypy/rpython/ootypesystem/ootype.py
   pypy/dist/pypy/rpython/ootypesystem/rdict.py
   pypy/dist/pypy/rpython/raisingops/raisingops.py
   pypy/dist/pypy/rpython/rbuiltin.py
   pypy/dist/pypy/rpython/rctypes/rcarithmetic.py
   pypy/dist/pypy/rpython/rctypes/test/test_rcarithmetic.py
   pypy/dist/pypy/rpython/rctypes/test/test_rprimitive.py
   pypy/dist/pypy/rpython/rdict.py
   pypy/dist/pypy/rpython/rint.py
   pypy/dist/pypy/rpython/rtuple.py
   pypy/dist/pypy/rpython/test/test_llann.py
   pypy/dist/pypy/rpython/test/test_llinterp.py
   pypy/dist/pypy/rpython/test/test_rbuiltin.py
   pypy/dist/pypy/rpython/test/test_rclass.py
   pypy/dist/pypy/rpython/test/test_rint.py
   pypy/dist/pypy/rpython/test/test_rrange.py
   pypy/dist/pypy/translator/asm/test/test_asm.py
   pypy/dist/pypy/translator/backendopt/test/test_all.py
   pypy/dist/pypy/translator/backendopt/test/test_inline.py
   pypy/dist/pypy/translator/backendopt/test/test_merge_if_blocks.py
   pypy/dist/pypy/translator/c/exceptiontransform.py
   pypy/dist/pypy/translator/c/pyobj.py
   pypy/dist/pypy/translator/c/test/test_backendoptimized.py
   pypy/dist/pypy/translator/c/test/test_extfunc.py
   pypy/dist/pypy/translator/c/test/test_typed.py
   pypy/dist/pypy/translator/cli/test/test_cast.py
   pypy/dist/pypy/translator/cli/test/test_op.py
   pypy/dist/pypy/translator/cli/test/test_overflow.py
   pypy/dist/pypy/translator/js/test/test_exc_operation.py
   pypy/dist/pypy/translator/js/test/test_exception.py
   pypy/dist/pypy/translator/js/test/test_genllvm.py
   pypy/dist/pypy/translator/js/test/test_typed.py
   pypy/dist/pypy/translator/llvm/test/test_exc_operation.py
   pypy/dist/pypy/translator/llvm/test/test_exception.py
   pypy/dist/pypy/translator/llvm/test/test_extfunc.py
   pypy/dist/pypy/translator/llvm/test/test_genllvm.py
   pypy/dist/pypy/translator/llvm/test/test_lltype.py
   pypy/dist/pypy/translator/llvm/test/test_typed.py
   pypy/dist/pypy/translator/oosupport/test_template/operations.py
   pypy/dist/pypy/translator/simplify.py
   pypy/dist/pypy/translator/squeak/opformatter.py
   pypy/dist/pypy/translator/squeak/test/test_llops.py
   pypy/dist/pypy/translator/stackless/code.py
   pypy/dist/pypy/translator/stackless/transform.py
   pypy/dist/pypy/translator/test/snippet.py
Log:
move rarithmetic.py to rlib. puh. hope I didn't break anything


Modified: pypy/dist/pypy/annotation/binaryop.py
==============================================================================

--- pypy/dist/pypy/annotation/binaryop.py	(original)
+++ pypy/dist/pypy/annotation/binaryop.py	Tue Oct 31 17:22:11 2006
@@ -21,7 +21,8 @@
 from pypy.annotation.bookkeeper import getbookkeeper
 from pypy.objspace.flow.model import Variable
 from pypy.annotation.listdef import ListDef
-from pypy.rpython import extregistry, rarithmetic
+from pypy.rlib import rarithmetic
+from pypy.rpython import extregistry
 
 # convenience only!
 def immutablevalue(x):

Modified: pypy/dist/pypy/annotation/bookkeeper.py
==============================================================================
--- pypy/dist/pypy/annotation/bookkeeper.py	(original)
+++ pypy/dist/pypy/annotation/bookkeeper.py	Tue Oct 31 17:22:11 2006
@@ -17,8 +17,8 @@
 from pypy.annotation.dictdef import DictDef, MOST_GENERAL_DICTDEF
 from pypy.annotation import description
 from pypy.interpreter.argument import Arguments, ArgErr
-from pypy.rpython.rarithmetic import r_int, r_uint, r_ulonglong, r_longlong
-from pypy.rpython.rarithmetic import base_int
+from pypy.rlib.rarithmetic import r_int, r_uint, r_ulonglong, r_longlong
+from pypy.rlib.rarithmetic import base_int
 from pypy.rpython.objectmodel import r_dict, Symbolic
 from pypy.tool.algo.unionfind import UnionFind
 from pypy.rpython.lltypesystem import lltype, llmemory

Modified: pypy/dist/pypy/annotation/builtin.py
==============================================================================
--- pypy/dist/pypy/annotation/builtin.py	(original)
+++ pypy/dist/pypy/annotation/builtin.py	Tue Oct 31 17:22:11 2006
@@ -15,7 +15,7 @@
 from pypy.annotation.bookkeeper import getbookkeeper
 from pypy.annotation import description
 from pypy.objspace.flow.model import Constant
-import pypy.rpython.rarithmetic
+import pypy.rlib.rarithmetic
 import pypy.rpython.objectmodel
 import pypy.rpython.rstack
 
@@ -130,7 +130,7 @@
     r = SomeBool() 
     if s_type.is_constant():
         typ = s_type.const
-        if issubclass(typ, pypy.rpython.rarithmetic.base_int):
+        if issubclass(typ, pypy.rlib.rarithmetic.base_int):
             r.const = issubclass(s_obj.knowntype, typ)
         else:
             if typ == long:
@@ -353,9 +353,9 @@
         original = getattr(__builtin__, name[8:])
         BUILTIN_ANALYZERS[original] = value
 
-##BUILTIN_ANALYZERS[pypy.rpython.rarithmetic.ovfcheck] = rarith_ovfcheck
-##BUILTIN_ANALYZERS[pypy.rpython.rarithmetic.ovfcheck_lshift] = rarith_ovfcheck_lshift
-BUILTIN_ANALYZERS[pypy.rpython.rarithmetic.intmask] = rarith_intmask
+##BUILTIN_ANALYZERS[pypy.rlib.rarithmetic.ovfcheck] = rarith_ovfcheck
+##BUILTIN_ANALYZERS[pypy.rlib.rarithmetic.ovfcheck_lshift] = rarith_ovfcheck_lshift
+BUILTIN_ANALYZERS[pypy.rlib.rarithmetic.intmask] = rarith_intmask
 BUILTIN_ANALYZERS[pypy.rpython.objectmodel.instantiate] = robjmodel_instantiate
 BUILTIN_ANALYZERS[pypy.rpython.objectmodel.we_are_translated] = (
     robjmodel_we_are_translated)
@@ -391,7 +391,7 @@
 
 def malloc(s_T, s_n=None, s_flavor=None, s_extra_args=None, s_zero=None):
     assert (s_n is None or s_n.knowntype == int
-            or issubclass(s_n.knowntype, pypy.rpython.rarithmetic.base_int))
+            or issubclass(s_n.knowntype, pypy.rlib.rarithmetic.base_int))
     assert s_T.is_constant()
     if s_n is not None:
         n = 1

Modified: pypy/dist/pypy/annotation/model.py
==============================================================================
--- pypy/dist/pypy/annotation/model.py	(original)
+++ pypy/dist/pypy/annotation/model.py	Tue Oct 31 17:22:11 2006
@@ -32,7 +32,7 @@
 import pypy.tool.instancemethod
 from pypy.annotation.pairtype import pair, extendabletype
 from pypy.tool.tls import tlsobject
-from pypy.rpython.rarithmetic import r_uint, r_longlong, r_ulonglong, base_int
+from pypy.rlib.rarithmetic import r_uint, r_longlong, r_ulonglong, base_int
 import inspect
 from sys import maxint
 
@@ -171,7 +171,7 @@
         self.knowntype = knowntype
         unsigned = self.knowntype(-1) > 0
         self.nonneg = unsigned or nonneg
-        self.unsigned = unsigned  # pypy.rpython.rarithmetic.r_uint
+        self.unsigned = unsigned  # pypy.rlib.rarithmetic.r_uint
 
 class SomeBool(SomeInteger):
     "Stands for true or false."

Modified: pypy/dist/pypy/annotation/test/test_annrpython.py
==============================================================================
--- pypy/dist/pypy/annotation/test/test_annrpython.py	(original)
+++ pypy/dist/pypy/annotation/test/test_annrpython.py	Tue Oct 31 17:22:11 2006
@@ -10,7 +10,7 @@
 from pypy.annotation.listdef import ListDef
 from pypy.annotation.dictdef import DictDef
 from pypy.objspace.flow.model import *
-from pypy.rpython.rarithmetic import r_uint, base_int, r_longlong, r_ulonglong
+from pypy.rlib.rarithmetic import r_uint, base_int, r_longlong, r_ulonglong
 from pypy.rpython import objectmodel
 from pypy.objspace.flow import FlowObjSpace
 

Modified: pypy/dist/pypy/annotation/test/test_model.py
==============================================================================
--- pypy/dist/pypy/annotation/test/test_model.py	(original)
+++ pypy/dist/pypy/annotation/test/test_model.py	Tue Oct 31 17:22:11 2006
@@ -128,7 +128,7 @@
     assert isinstance(s_p, SomeOOInstance) and s_p.ootype == C
 
 def test_annotation_to_lltype():
-    from pypy.rpython.rarithmetic import r_uint
+    from pypy.rlib.rarithmetic import r_uint
     s_i = SomeInteger()
     s_pos = SomeInteger(nonneg=True)
     s_1 = SomeInteger(nonneg=True); s_1.const = 1

Modified: pypy/dist/pypy/bin/translatorshell.py
==============================================================================
--- pypy/dist/pypy/bin/translatorshell.py	(original)
+++ pypy/dist/pypy/bin/translatorshell.py	Tue Oct 31 17:22:11 2006
@@ -26,7 +26,7 @@
 import autopath, os, sys
 from pypy.translator.interactive import Translation
 from pypy.rpython.rtyper import *
-from pypy.rpython.rarithmetic import *
+from pypy.rlib.rarithmetic import *
 
 import py
 

Modified: pypy/dist/pypy/interpreter/miscutils.py
==============================================================================
--- pypy/dist/pypy/interpreter/miscutils.py	(original)
+++ pypy/dist/pypy/interpreter/miscutils.py	Tue Oct 31 17:22:11 2006
@@ -4,7 +4,7 @@
 
 import types
 
-from pypy.rpython.rarithmetic import r_uint
+from pypy.rlib.rarithmetic import r_uint
 
 class RootStack:
     pass

Modified: pypy/dist/pypy/interpreter/pycode.py
==============================================================================
--- pypy/dist/pypy/interpreter/pycode.py	(original)
+++ pypy/dist/pypy/interpreter/pycode.py	Tue Oct 31 17:22:11 2006
@@ -10,7 +10,7 @@
 from pypy.interpreter.error import OperationError
 from pypy.interpreter.gateway import NoneNotWrapped 
 from pypy.interpreter.baseobjspace import ObjSpace, W_Root 
-from pypy.rpython.rarithmetic import intmask
+from pypy.rlib.rarithmetic import intmask
 
 # helper
 

Modified: pypy/dist/pypy/interpreter/pyframe.py
==============================================================================
--- pypy/dist/pypy/interpreter/pyframe.py	(original)
+++ pypy/dist/pypy/interpreter/pyframe.py	Tue Oct 31 17:22:11 2006
@@ -5,7 +5,7 @@
 from pypy.interpreter.miscutils import Stack, FixedStack
 from pypy.interpreter.error import OperationError
 from pypy.interpreter import pytraceback
-from pypy.rpython.rarithmetic import r_uint, intmask
+from pypy.rlib.rarithmetic import r_uint, intmask
 import opcode
 from pypy.rpython.objectmodel import we_are_translated, instantiate
 from pypy.rpython import rstack # for resume points

Modified: pypy/dist/pypy/interpreter/pyopcode.py
==============================================================================
--- pypy/dist/pypy/interpreter/pyopcode.py	(original)
+++ pypy/dist/pypy/interpreter/pyopcode.py	Tue Oct 31 17:22:11 2006
@@ -14,7 +14,7 @@
 from pypy.interpreter.opcodeorder import opcodeorder
 from pypy.tool.sourcetools import func_with_new_name
 from pypy.rpython.objectmodel import we_are_translated
-from pypy.rpython.rarithmetic import intmask
+from pypy.rlib.rarithmetic import intmask
 from pypy.tool import stdlib_opcode as pythonopcode
 from pypy.rpython import rstack # for resume points
 

Modified: pypy/dist/pypy/interpreter/typedef.py
==============================================================================
--- pypy/dist/pypy/interpreter/typedef.py	(original)
+++ pypy/dist/pypy/interpreter/typedef.py	Tue Oct 31 17:22:11 2006
@@ -9,7 +9,7 @@
 from pypy.interpreter.error import OperationError
 from pypy.tool.sourcetools import compile2, func_with_new_name
 from pypy.rpython.objectmodel import instantiate
-from pypy.rpython.rarithmetic import intmask
+from pypy.rlib.rarithmetic import intmask
 
 class TypeDef:
     def __init__(self, __name, __base=None, **rawdict):

Modified: pypy/dist/pypy/module/__builtin__/functional.py
==============================================================================
--- pypy/dist/pypy/module/__builtin__/functional.py	(original)
+++ pypy/dist/pypy/module/__builtin__/functional.py	Tue Oct 31 17:22:11 2006
@@ -14,7 +14,7 @@
 
 from pypy.interpreter.error import OperationError
 from pypy.interpreter.gateway import ObjSpace, W_Root, NoneNotWrapped, applevel
-from pypy.rpython.rarithmetic import r_uint, intmask
+from pypy.rlib.rarithmetic import r_uint, intmask
 from pypy.module.__builtin__.app_functional import range as app_range
 from inspect import getsource, getfile
 

Modified: pypy/dist/pypy/module/__builtin__/importing.py
==============================================================================
--- pypy/dist/pypy/module/__builtin__/importing.py	(original)
+++ pypy/dist/pypy/module/__builtin__/importing.py	Tue Oct 31 17:22:11 2006
@@ -10,7 +10,7 @@
 from pypy.interpreter.baseobjspace import W_Root, ObjSpace
 from pypy.interpreter.eval import Code
 from pypy.lib._osfilewrapper import OsFileWrapper
-from pypy.rpython.rarithmetic import intmask
+from pypy.rlib.rarithmetic import intmask
 
 # XXX this uses the os.path module at interp-level, which means
 # XXX that translate_pypy will produce a translated version of

Modified: pypy/dist/pypy/module/__builtin__/special.py
==============================================================================
--- pypy/dist/pypy/module/__builtin__/special.py	(original)
+++ pypy/dist/pypy/module/__builtin__/special.py	Tue Oct 31 17:22:11 2006
@@ -1,6 +1,6 @@
 from pypy.interpreter import gateway
 from pypy.interpreter.error import OperationError
-from pypy.rpython import rarithmetic
+from pypy.rlib import rarithmetic
 
 def _isfake(space, w_obj): 
     return space.wrap(bool(w_obj.typedef.fakedcpytype))

Modified: pypy/dist/pypy/module/_random/interp_random.py
==============================================================================
--- pypy/dist/pypy/module/_random/interp_random.py	(original)
+++ pypy/dist/pypy/module/_random/interp_random.py	Tue Oct 31 17:22:11 2006
@@ -2,7 +2,7 @@
 from pypy.interpreter.typedef import TypeDef
 from pypy.interpreter.gateway import ObjSpace, W_Root, NoneNotWrapped, interp2app
 from pypy.interpreter.baseobjspace import Wrappable
-from pypy.rpython.rarithmetic import r_uint, intmask
+from pypy.rlib.rarithmetic import r_uint, intmask
 from pypy.rlib import rrandom
 
 import time

Modified: pypy/dist/pypy/module/_socket/interp_socket.py
==============================================================================
--- pypy/dist/pypy/module/_socket/interp_socket.py	(original)
+++ pypy/dist/pypy/module/_socket/interp_socket.py	Tue Oct 31 17:22:11 2006
@@ -8,7 +8,7 @@
 from pypy.module.rsocket import ctypes_socket as _c
 import ctypes
 from pypy.rpython.rctypes import implementation as rctypes_implemetation
-from pypy.rpython.rarithmetic import intmask
+from pypy.rlib.rarithmetic import intmask
 import errno
 
 IPV4_ADDRESS_SIZE = 4

Modified: pypy/dist/pypy/module/_sre/interp_sre.py
==============================================================================
--- pypy/dist/pypy/module/_sre/interp_sre.py	(original)
+++ pypy/dist/pypy/module/_sre/interp_sre.py	Tue Oct 31 17:22:11 2006
@@ -3,7 +3,7 @@
 from pypy.interpreter.typedef import interp_attrproperty, interp_attrproperty_w
 from pypy.interpreter.gateway import interp2app, ObjSpace, W_Root
 from pypy.interpreter.error import OperationError
-from pypy.rpython.rarithmetic import intmask
+from pypy.rlib.rarithmetic import intmask
 import sys
 
 #### Constants and exposed functions

Modified: pypy/dist/pypy/module/_stackless/interp_stackless.py
==============================================================================
--- pypy/dist/pypy/module/_stackless/interp_stackless.py	(original)
+++ pypy/dist/pypy/module/_stackless/interp_stackless.py	Tue Oct 31 17:22:11 2006
@@ -3,7 +3,7 @@
 from pypy.interpreter.typedef import interp_attrproperty, interp_attrproperty_w
 from pypy.interpreter.gateway import interp2app, ObjSpace, W_Root
 from pypy.interpreter.error import OperationError
-from pypy.rpython.rarithmetic import intmask
+from pypy.rlib.rarithmetic import intmask
 import os
 
 

Modified: pypy/dist/pypy/module/_stackless/stackless_flags.py
==============================================================================
--- pypy/dist/pypy/module/_stackless/stackless_flags.py	(original)
+++ pypy/dist/pypy/module/_stackless/stackless_flags.py	Tue Oct 31 17:22:11 2006
@@ -67,7 +67,7 @@
 } PyTaskletFlagStruc;
 """
 
-from pypy.rpython.rarithmetic import LONG_BIT, intmask
+from pypy.rlib.rarithmetic import LONG_BIT, intmask
 
 class BitSetDef(object):
     __slots__ = "_names __dict__ _attrname".split()
@@ -198,4 +198,4 @@
 
 if __name__ == '__main__':
     # paste this into the file
-    print gen_code()
\ No newline at end of file
+    print gen_code()

Modified: pypy/dist/pypy/module/marshal/interp_marshal.py
==============================================================================
--- pypy/dist/pypy/module/marshal/interp_marshal.py	(original)
+++ pypy/dist/pypy/module/marshal/interp_marshal.py	Tue Oct 31 17:22:11 2006
@@ -1,6 +1,6 @@
 from pypy.interpreter.baseobjspace import ObjSpace
 from pypy.interpreter.error import OperationError
-from pypy.rpython.rarithmetic import intmask
+from pypy.rlib.rarithmetic import intmask
 import sys
 
 # Py_MARSHAL_VERSION = 2

Modified: pypy/dist/pypy/module/posix/interp_posix.py
==============================================================================
--- pypy/dist/pypy/module/posix/interp_posix.py	(original)
+++ pypy/dist/pypy/module/posix/interp_posix.py	Tue Oct 31 17:22:11 2006
@@ -1,5 +1,5 @@
 from pypy.interpreter.baseobjspace import ObjSpace
-from pypy.rpython.rarithmetic import intmask
+from pypy.rlib.rarithmetic import intmask
 from pypy.rlib import ros
 from pypy.interpreter.error import OperationError
 

Modified: pypy/dist/pypy/module/rctime/interp_time.py
==============================================================================
--- pypy/dist/pypy/module/rctime/interp_time.py	(original)
+++ pypy/dist/pypy/module/rctime/interp_time.py	Tue Oct 31 17:22:11 2006
@@ -4,7 +4,7 @@
 from pypy.rpython.rctypes.aerrno import geterrno
 from pypy.interpreter.error import OperationError
 from pypy.interpreter.baseobjspace import W_Root, ObjSpace
-from pypy.rpython.rarithmetic import ovfcheck_float_to_int
+from pypy.rlib.rarithmetic import ovfcheck_float_to_int
 from ctypes import *
 import math
 import os

Modified: pypy/dist/pypy/module/wraptest/interp_wraptest.py
==============================================================================
--- pypy/dist/pypy/module/wraptest/interp_wraptest.py	(original)
+++ pypy/dist/pypy/module/wraptest/interp_wraptest.py	Tue Oct 31 17:22:11 2006
@@ -1,4 +1,4 @@
-from pypy.rpython.rarithmetic import r_longlong
+from pypy.rlib.rarithmetic import r_longlong
 from pypy.interpreter.gateway import interp2app, W_Root
 from pypy.interpreter.baseobjspace import ObjSpace, Wrappable
 from pypy.interpreter.typedef import TypeDef, interp_attrproperty, GetSetProperty

Modified: pypy/dist/pypy/objspace/cpy/objspace.py
==============================================================================
--- pypy/dist/pypy/objspace/cpy/objspace.py	(original)
+++ pypy/dist/pypy/objspace/cpy/objspace.py	Tue Oct 31 17:22:11 2006
@@ -7,7 +7,7 @@
 from pypy.interpreter.error import OperationError
 from pypy.interpreter.function import Function
 from pypy.interpreter.typedef import GetSetProperty
-from pypy.rpython.rarithmetic import r_uint, r_longlong, r_ulonglong
+from pypy.rlib.rarithmetic import r_uint, r_longlong, r_ulonglong
 from pypy.rpython.objectmodel import we_are_translated, instantiate
 
 

Modified: pypy/dist/pypy/objspace/cpy/test/test_objspace.py
==============================================================================
--- pypy/dist/pypy/objspace/cpy/test/test_objspace.py	(original)
+++ pypy/dist/pypy/objspace/cpy/test/test_objspace.py	Tue Oct 31 17:22:11 2006
@@ -1,6 +1,6 @@
 from pypy.objspace.cpy.objspace import CPyObjSpace
 from pypy.tool.pytest.appsupport import raises_w
-from pypy.rpython.rarithmetic import r_longlong, r_ulonglong
+from pypy.rlib.rarithmetic import r_longlong, r_ulonglong
 
 def test_simple():
     space = CPyObjSpace()

Modified: pypy/dist/pypy/objspace/flow/objspace.py
==============================================================================
--- pypy/dist/pypy/objspace/flow/objspace.py	(original)
+++ pypy/dist/pypy/objspace/flow/objspace.py	Tue Oct 31 17:22:11 2006
@@ -124,7 +124,7 @@
 
     def uint_w(self, w_obj):
         if isinstance(w_obj, Constant):
-            from pypy.rpython.rarithmetic import r_uint
+            from pypy.rlib.rarithmetic import r_uint
             val = w_obj.value
             if type(val) is not r_uint:
                 raise TypeError("expected unsigned: " + repr(w_obj))

Modified: pypy/dist/pypy/objspace/flow/operation.py
==============================================================================
--- pypy/dist/pypy/objspace/flow/operation.py	(original)
+++ pypy/dist/pypy/objspace/flow/operation.py	Tue Oct 31 17:22:11 2006
@@ -5,7 +5,7 @@
 from pypy.interpreter.baseobjspace import ObjSpace
 import operator, types, __future__
 from pypy.tool.sourcetools import compile2
-from pypy.rpython.rarithmetic import ovfcheck, ovfcheck_lshift
+from pypy.rlib.rarithmetic import ovfcheck, ovfcheck_lshift
 
 FunctionByName = {}   # dict {"operation_name": <built-in function>}
 OperationName  = {}   # dict {<built-in function>: "operation_name"}

Modified: pypy/dist/pypy/objspace/std/floatobject.py
==============================================================================
--- pypy/dist/pypy/objspace/std/floatobject.py	(original)
+++ pypy/dist/pypy/objspace/std/floatobject.py	Tue Oct 31 17:22:11 2006
@@ -2,7 +2,7 @@
 from pypy.interpreter import gateway
 from pypy.objspace.std.noneobject import W_NoneObject
 from pypy.objspace.std.longobject import W_LongObject
-from pypy.rpython.rarithmetic import ovfcheck_float_to_int, intmask, isinf
+from pypy.rlib.rarithmetic import ovfcheck_float_to_int, intmask, isinf
 
 ##############################################################
 # for the time being, all calls that are made to some external

Modified: pypy/dist/pypy/objspace/std/intobject.py
==============================================================================
--- pypy/dist/pypy/objspace/std/intobject.py	(original)
+++ pypy/dist/pypy/objspace/std/intobject.py	Tue Oct 31 17:22:11 2006
@@ -1,6 +1,6 @@
 from pypy.objspace.std.objspace import *
 from pypy.objspace.std.noneobject import W_NoneObject
-from pypy.rpython.rarithmetic import ovfcheck, ovfcheck_lshift, LONG_BIT, r_uint
+from pypy.rlib.rarithmetic import ovfcheck, ovfcheck_lshift, LONG_BIT, r_uint
 from pypy.objspace.std.inttype import wrapint
 
 """

Modified: pypy/dist/pypy/objspace/std/listsort.py
==============================================================================
--- pypy/dist/pypy/objspace/std/listsort.py	(original)
+++ pypy/dist/pypy/objspace/std/listsort.py	Tue Oct 31 17:22:11 2006
@@ -1,4 +1,4 @@
-from pypy.rpython.rarithmetic import ovfcheck, ovfcheck_lshift
+from pypy.rlib.rarithmetic import ovfcheck, ovfcheck_lshift
 
 
 ## ------------------------------------------------------------------------

Modified: pypy/dist/pypy/objspace/std/marshal_impl.py
==============================================================================
--- pypy/dist/pypy/objspace/std/marshal_impl.py	(original)
+++ pypy/dist/pypy/objspace/std/marshal_impl.py	Tue Oct 31 17:22:11 2006
@@ -10,7 +10,7 @@
 
 from pypy.interpreter.error import OperationError
 from pypy.objspace.std.register_all import register_all
-from pypy.rpython.rarithmetic import LONG_BIT
+from pypy.rlib.rarithmetic import LONG_BIT
 from pypy.objspace.std.inttype import wrapint
 from pypy.objspace.std.floatobject import repr__Float as repr_float
 from pypy.objspace.std.longobject import SHIFT as long_bits

Modified: pypy/dist/pypy/objspace/std/objspace.py
==============================================================================
--- pypy/dist/pypy/objspace/std/objspace.py	(original)
+++ pypy/dist/pypy/objspace/std/objspace.py	Tue Oct 31 17:22:11 2006
@@ -11,7 +11,7 @@
 from pypy.objspace.std.multimethod import FailedToImplement
 from pypy.objspace.descroperation import DescrOperation
 from pypy.objspace.std import stdtypedef
-from pypy.rpython.rarithmetic import base_int
+from pypy.rlib.rarithmetic import base_int
 import sys
 import os
 import __builtin__

Modified: pypy/dist/pypy/objspace/std/setobject.py
==============================================================================
--- pypy/dist/pypy/objspace/std/setobject.py	(original)
+++ pypy/dist/pypy/objspace/std/setobject.py	Tue Oct 31 17:22:11 2006
@@ -1,7 +1,7 @@
 from pypy.objspace.std.objspace import W_Object, OperationError
 from pypy.objspace.std.objspace import registerimplementation, register_all
 from pypy.rpython.objectmodel import r_dict
-from pypy.rpython.rarithmetic import intmask, r_uint
+from pypy.rlib.rarithmetic import intmask, r_uint
 from pypy.interpreter import gateway
 
 class W_BaseSetObject(W_Object):

Modified: pypy/dist/pypy/objspace/std/smallintobject.py
==============================================================================
--- pypy/dist/pypy/objspace/std/smallintobject.py	(original)
+++ pypy/dist/pypy/objspace/std/smallintobject.py	Tue Oct 31 17:22:11 2006
@@ -4,7 +4,7 @@
 """
 from pypy.objspace.std.objspace import *
 from pypy.objspace.std.noneobject import W_NoneObject
-from pypy.rpython.rarithmetic import ovfcheck, ovfcheck_lshift, LONG_BIT, r_uint
+from pypy.rlib.rarithmetic import ovfcheck, ovfcheck_lshift, LONG_BIT, r_uint
 from pypy.objspace.std.inttype import wrapint
 from pypy.objspace.std.intobject import W_IntObject
 from pypy.rpython.objectmodel import UnboxedValue

Modified: pypy/dist/pypy/objspace/std/stringobject.py
==============================================================================
--- pypy/dist/pypy/objspace/std/stringobject.py	(original)
+++ pypy/dist/pypy/objspace/std/stringobject.py	Tue Oct 31 17:22:11 2006
@@ -2,7 +2,7 @@
 
 from pypy.objspace.std.objspace import *
 from pypy.interpreter import gateway
-from pypy.rpython.rarithmetic import ovfcheck, _hash_string
+from pypy.rlib.rarithmetic import ovfcheck, _hash_string
 from pypy.rpython.objectmodel import we_are_translated
 from pypy.objspace.std.inttype import wrapint
 from pypy.objspace.std.sliceobject import W_SliceObject

Modified: pypy/dist/pypy/objspace/std/strutil.py
==============================================================================
--- pypy/dist/pypy/objspace/std/strutil.py	(original)
+++ pypy/dist/pypy/objspace/std/strutil.py	Tue Oct 31 17:22:11 2006
@@ -2,7 +2,7 @@
 Pure Python implementation of string utilities.
 """
 
-from pypy.rpython.rarithmetic import ovfcheck, parts_to_float
+from pypy.rlib.rarithmetic import ovfcheck, parts_to_float
 from pypy.interpreter.error import OperationError
 import math
 

Modified: pypy/dist/pypy/objspace/std/test/test_intobject.py
==============================================================================
--- pypy/dist/pypy/objspace/std/test/test_intobject.py	(original)
+++ pypy/dist/pypy/objspace/std/test/test_intobject.py	Tue Oct 31 17:22:11 2006
@@ -2,7 +2,7 @@
 import autopath
 from pypy.objspace.std import intobject as iobj
 from pypy.objspace.std.objspace import FailedToImplement
-from pypy.rpython.rarithmetic import r_uint
+from pypy.rlib.rarithmetic import r_uint
 
 
 class TestW_IntObject:

Modified: pypy/dist/pypy/objspace/std/test/test_longobject.py
==============================================================================
--- pypy/dist/pypy/objspace/std/test/test_longobject.py	(original)
+++ pypy/dist/pypy/objspace/std/test/test_longobject.py	Tue Oct 31 17:22:11 2006
@@ -4,7 +4,7 @@
 from pypy.objspace.std import longobject as lobj
 from pypy.objspace.std.objspace import FailedToImplement
 from pypy.interpreter.error import OperationError
-from pypy.rpython.rarithmetic import r_uint
+from pypy.rlib.rarithmetic import r_uint
 
 class AppTestLong:
     def test_add(self):

Modified: pypy/dist/pypy/objspace/std/test/test_smallintobject.py
==============================================================================
--- pypy/dist/pypy/objspace/std/test/test_smallintobject.py	(original)
+++ pypy/dist/pypy/objspace/std/test/test_smallintobject.py	Tue Oct 31 17:22:11 2006
@@ -7,7 +7,7 @@
 
 from pypy.objspace.std.inttype import wrapint
 from pypy.objspace.std.objspace import FailedToImplement
-from pypy.rpython.rarithmetic import r_uint
+from pypy.rlib.rarithmetic import r_uint
 
 from pypy.conftest import gettestobjspace
 

Modified: pypy/dist/pypy/objspace/std/tupleobject.py
==============================================================================
--- pypy/dist/pypy/objspace/std/tupleobject.py	(original)
+++ pypy/dist/pypy/objspace/std/tupleobject.py	Tue Oct 31 17:22:11 2006
@@ -1,6 +1,6 @@
 from pypy.objspace.std.objspace import *
 from pypy.objspace.std.inttype import wrapint
-from pypy.rpython.rarithmetic import intmask
+from pypy.rlib.rarithmetic import intmask
 from pypy.objspace.std.sliceobject import W_SliceObject
 from pypy.interpreter import gateway
 

Modified: pypy/dist/pypy/objspace/std/unicodeobject.py
==============================================================================
--- pypy/dist/pypy/objspace/std/unicodeobject.py	(original)
+++ pypy/dist/pypy/objspace/std/unicodeobject.py	Tue Oct 31 17:22:11 2006
@@ -3,7 +3,7 @@
 from pypy.objspace.std.stringobject import W_StringObject
 from pypy.objspace.std.noneobject import W_NoneObject
 from pypy.objspace.std.sliceobject import W_SliceObject
-from pypy.rpython.rarithmetic import intmask, ovfcheck
+from pypy.rlib.rarithmetic import intmask, ovfcheck
 from pypy.module.unicodedata import unicodedb_4_1_0 as unicodedb
 
 class W_UnicodeObject(W_Object):

Modified: pypy/dist/pypy/objspace/trace.py
==============================================================================
--- pypy/dist/pypy/objspace/trace.py	(original)
+++ pypy/dist/pypy/objspace/trace.py	Tue Oct 31 17:22:11 2006
@@ -4,7 +4,7 @@
 """
 
 from pypy.tool import pydis
-from pypy.rpython.rarithmetic import intmask
+from pypy.rlib.rarithmetic import intmask
 # __________________________________________________________________________
 #
 # Tracing Events 

Modified: pypy/dist/pypy/rlib/rlong.py
==============================================================================
--- pypy/dist/pypy/rlib/rlong.py	(original)
+++ pypy/dist/pypy/rlib/rlong.py	Tue Oct 31 17:22:11 2006
@@ -1,4 +1,4 @@
-from pypy.rpython.rarithmetic import LONG_BIT, intmask, r_uint, ovfcheck
+from pypy.rlib.rarithmetic import LONG_BIT, intmask, r_uint, ovfcheck
 
 import math, sys
 
@@ -618,7 +618,7 @@
             return digits_for_most_neg_long(x), -1
 args_from_rarith_int._annspecialcase_ = "specialize:argtype(0)"
 # ^^^ specialized by the precise type of 'x', which is typically a r_xxx
-#     instance from rpython.rarithmetic
+#     instance from rlib.rarithmetic
 
 def args_from_long(x):
     "NOT_RPYTHON"

Modified: pypy/dist/pypy/rlib/rrandom.py
==============================================================================
--- pypy/dist/pypy/rlib/rrandom.py	(original)
+++ pypy/dist/pypy/rlib/rrandom.py	Tue Oct 31 17:22:11 2006
@@ -4,7 +4,7 @@
 
 # this is stolen from CPython's _randommodule.c
 
-from pypy.rpython.rarithmetic import r_uint
+from pypy.rlib.rarithmetic import r_uint
 
 N = 624
 M = 397

Modified: pypy/dist/pypy/rlib/test/test_rlong.py
==============================================================================
--- pypy/dist/pypy/rlib/test/test_rlong.py	(original)
+++ pypy/dist/pypy/rlib/test/test_rlong.py	Tue Oct 31 17:22:11 2006
@@ -3,7 +3,7 @@
 from random import random, randint
 from pypy.rlib.rlong import rlong, SHIFT, MASK
 from pypy.rlib import rlong as lobj
-from pypy.rpython.rarithmetic import r_uint
+from pypy.rlib.rarithmetic import r_uint
 import operator, sys
 
 class TestRLong(object):
@@ -55,7 +55,7 @@
 
     def test_touint(self):
         import sys
-        from pypy.rpython.rarithmetic import r_uint
+        from pypy.rlib.rarithmetic import r_uint
         result = r_uint(sys.maxint + 42)
         rl = rlong.fromint(sys.maxint).add(rlong.fromint(42))
         assert rl.touint() == result

Modified: pypy/dist/pypy/rpython/extfunctable.py
==============================================================================
--- pypy/dist/pypy/rpython/extfunctable.py	(original)
+++ pypy/dist/pypy/rpython/extfunctable.py	Tue Oct 31 17:22:11 2006
@@ -5,7 +5,7 @@
 import time
 import math
 import types
-from pypy.rpython.rarithmetic import r_longlong
+from pypy.rlib.rarithmetic import r_longlong
 
 class ExtFuncInfo:
     def __init__(self, func, annotation, ll_function_path, ll_annotable, backend_functiontemplate):
@@ -272,7 +272,7 @@
 
 # ___________________________________________________________
 # string->float helper
-from pypy.rpython import rarithmetic
+from pypy.rlib import rarithmetic
 declare(rarithmetic.parts_to_float, float, 'll_strtod/parts_to_float')
 # float->string helper
 declare(rarithmetic.formatd, str, 'll_strtod/formatd')

Modified: pypy/dist/pypy/rpython/llinterp.py
==============================================================================
--- pypy/dist/pypy/rpython/llinterp.py	(original)
+++ pypy/dist/pypy/rpython/llinterp.py	Tue Oct 31 17:22:11 2006
@@ -1,5 +1,5 @@
 from pypy.objspace.flow.model import FunctionGraph, Constant, Variable, c_last_exception
-from pypy.rpython.rarithmetic import intmask, r_uint, ovfcheck, r_longlong, r_ulonglong
+from pypy.rlib.rarithmetic import intmask, r_uint, ovfcheck, r_longlong, r_ulonglong
 from pypy.rpython.lltypesystem import lltype, llmemory, lloperation, llheap
 from pypy.rpython.lltypesystem import rclass
 from pypy.rpython.ootypesystem import ootype

Modified: pypy/dist/pypy/rpython/lltypesystem/ll_str.py
==============================================================================
--- pypy/dist/pypy/rpython/lltypesystem/ll_str.py	(original)
+++ pypy/dist/pypy/rpython/lltypesystem/ll_str.py	Tue Oct 31 17:22:11 2006
@@ -1,5 +1,5 @@
 from pypy.rpython.lltypesystem.lltype import GcArray, Array, Char, malloc
-from pypy.rpython.rarithmetic import r_uint
+from pypy.rlib.rarithmetic import r_uint
 
 CHAR_ARRAY = GcArray(Char)
 

Modified: pypy/dist/pypy/rpython/lltypesystem/lltype.py
==============================================================================
--- pypy/dist/pypy/rpython/lltypesystem/lltype.py	(original)
+++ pypy/dist/pypy/rpython/lltypesystem/lltype.py	Tue Oct 31 17:22:11 2006
@@ -1,7 +1,7 @@
 import py
-from pypy.rpython.rarithmetic import r_int, r_uint, intmask
-from pypy.rpython.rarithmetic import r_ulonglong, r_longlong, base_int
-from pypy.rpython.rarithmetic import normalizedinttype
+from pypy.rlib.rarithmetic import r_int, r_uint, intmask
+from pypy.rlib.rarithmetic import r_ulonglong, r_longlong, base_int
+from pypy.rlib.rarithmetic import normalizedinttype
 from pypy.rpython.objectmodel import Symbolic
 from pypy.tool.uid import Hashable
 from pypy.tool.tls import tlsobject

Modified: pypy/dist/pypy/rpython/lltypesystem/module/ll_os.py
==============================================================================
--- pypy/dist/pypy/rpython/lltypesystem/module/ll_os.py	(original)
+++ pypy/dist/pypy/rpython/lltypesystem/module/ll_os.py	Tue Oct 31 17:22:11 2006
@@ -3,7 +3,7 @@
 from pypy.rpython.module.support import ll_strcpy
 from pypy.rpython.module.ll_os import BaseOS
 from pypy.rpython.lltypesystem import lltype, rtupletype
-from pypy.rpython.rarithmetic import intmask
+from pypy.rlib.rarithmetic import intmask
 
 STAT_RESULT = rtupletype.TUPLE_TYPE([lltype.Signed]*10).TO
 PIPE_RESULT = rtupletype.TUPLE_TYPE([lltype.Signed]*2).TO

Modified: pypy/dist/pypy/rpython/lltypesystem/module/ll_strtod.py
==============================================================================
--- pypy/dist/pypy/rpython/lltypesystem/module/ll_strtod.py	(original)
+++ pypy/dist/pypy/rpython/lltypesystem/module/ll_strtod.py	Tue Oct 31 17:22:11 2006
@@ -1,4 +1,4 @@
-from pypy.rpython import rarithmetic
+from pypy.rlib import rarithmetic
 from pypy.rpython.module.support import LLSupport
 from pypy.tool.staticmethods import ClassMethods
 
@@ -6,4 +6,4 @@
     def ll_strtod_formatd(fmt, x):
         return LLSupport.to_rstr(rarithmetic.formatd(LLSupport.from_rstr(fmt), x))
     ll_strtod_formatd.suggested_primitive = True
-    ll_strtod_formatd = staticmethod(ll_strtod_formatd)
\ No newline at end of file
+    ll_strtod_formatd = staticmethod(ll_strtod_formatd)

Modified: pypy/dist/pypy/rpython/lltypesystem/opimpl.py
==============================================================================
--- pypy/dist/pypy/rpython/lltypesystem/opimpl.py	(original)
+++ pypy/dist/pypy/rpython/lltypesystem/opimpl.py	Tue Oct 31 17:22:11 2006
@@ -16,8 +16,8 @@
 ops_unary = {'is_true': True, 'neg': True, 'abs': True, 'invert': True}
 
 # global synonyms for some types
-from pypy.rpython.rarithmetic import intmask
-from pypy.rpython.rarithmetic import r_uint, r_longlong, r_ulonglong
+from pypy.rlib.rarithmetic import intmask
+from pypy.rlib.rarithmetic import r_uint, r_longlong, r_ulonglong
 
 type_by_name = {
     'int': int,

Modified: pypy/dist/pypy/rpython/lltypesystem/rclass.py
==============================================================================
--- pypy/dist/pypy/rpython/lltypesystem/rclass.py	(original)
+++ pypy/dist/pypy/rpython/lltypesystem/rclass.py	Tue Oct 31 17:22:11 2006
@@ -20,7 +20,7 @@
 from pypy.rpython.extregistry import ExtRegistryEntry
 from pypy.annotation import model as annmodel
 from pypy.rpython.objectmodel import UnboxedValue
-from pypy.rpython.rarithmetic import intmask
+from pypy.rlib.rarithmetic import intmask
 
 #
 #  There is one "vtable" per user class, with the following structure:

Modified: pypy/dist/pypy/rpython/lltypesystem/rdict.py
==============================================================================
--- pypy/dist/pypy/rpython/lltypesystem/rdict.py	(original)
+++ pypy/dist/pypy/rpython/lltypesystem/rdict.py	Tue Oct 31 17:22:11 2006
@@ -4,7 +4,7 @@
 from pypy.rpython.rdict import AbstractDictRepr, AbstractDictIteratorRepr,\
      rtype_newdict, dum_variant, dum_keys, dum_values, dum_items
 from pypy.rpython.lltypesystem import lltype
-from pypy.rpython.rarithmetic import r_uint
+from pypy.rlib.rarithmetic import r_uint
 from pypy.rpython.objectmodel import hlinvoke
 from pypy.rpython import robject
 from pypy.rpython import objectmodel

Modified: pypy/dist/pypy/rpython/lltypesystem/rstr.py
==============================================================================
--- pypy/dist/pypy/rpython/lltypesystem/rstr.py	(original)
+++ pypy/dist/pypy/rpython/lltypesystem/rstr.py	Tue Oct 31 17:22:11 2006
@@ -3,7 +3,7 @@
 from pypy.rpython.error import TyperError
 from pypy.rpython.objectmodel import malloc_zero_filled, we_are_translated
 from pypy.rpython.robject import PyObjRepr, pyobj_repr
-from pypy.rpython.rarithmetic import _hash_string
+from pypy.rlib.rarithmetic import _hash_string
 from pypy.rpython.rmodel import inputconst, IntegerRepr
 from pypy.rpython.rstr import AbstractStringRepr,AbstractCharRepr,\
      AbstractUniCharRepr, AbstractStringIteratorRepr,\

Modified: pypy/dist/pypy/rpython/memory/gc.py
==============================================================================
--- pypy/dist/pypy/rpython/memory/gc.py	(original)
+++ pypy/dist/pypy/rpython/memory/gc.py	Tue Oct 31 17:22:11 2006
@@ -6,7 +6,7 @@
 from pypy.rpython.lltypesystem import lltype, llmemory
 from pypy.rpython.objectmodel import free_non_gc_object
 from pypy.rpython.lltypesystem.lloperation import llop
-from pypy.rpython.rarithmetic import ovfcheck
+from pypy.rlib.rarithmetic import ovfcheck
 
 import sys, os
 

Modified: pypy/dist/pypy/rpython/memory/gctransform/framework.py
==============================================================================
--- pypy/dist/pypy/rpython/memory/gctransform/framework.py	(original)
+++ pypy/dist/pypy/rpython/memory/gctransform/framework.py	Tue Oct 31 17:22:11 2006
@@ -5,7 +5,7 @@
 from pypy.rpython import rmodel
 from pypy.rpython.memory import gc, lladdress
 from pypy.rpython.memory.gcheader import GCHeaderBuilder
-from pypy.rpython.rarithmetic import ovfcheck
+from pypy.rlib.rarithmetic import ovfcheck
 from pypy.translator.backendopt import graphanalyze
 from pypy.annotation import model as annmodel
 from pypy.rpython import annlowlevel

Modified: pypy/dist/pypy/rpython/memory/gctransform/refcounting.py
==============================================================================
--- pypy/dist/pypy/rpython/memory/gctransform/refcounting.py	(original)
+++ pypy/dist/pypy/rpython/memory/gctransform/refcounting.py	Tue Oct 31 17:22:11 2006
@@ -8,7 +8,7 @@
 from pypy.rpython import rmodel
 from pypy.rpython.memory import lladdress
 from pypy.rpython.memory.gcheader import GCHeaderBuilder
-from pypy.rpython.rarithmetic import ovfcheck
+from pypy.rlib.rarithmetic import ovfcheck
 from pypy.rpython.rbuiltin import gen_cast
 import sys
 

Modified: pypy/dist/pypy/rpython/memory/gctransform/transform.py
==============================================================================
--- pypy/dist/pypy/rpython/memory/gctransform/transform.py	(original)
+++ pypy/dist/pypy/rpython/memory/gctransform/transform.py	Tue Oct 31 17:22:11 2006
@@ -17,7 +17,7 @@
 from pypy.rpython.annlowlevel import MixLevelHelperAnnotator
 from pypy.rpython.rtyper import LowLevelOpList
 from pypy.rpython.rbuiltin import gen_cast
-from pypy.rpython.rarithmetic import ovfcheck
+from pypy.rlib.rarithmetic import ovfcheck
 import sets, os, sys
 
 def var_ispyobj(var):

Modified: pypy/dist/pypy/rpython/memory/lladdress.py
==============================================================================
--- pypy/dist/pypy/rpython/memory/lladdress.py	(original)
+++ pypy/dist/pypy/rpython/memory/lladdress.py	Tue Oct 31 17:22:11 2006
@@ -1,6 +1,6 @@
 import struct
 from pypy.rpython.memory.simulator import MemorySimulator, MemorySimulatorError
-from pypy.rpython.rarithmetic import r_uint
+from pypy.rlib.rarithmetic import r_uint
 from pypy.rpython.lltypesystem import llmemory
 from pypy.rpython.lltypesystem import lltype
 from pypy.rpython.memory.lltypelayout import convert_offset_to_int

Modified: pypy/dist/pypy/rpython/memory/test/test_llinterpsim.py
==============================================================================
--- pypy/dist/pypy/rpython/memory/test/test_llinterpsim.py	(original)
+++ pypy/dist/pypy/rpython/memory/test/test_llinterpsim.py	Tue Oct 31 17:22:11 2006
@@ -6,7 +6,7 @@
 from pypy.rpython.rint import signed_repr
 from pypy.rpython.lltypesystem import rstr
 from pypy.annotation.model import lltype_to_annotation
-from pypy.rpython.rarithmetic import r_uint, ovfcheck
+from pypy.rlib.rarithmetic import r_uint, ovfcheck
 from pypy.rpython.memory.lltypesimulation import pyobjectptr
 from pypy.rpython.memory import gclltype
 

Modified: pypy/dist/pypy/rpython/module/ll_os.py
==============================================================================
--- pypy/dist/pypy/rpython/module/ll_os.py	(original)
+++ pypy/dist/pypy/rpython/module/ll_os.py	Tue Oct 31 17:22:11 2006
@@ -17,7 +17,7 @@
 from pypy.rpython.module.support import ll_strcpy, _ll_strfill
 from pypy.rpython.module.support import to_opaque_object, from_opaque_object
 from pypy.rlib import ros
-from pypy.rpython.rarithmetic import r_longlong
+from pypy.rlib.rarithmetic import r_longlong
 from pypy.tool.staticmethods import ClassMethods
 import stat
 

Modified: pypy/dist/pypy/rpython/module/ll_strtod.py
==============================================================================
--- pypy/dist/pypy/rpython/module/ll_strtod.py	(original)
+++ pypy/dist/pypy/rpython/module/ll_strtod.py	Tue Oct 31 17:22:11 2006
@@ -1,5 +1,5 @@
 # string -> float helper
-from pypy.rpython import rarithmetic
+from pypy.rlib import rarithmetic
 from pypy.rpython.module.support import LLSupport, ll_strcpy
 
 

Modified: pypy/dist/pypy/rpython/ootypesystem/module/ll_os.py
==============================================================================
--- pypy/dist/pypy/rpython/ootypesystem/module/ll_os.py	(original)
+++ pypy/dist/pypy/rpython/ootypesystem/module/ll_os.py	Tue Oct 31 17:22:11 2006
@@ -2,7 +2,7 @@
 from pypy.rpython.module.support import OOSupport
 from pypy.rpython.module.ll_os import BaseOS
 from pypy.rpython.ootypesystem import ootype
-from pypy.rpython.rarithmetic import intmask
+from pypy.rlib.rarithmetic import intmask
 
 def _make_tuple(FIELDS):
     n = len(FIELDS)

Modified: pypy/dist/pypy/rpython/ootypesystem/module/ll_strtod.py
==============================================================================
--- pypy/dist/pypy/rpython/ootypesystem/module/ll_strtod.py	(original)
+++ pypy/dist/pypy/rpython/ootypesystem/module/ll_strtod.py	Tue Oct 31 17:22:11 2006
@@ -1,4 +1,4 @@
-from pypy.rpython import rarithmetic
+from pypy.rlib import rarithmetic
 from pypy.rpython.module.support import OOSupport
 from pypy.tool.staticmethods import ClassMethods
 

Modified: pypy/dist/pypy/rpython/ootypesystem/ootype.py
==============================================================================
--- pypy/dist/pypy/rpython/ootypesystem/ootype.py	(original)
+++ pypy/dist/pypy/rpython/ootypesystem/ootype.py	Tue Oct 31 17:22:11 2006
@@ -2,7 +2,7 @@
 from pypy.rpython.lltypesystem.lltype import Bool, Void, UniChar, typeOf, \
         Primitive, isCompatibleType, enforce, saferecursive, SignedLongLong, UnsignedLongLong
 from pypy.rpython.lltypesystem.lltype import frozendict, isCompatibleType
-from pypy.rpython.rarithmetic import intmask
+from pypy.rlib.rarithmetic import intmask
 from pypy.rpython import objectmodel
 from pypy.tool.uid import uid
 

Modified: pypy/dist/pypy/rpython/ootypesystem/rdict.py
==============================================================================
--- pypy/dist/pypy/rpython/ootypesystem/rdict.py	(original)
+++ pypy/dist/pypy/rpython/ootypesystem/rdict.py	Tue Oct 31 17:22:11 2006
@@ -8,7 +8,7 @@
      AbstractFunctionsPBCRepr, AbstractMethodsPBCRepr
 from pypy.rpython.ootypesystem import ootype
 from pypy.rpython.ootypesystem.rlist import ll_newlist
-from pypy.rpython.rarithmetic import r_uint
+from pypy.rlib.rarithmetic import r_uint
 from pypy.rpython.objectmodel import hlinvoke
 from pypy.rpython import robject
 from pypy.rpython import objectmodel

Modified: pypy/dist/pypy/rpython/raisingops/raisingops.py
==============================================================================
--- pypy/dist/pypy/rpython/raisingops/raisingops.py	(original)
+++ pypy/dist/pypy/rpython/raisingops/raisingops.py	Tue Oct 31 17:22:11 2006
@@ -1,5 +1,5 @@
 import sys
-from pypy.rpython.rarithmetic import r_longlong, r_uint, intmask
+from pypy.rlib.rarithmetic import r_longlong, r_uint, intmask
 
 #XXX original SIGNED_RIGHT_SHIFT_ZERO_FILLS not taken into account
 #XXX assuming HAVE_LONG_LONG (int_mul_ovf)

Modified: pypy/dist/pypy/rpython/rbuiltin.py
==============================================================================
--- pypy/dist/pypy/rpython/rbuiltin.py	(original)
+++ pypy/dist/pypy/rpython/rbuiltin.py	Tue Oct 31 17:22:11 2006
@@ -2,7 +2,8 @@
 from pypy.annotation import model as annmodel
 from pypy.objspace.flow.model import Constant
 from pypy.rpython.lltypesystem import lltype, rclass, llmemory
-from pypy.rpython import rarithmetic, objectmodel, rstack, rint, raddress
+from pypy.rpython import objectmodel, rstack, rint, raddress
+from pypy.rlib import rarithmetic
 from pypy.rpython.error import TyperError
 from pypy.rpython.rmodel import Repr, IntegerRepr, inputconst
 from pypy.rpython.rrange import rtype_builtin_range, rtype_builtin_xrange

Modified: pypy/dist/pypy/rpython/rctypes/rcarithmetic.py
==============================================================================
--- pypy/dist/pypy/rpython/rctypes/rcarithmetic.py	(original)
+++ pypy/dist/pypy/rpython/rctypes/rcarithmetic.py	Tue Oct 31 17:22:11 2006
@@ -1,4 +1,4 @@
-from pypy.rpython import rarithmetic
+from pypy.rlib import rarithmetic
 from pypy.rpython.lltypesystem import lltype
 import ctypes
 

Modified: pypy/dist/pypy/rpython/rctypes/test/test_rcarithmetic.py
==============================================================================
--- pypy/dist/pypy/rpython/rctypes/test/test_rcarithmetic.py	(original)
+++ pypy/dist/pypy/rpython/rctypes/test/test_rcarithmetic.py	Tue Oct 31 17:22:11 2006
@@ -1,7 +1,7 @@
 import py.test
 from pypy.rpython.rctypes.rcarithmetic import *
 from pypy.rpython.lltypesystem import lltype
-from pypy.rpython import rarithmetic
+from pypy.rlib import rarithmetic
 from pypy.annotation import model as annmodel
 from pypy.annotation.annrpython import RPythonAnnotator
 from pypy.rpython.test.test_llinterp import interpret

Modified: pypy/dist/pypy/rpython/rctypes/test/test_rprimitive.py
==============================================================================
--- pypy/dist/pypy/rpython/rctypes/test/test_rprimitive.py	(original)
+++ pypy/dist/pypy/rpython/rctypes/test/test_rprimitive.py	Tue Oct 31 17:22:11 2006
@@ -10,7 +10,7 @@
 from pypy import conftest
 import sys
 from pypy.rpython.test.test_llinterp import interpret
-from pypy.rpython.rarithmetic import r_longlong, r_ulonglong
+from pypy.rlib.rarithmetic import r_longlong, r_ulonglong
 from pypy.rpython.lltypesystem import lltype
 from ctypes import c_char, c_byte, c_ubyte, c_short, c_ushort, c_int, c_uint
 from ctypes import c_long, c_ulong, c_longlong, c_ulonglong, c_float

Modified: pypy/dist/pypy/rpython/rdict.py
==============================================================================
--- pypy/dist/pypy/rpython/rdict.py	(original)
+++ pypy/dist/pypy/rpython/rdict.py	Tue Oct 31 17:22:11 2006
@@ -2,7 +2,7 @@
 from pypy.annotation import model as annmodel
 from pypy.objspace.flow.model import Constant
 from pypy.rpython.lltypesystem import lltype
-from pypy.rpython.rarithmetic import r_uint
+from pypy.rlib.rarithmetic import r_uint
 from pypy.rpython.objectmodel import hlinvoke
 from pypy.rpython import robject
 from pypy.rpython import objectmodel

Modified: pypy/dist/pypy/rpython/rint.py
==============================================================================
--- pypy/dist/pypy/rpython/rint.py	(original)
+++ pypy/dist/pypy/rpython/rint.py	Tue Oct 31 17:22:11 2006
@@ -7,7 +7,7 @@
      SignedLongLong, build_number, Number, cast_primitive, typeOf
 from pypy.rpython.rmodel import IntegerRepr, inputconst
 from pypy.rpython.robject import PyObjRepr, pyobj_repr
-from pypy.rpython.rarithmetic import intmask, r_int, r_uint, r_ulonglong, r_longlong
+from pypy.rlib.rarithmetic import intmask, r_int, r_uint, r_ulonglong, r_longlong
 from pypy.rpython.error import TyperError
 from pypy.rpython.rmodel import log
 from pypy.rpython import objectmodel

Modified: pypy/dist/pypy/rpython/rtuple.py
==============================================================================
--- pypy/dist/pypy/rpython/rtuple.py	(original)
+++ pypy/dist/pypy/rpython/rtuple.py	Tue Oct 31 17:22:11 2006
@@ -8,7 +8,7 @@
 from pypy.rpython.rmodel import externalvsinternal
 from pypy.rpython.rslice import AbstractSliceRepr
 from pypy.rpython.lltypesystem.lltype import Void, Signed 
-from pypy.rpython.rarithmetic import intmask
+from pypy.rlib.rarithmetic import intmask
 from pypy.rpython.unroll import unrolling_iterable
 
 class __extend__(annmodel.SomeTuple):

Modified: pypy/dist/pypy/rpython/test/test_llann.py
==============================================================================
--- pypy/dist/pypy/rpython/test/test_llann.py	(original)
+++ pypy/dist/pypy/rpython/test/test_llann.py	Tue Oct 31 17:22:11 2006
@@ -62,7 +62,7 @@
         assert s.knowntype == int
 
     def test_array_longlong(self):
-        from pypy.rpython.rarithmetic import r_longlong
+        from pypy.rlib.rarithmetic import r_longlong
         A = GcArray(('v', Signed))
         one = r_longlong(1)
         def llf():

Modified: pypy/dist/pypy/rpython/test/test_llinterp.py
==============================================================================
--- pypy/dist/pypy/rpython/test/test_llinterp.py	(original)
+++ pypy/dist/pypy/rpython/test/test_llinterp.py	Tue Oct 31 17:22:11 2006
@@ -8,7 +8,7 @@
 from pypy.rpython.lltypesystem import rstr, lltype
 from pypy.annotation import model as annmodel
 from pypy.annotation.model import lltype_to_annotation
-from pypy.rpython.rarithmetic import r_uint, ovfcheck
+from pypy.rlib.rarithmetic import r_uint, ovfcheck
 from pypy import conftest
 
 # switch on logging of interp to show more info on failing tests

Modified: pypy/dist/pypy/rpython/test/test_rbuiltin.py
==============================================================================
--- pypy/dist/pypy/rpython/test/test_rbuiltin.py	(original)
+++ pypy/dist/pypy/rpython/test/test_rbuiltin.py	Tue Oct 31 17:22:11 2006
@@ -3,7 +3,7 @@
 from pypy.rpython.objectmodel import instantiate, we_are_translated
 from pypy.rpython.lltypesystem import lltype
 from pypy.tool import udir
-from pypy.rpython.rarithmetic import r_uint, intmask
+from pypy.rlib.rarithmetic import r_uint, intmask
 from pypy.annotation.builtin import *
 from pypy.rpython.test.tool import BaseRtypingTest, LLRtypeMixin, OORtypeMixin
 import py

Modified: pypy/dist/pypy/rpython/test/test_rclass.py
==============================================================================
--- pypy/dist/pypy/rpython/test/test_rclass.py	(original)
+++ pypy/dist/pypy/rpython/test/test_rclass.py	Tue Oct 31 17:22:11 2006
@@ -3,7 +3,7 @@
 from pypy.translator.translator import TranslationContext, graphof
 from pypy.rpython.lltypesystem.lltype import *
 from pypy.rpython.ootypesystem import ootype
-from pypy.rpython.rarithmetic import intmask
+from pypy.rlib.rarithmetic import intmask
 from pypy.rpython.test.tool import BaseRtypingTest, LLRtypeMixin, OORtypeMixin
 
 class EmptyBase(object):

Modified: pypy/dist/pypy/rpython/test/test_rint.py
==============================================================================
--- pypy/dist/pypy/rpython/test/test_rint.py	(original)
+++ pypy/dist/pypy/rpython/test/test_rint.py	Tue Oct 31 17:22:11 2006
@@ -2,7 +2,7 @@
 from pypy.translator.translator import TranslationContext
 from pypy.annotation import model as annmodel
 from pypy.rpython.test import snippet
-from pypy.rpython.rarithmetic import r_uint, r_longlong, r_ulonglong
+from pypy.rlib.rarithmetic import r_uint, r_longlong, r_ulonglong
 from pypy.rpython.test.tool import BaseRtypingTest, LLRtypeMixin, OORtypeMixin
 
 class TestSnippet(object):

Modified: pypy/dist/pypy/rpython/test/test_rrange.py
==============================================================================
--- pypy/dist/pypy/rpython/test/test_rrange.py	(original)
+++ pypy/dist/pypy/rpython/test/test_rrange.py	Tue Oct 31 17:22:11 2006
@@ -1,6 +1,6 @@
 from pypy.rpython.rrange import *
 from pypy.rpython.test.tool import BaseRtypingTest, LLRtypeMixin, OORtypeMixin
-from pypy.rpython.rarithmetic import intmask
+from pypy.rlib.rarithmetic import intmask
 
 
 class BaseTestRrange(BaseRtypingTest):

Modified: pypy/dist/pypy/translator/asm/test/test_asm.py
==============================================================================
--- pypy/dist/pypy/translator/asm/test/test_asm.py	(original)
+++ pypy/dist/pypy/translator/asm/test/test_asm.py	Tue Oct 31 17:22:11 2006
@@ -1,6 +1,6 @@
 from pypy.translator.translator import TranslationContext, graphof
 from pypy.translator.backendopt.all import backend_optimizations
-from pypy.rpython.rarithmetic import ovfcheck
+from pypy.rlib.rarithmetic import ovfcheck
 from pypy.translator.asm import genasm
 from pypy import conftest
 import py

Modified: pypy/dist/pypy/translator/backendopt/test/test_all.py
==============================================================================
--- pypy/dist/pypy/translator/backendopt/test/test_all.py	(original)
+++ pypy/dist/pypy/translator/backendopt/test/test_all.py	Tue Oct 31 17:22:11 2006
@@ -6,7 +6,7 @@
 from pypy.objspace.flow.model import Constant
 from pypy.annotation import model as annmodel
 from pypy.rpython.llinterp import LLInterpreter
-from pypy.rpython.rarithmetic import intmask
+from pypy.rlib.rarithmetic import intmask
 from pypy import conftest
 
 def translateopt(func, sig, **optflags):

Modified: pypy/dist/pypy/translator/backendopt/test/test_inline.py
==============================================================================
--- pypy/dist/pypy/translator/backendopt/test/test_inline.py	(original)
+++ pypy/dist/pypy/translator/backendopt/test/test_inline.py	Tue Oct 31 17:22:11 2006
@@ -10,7 +10,7 @@
 from pypy.translator.backendopt.inline import measure_median_execution_cost
 from pypy.translator.translator import TranslationContext, graphof
 from pypy.rpython.llinterp import LLInterpreter
-from pypy.rpython.rarithmetic import ovfcheck
+from pypy.rlib.rarithmetic import ovfcheck
 from pypy.translator.test.snippet import is_perfect_number
 from pypy.conftest import option
 

Modified: pypy/dist/pypy/translator/backendopt/test/test_merge_if_blocks.py
==============================================================================
--- pypy/dist/pypy/translator/backendopt/test/test_merge_if_blocks.py	(original)
+++ pypy/dist/pypy/translator/backendopt/test/test_merge_if_blocks.py	Tue Oct 31 17:22:11 2006
@@ -5,7 +5,7 @@
 from pypy.objspace.flow.model import flatten, Block
 from pypy.translator.backendopt.removenoops import remove_same_as
 from pypy.rpython.llinterp import LLInterpreter
-from pypy.rpython.rarithmetic import r_uint, r_ulonglong, r_longlong
+from pypy.rlib.rarithmetic import r_uint, r_ulonglong, r_longlong
 from pypy.annotation.model import SomeChar, SomeUnicodeCodePoint
 
 def do_test_merge(fn, testvalues):

Modified: pypy/dist/pypy/translator/c/exceptiontransform.py
==============================================================================
--- pypy/dist/pypy/translator/c/exceptiontransform.py	(original)
+++ pypy/dist/pypy/translator/c/exceptiontransform.py	Tue Oct 31 17:22:11 2006
@@ -9,7 +9,7 @@
 from pypy.rpython.memory.lladdress import NULL
 from pypy.rpython import rtyper
 from pypy.rpython import rclass
-from pypy.rpython.rarithmetic import r_uint, r_longlong, r_ulonglong
+from pypy.rlib.rarithmetic import r_uint, r_longlong, r_ulonglong
 from pypy.annotation import model as annmodel
 from pypy.rpython.annlowlevel import MixLevelHelperAnnotator
 

Modified: pypy/dist/pypy/translator/c/pyobj.py
==============================================================================
--- pypy/dist/pypy/translator/c/pyobj.py	(original)
+++ pypy/dist/pypy/translator/c/pyobj.py	Tue Oct 31 17:22:11 2006
@@ -10,7 +10,7 @@
 from pypy.translator.c.wrapper import gen_wrapper, new_method_graph
 from pypy.translator.tool.raymond import should_expose
 
-from pypy.rpython.rarithmetic import r_int, r_uint
+from pypy.rlib.rarithmetic import r_int, r_uint
 from pypy.rpython.lltypesystem.lltype import pyobjectptr, LowLevelType
 from pypy.rpython import extregistry
 

Modified: pypy/dist/pypy/translator/c/test/test_backendoptimized.py
==============================================================================
--- pypy/dist/pypy/translator/c/test/test_backendoptimized.py	(original)
+++ pypy/dist/pypy/translator/c/test/test_backendoptimized.py	Tue Oct 31 17:22:11 2006
@@ -2,7 +2,7 @@
 from pypy.translator.c.test.test_typed import TestTypedTestCase as _TestTypedTestCase
 from pypy.translator.backendopt.all import backend_optimizations
 from pypy.rpython import objectmodel
-from pypy.rpython.rarithmetic import r_uint, r_longlong, r_ulonglong
+from pypy.rlib.rarithmetic import r_uint, r_longlong, r_ulonglong
 from pypy import conftest
 
 class TestTypedOptimizedTestCase(_TestTypedTestCase):

Modified: pypy/dist/pypy/translator/c/test/test_extfunc.py
==============================================================================
--- pypy/dist/pypy/translator/c/test/test_extfunc.py	(original)
+++ pypy/dist/pypy/translator/c/test/test_extfunc.py	Tue Oct 31 17:22:11 2006
@@ -294,7 +294,7 @@
 
 
 def test_rarith_parts_to_float():
-    from pypy.rpython.rarithmetic import parts_to_float
+    from pypy.rlib.rarithmetic import parts_to_float
     def fn(sign, beforept, afterpt, exponent):
         return parts_to_float(sign, beforept, afterpt, exponent)
 
@@ -313,7 +313,7 @@
         assert f(*parts) == val
 
 def test_rarith_formatd():
-    from pypy.rpython.rarithmetic import formatd
+    from pypy.rlib.rarithmetic import formatd
     def fn(x):
         return formatd("%.2f", x)
 

Modified: pypy/dist/pypy/translator/c/test/test_typed.py
==============================================================================
--- pypy/dist/pypy/translator/c/test/test_typed.py	(original)
+++ pypy/dist/pypy/translator/c/test/test_typed.py	Tue Oct 31 17:22:11 2006
@@ -7,7 +7,7 @@
 from pypy import conftest
 from pypy.translator.test import snippet
 from pypy.translator.translator import TranslationContext
-from pypy.rpython.rarithmetic import r_uint, r_ulonglong, r_longlong, intmask
+from pypy.rlib.rarithmetic import r_uint, r_ulonglong, r_longlong, intmask
 from pypy.config.config import Config
 from pypy.config.pypyoption import pypy_optiondescription
 
@@ -590,8 +590,6 @@
 
         res = f()
 
-        from pypy.rpython.rarithmetic import intmask
-        
         assert res[0] == True
         assert res[1] == intmask(hash(c)+hash(d))
 

Modified: pypy/dist/pypy/translator/cli/test/test_cast.py
==============================================================================
--- pypy/dist/pypy/translator/cli/test/test_cast.py	(original)
+++ pypy/dist/pypy/translator/cli/test/test_cast.py	Tue Oct 31 17:22:11 2006
@@ -1,7 +1,7 @@
 import sys
 
 from pypy.translator.cli.test.runtest import check
-from pypy.rpython.rarithmetic import r_uint, r_ulonglong, r_longlong, intmask
+from pypy.rlib.rarithmetic import r_uint, r_ulonglong, r_longlong, intmask
 
 def to_int(x):
     return int(x)

Modified: pypy/dist/pypy/translator/cli/test/test_op.py
==============================================================================
--- pypy/dist/pypy/translator/cli/test/test_op.py	(original)
+++ pypy/dist/pypy/translator/cli/test/test_op.py	Tue Oct 31 17:22:11 2006
@@ -1,5 +1,13 @@
 from pypy.translator.cli.test.runtest import CliTest
+<<<<<<< .mine
+from pypy.translator.cli.test.runtest import check
+from pypy.rlib.rarithmetic import r_uint, r_ulonglong, r_longlong, ovfcheck
+from pypy.rpython import rstack
+from pypy.annotation import model as annmodel
+import sys
+=======
 from pypy.translator.oosupport.test_template.operations import BaseTestOperations
+>>>>>>> .r33967
 
 class TestOperations(CliTest, BaseTestOperations):
     pass

Modified: pypy/dist/pypy/translator/cli/test/test_overflow.py
==============================================================================
--- pypy/dist/pypy/translator/cli/test/test_overflow.py	(original)
+++ pypy/dist/pypy/translator/cli/test/test_overflow.py	Tue Oct 31 17:22:11 2006
@@ -1,5 +1,5 @@
 from pypy.translator.cli.test.runtest import check
-from pypy.rpython.rarithmetic import ovfcheck
+from pypy.rlib.rarithmetic import ovfcheck
 
 import sys
 

Modified: pypy/dist/pypy/translator/js/test/test_exc_operation.py
==============================================================================
--- pypy/dist/pypy/translator/js/test/test_exc_operation.py	(original)
+++ pypy/dist/pypy/translator/js/test/test_exc_operation.py	Tue Oct 31 17:22:11 2006
@@ -1,7 +1,7 @@
 import py
 import sys
 from pypy.translator.js.test.runtest import compile_function
-from pypy.rpython.rarithmetic import r_uint, ovfcheck, ovfcheck_lshift
+from pypy.rlib.rarithmetic import r_uint, ovfcheck, ovfcheck_lshift
 from pypy.translator.test import snippet 
 
 py.test.skip("Exception work in progress")

Modified: pypy/dist/pypy/translator/js/test/test_exception.py
==============================================================================
--- pypy/dist/pypy/translator/js/test/test_exception.py	(original)
+++ pypy/dist/pypy/translator/js/test/test_exception.py	Tue Oct 31 17:22:11 2006
@@ -2,7 +2,7 @@
 
 from pypy.translator.js.test.runtest import compile_function
 from pypy.translator.test.snippet import try_raise_choose
-from pypy.rpython.rarithmetic import r_uint, ovfcheck, ovfcheck_lshift
+from pypy.rlib.rarithmetic import r_uint, ovfcheck, ovfcheck_lshift
 
 import sys
 

Modified: pypy/dist/pypy/translator/js/test/test_genllvm.py
==============================================================================
--- pypy/dist/pypy/translator/js/test/test_genllvm.py	(original)
+++ pypy/dist/pypy/translator/js/test/test_genllvm.py	Tue Oct 31 17:22:11 2006
@@ -3,7 +3,7 @@
 import sys
 import py
 
-from pypy.rpython.rarithmetic import r_uint
+from pypy.rlib.rarithmetic import r_uint
 from pypy.translator.js.test.runtest import compile_function
 
 def test_simple_function_pointer(): 

Modified: pypy/dist/pypy/translator/js/test/test_typed.py
==============================================================================
--- pypy/dist/pypy/translator/js/test/test_typed.py	(original)
+++ pypy/dist/pypy/translator/js/test/test_typed.py	Tue Oct 31 17:22:11 2006
@@ -2,7 +2,7 @@
 import py
 from py.test import raises
 from pypy.translator.test import snippet 
-from pypy.rpython.rarithmetic import r_uint, ovfcheck, ovfcheck_lshift
+from pypy.rlib.rarithmetic import r_uint, ovfcheck, ovfcheck_lshift
 
 from pypy.translator.js.test.runtest import compile_function
 

Modified: pypy/dist/pypy/translator/llvm/test/test_exc_operation.py
==============================================================================
--- pypy/dist/pypy/translator/llvm/test/test_exc_operation.py	(original)
+++ pypy/dist/pypy/translator/llvm/test/test_exc_operation.py	Tue Oct 31 17:22:11 2006
@@ -1,7 +1,7 @@
 import sys
 
 import py
-from pypy.rpython.rarithmetic import r_uint, ovfcheck, ovfcheck_lshift
+from pypy.rlib.rarithmetic import r_uint, ovfcheck, ovfcheck_lshift
 from pypy.translator.test import snippet 
 
 from pypy.translator.llvm.test.runtest import *

Modified: pypy/dist/pypy/translator/llvm/test/test_exception.py
==============================================================================
--- pypy/dist/pypy/translator/llvm/test/test_exception.py	(original)
+++ pypy/dist/pypy/translator/llvm/test/test_exception.py	Tue Oct 31 17:22:11 2006
@@ -2,7 +2,7 @@
 
 import py
 from pypy.translator.test.snippet import try_raise_choose
-from pypy.rpython.rarithmetic import r_uint, ovfcheck, ovfcheck_lshift
+from pypy.rlib.rarithmetic import r_uint, ovfcheck, ovfcheck_lshift
 
 from pypy.translator.llvm.test.runtest import *
 

Modified: pypy/dist/pypy/translator/llvm/test/test_extfunc.py
==============================================================================
--- pypy/dist/pypy/translator/llvm/test/test_extfunc.py	(original)
+++ pypy/dist/pypy/translator/llvm/test/test_extfunc.py	Tue Oct 31 17:22:11 2006
@@ -5,7 +5,7 @@
 
 import py
 from pypy.tool.udir import udir
-from pypy.rpython.rarithmetic import r_uint
+from pypy.rlib.rarithmetic import r_uint
 from pypy.rlib import ros
 
 from pypy.translator.llvm.test.runtest import *
@@ -245,7 +245,7 @@
 def test_rarith_parts_to_float():
     if sys.maxint != 2**31-1:
         py.test.skip("WIP on 64 bit architectures") 
-    from pypy.rpython.rarithmetic import parts_to_float
+    from pypy.rlib.rarithmetic import parts_to_float
     parts = [
      ["" ,"1","" ,""],
      ["-","1","" ,""],
@@ -265,7 +265,7 @@
 def test_rarith_formatd():
     if sys.maxint != 2**31-1:
         py.test.skip("WIP on 64 bit architectures") 
-    from pypy.rpython.rarithmetic import formatd
+    from pypy.rlib.rarithmetic import formatd
     as_float  = [ 0.0  ,  1.5  ,  2.0  ]
     as_string = ["0.00", "1.50", "2.00"]
     def fn(i):

Modified: pypy/dist/pypy/translator/llvm/test/test_genllvm.py
==============================================================================
--- pypy/dist/pypy/translator/llvm/test/test_genllvm.py	(original)
+++ pypy/dist/pypy/translator/llvm/test/test_genllvm.py	Tue Oct 31 17:22:11 2006
@@ -3,7 +3,7 @@
 import sys
 
 import py
-from pypy.rpython.rarithmetic import r_uint
+from pypy.rlib.rarithmetic import r_uint
 
 from pypy.translator.llvm.test.runtest import *
 

Modified: pypy/dist/pypy/translator/llvm/test/test_lltype.py
==============================================================================
--- pypy/dist/pypy/translator/llvm/test/test_lltype.py	(original)
+++ pypy/dist/pypy/translator/llvm/test/test_lltype.py	Tue Oct 31 17:22:11 2006
@@ -3,7 +3,7 @@
 import py
 from pypy.rpython.lltypesystem.lltype import *
 from pypy.translator.llvm import database, codewriter
-from pypy.rpython import rarithmetic 
+from pypy.rlib import rarithmetic
 
 from pypy.translator.llvm.test.runtest import *
 

Modified: pypy/dist/pypy/translator/llvm/test/test_typed.py
==============================================================================
--- pypy/dist/pypy/translator/llvm/test/test_typed.py	(original)
+++ pypy/dist/pypy/translator/llvm/test/test_typed.py	Tue Oct 31 17:22:11 2006
@@ -3,7 +3,7 @@
 import py
 from py.test import raises
 from pypy.translator.test import snippet 
-from pypy.rpython.rarithmetic import r_uint, ovfcheck, ovfcheck_lshift
+from pypy.rlib.rarithmetic import r_uint, ovfcheck, ovfcheck_lshift
 
 from pypy.translator.llvm.test.runtest import *
 

Modified: pypy/dist/pypy/translator/oosupport/test_template/operations.py
==============================================================================
--- pypy/dist/pypy/translator/oosupport/test_template/operations.py	(original)
+++ pypy/dist/pypy/translator/oosupport/test_template/operations.py	Tue Oct 31 17:22:11 2006
@@ -1,4 +1,4 @@
-from pypy.rpython.rarithmetic import r_uint, r_ulonglong, r_longlong, ovfcheck
+from pypy.rlib.rarithmetic import r_uint, r_ulonglong, r_longlong, ovfcheck
 from pypy.rpython import rstack
 from pypy.annotation import model as annmodel
 import sys

Modified: pypy/dist/pypy/translator/simplify.py
==============================================================================
--- pypy/dist/pypy/translator/simplify.py	(original)
+++ pypy/dist/pypy/translator/simplify.py	Tue Oct 31 17:22:11 2006
@@ -110,7 +110,7 @@
     # this is the case if no exception handling was provided.
     # Otherwise, we have a block ending in the operation,
     # followed by a block with a single ovfcheck call.
-    from pypy.rpython.rarithmetic import ovfcheck, ovfcheck_lshift
+    from pypy.rlib.rarithmetic import ovfcheck, ovfcheck_lshift
     from pypy.objspace.flow.objspace import op_appendices
     from pypy.objspace.flow.objspace import implicit_exceptions
     covf = Constant(ovfcheck)

Modified: pypy/dist/pypy/translator/squeak/opformatter.py
==============================================================================
--- pypy/dist/pypy/translator/squeak/opformatter.py	(original)
+++ pypy/dist/pypy/translator/squeak/opformatter.py	Tue Oct 31 17:22:11 2006
@@ -1,4 +1,4 @@
-from pypy.rpython.rarithmetic import r_int, r_uint, r_longlong, r_ulonglong
+from pypy.rlib.rarithmetic import r_int, r_uint, r_longlong, r_ulonglong
 from pypy.translator.squeak.codeformatter import CodeFormatter
 from pypy.translator.squeak.codeformatter import Message, Self, Assignment, Field
 

Modified: pypy/dist/pypy/translator/squeak/test/test_llops.py
==============================================================================
--- pypy/dist/pypy/translator/squeak/test/test_llops.py	(original)
+++ pypy/dist/pypy/translator/squeak/test/test_llops.py	Tue Oct 31 17:22:11 2006
@@ -1,6 +1,6 @@
 import sys
 from pypy.translator.squeak.test.runtest import compile_function, squeak_checks
-from pypy.rpython.rarithmetic import r_uint, r_longlong, r_ulonglong
+from pypy.rlib.rarithmetic import r_uint, r_longlong, r_ulonglong
 from pypy.rpython.annlowlevel import LowLevelAnnotatorPolicy
 from pypy.rpython.lltypesystem.lloperation import llop
 from pypy.rpython.lltypesystem.lltype import Signed, Unsigned, Bool, Char, UniChar

Modified: pypy/dist/pypy/translator/stackless/code.py
==============================================================================
--- pypy/dist/pypy/translator/stackless/code.py	(original)
+++ pypy/dist/pypy/translator/stackless/code.py	Tue Oct 31 17:22:11 2006
@@ -1,5 +1,5 @@
 from pypy.rpython.lltypesystem import lltype, llmemory, lloperation
-from pypy.rpython import rarithmetic
+from pypy.rlib import rarithmetic
 from pypy.rpython import extfunctable
 from pypy.translator.stackless import frame
 from pypy.translator.stackless.frame import STATE_HEADER, SAVED_REFERENCE, STORAGE_TYPES_AND_FIELDS

Modified: pypy/dist/pypy/translator/stackless/transform.py
==============================================================================
--- pypy/dist/pypy/translator/stackless/transform.py	(original)
+++ pypy/dist/pypy/translator/stackless/transform.py	Tue Oct 31 17:22:11 2006
@@ -1,6 +1,6 @@
 from pypy.rpython.lltypesystem import lltype, llmemory
 from pypy.rpython.lltypesystem.lloperation import LL_OPERATIONS
-from pypy.rpython import rarithmetic, rclass, rmodel
+from pypy.rlib import rarithmetic, rclass, rmodel
 from pypy.translator.backendopt import support
 from pypy.objspace.flow import model
 from pypy.translator import unsimplify, simplify

Modified: pypy/dist/pypy/translator/test/snippet.py
==============================================================================
--- pypy/dist/pypy/translator/test/snippet.py	(original)
+++ pypy/dist/pypy/translator/test/snippet.py	Tue Oct 31 17:22:11 2006
@@ -1147,7 +1147,7 @@
     return istk.top(), sstk.top()
 
 
-from pypy.rpython.rarithmetic import ovfcheck, ovfcheck_lshift
+from pypy.rlib.rarithmetic import ovfcheck, ovfcheck_lshift
 
 def add_func(i=numtype):
     try:

