[pypy-svn] r61835 - pypy/branch/pyjitpl5/pypy/jit/backend/x86

[arigo at codespeak.net]

Author: arigo
Date: Fri Feb 13 16:21:16 2009
New Revision: 61835

Added:
   pypy/branch/pyjitpl5/pypy/jit/backend/x86/ri386.py
      - copied unchanged from r61746, pypy/branch/oo-jit/pypy/jit/codegen/i386/ri386.py
   pypy/branch/pyjitpl5/pypy/jit/backend/x86/ri386setup.py
      - copied unchanged from r61746, pypy/branch/oo-jit/pypy/jit/codegen/i386/ri386setup.py
Modified:
   pypy/branch/pyjitpl5/pypy/jit/backend/x86/assembler.py
   pypy/branch/pyjitpl5/pypy/jit/backend/x86/regalloc.py
Log:
Fix some (random) imports by copying ri386*.py from the oo-jit branch.


Modified: pypy/branch/pyjitpl5/pypy/jit/backend/x86/assembler.py
==============================================================================
--- pypy/branch/pyjitpl5/pypy/jit/backend/x86/assembler.py	(original)
+++ pypy/branch/pyjitpl5/pypy/jit/backend/x86/assembler.py	Fri Feb 13 16:21:16 2009
@@ -1,6 +1,6 @@
 import sys
 import ctypes
-from pypy.jit.codegen.i386.ri386 import *
+from pypy.jit.backend.x86.ri386 import *
 from codegen386 import symbolic
 from history import Const, ConstInt, Box, MergePoint
 from pypy.rpython.lltypesystem import lltype, rffi, ll2ctypes, rstr
@@ -10,8 +10,8 @@
 from codegen386.regalloc import RegAlloc, FRAMESIZE, WORD, REGS
 from codegen386.regalloc import arg_pos, lower_byte, stack_pos, Perform
 from pypy.rlib.objectmodel import we_are_translated, specialize
-from pypy.jit.codegen.i386 import codebuf
-from pypy.jit.codegen.i386.rgenop import gc_malloc_fnaddr
+from pypy.jit.backend.x86 import codebuf
+from pypy.jit.backend.x86.rgenop import gc_malloc_fnaddr
 
 # our calling convention - we pass three first args as edx, ecx and eax
 # and the rest stays on stack

Modified: pypy/branch/pyjitpl5/pypy/jit/backend/x86/regalloc.py
==============================================================================
--- pypy/branch/pyjitpl5/pypy/jit/backend/x86/regalloc.py	(original)
+++ pypy/branch/pyjitpl5/pypy/jit/backend/x86/regalloc.py	Fri Feb 13 16:21:16 2009
@@ -4,7 +4,7 @@
 
 from history import Box, Const, ConstInt, ConstPtr, ResOperation, MergePoint,\
      ConstAddr
-from pypy.jit.codegen.i386.ri386 import *
+from pypy.jit.backend.x86.ri386 import *
 from pypy.rpython.lltypesystem import lltype, ll2ctypes, rffi
 from pypy.rlib.objectmodel import we_are_translated
 from pypy.rlib.unroll import unrolling_iterable