[pypy-svn] r61718 - pypy/branch/pyjitpl5/pypy/jit/metainterp

[fijal at codespeak.net]

Author: fijal
Date: Wed Feb 11 12:53:25 2009
New Revision: 61718

Modified:
   pypy/branch/pyjitpl5/pypy/jit/metainterp/codewriter.py
   pypy/branch/pyjitpl5/pypy/jit/metainterp/compile.py
   pypy/branch/pyjitpl5/pypy/jit/metainterp/dump.py
   pypy/branch/pyjitpl5/pypy/jit/metainterp/graphpage.py
   pypy/branch/pyjitpl5/pypy/jit/metainterp/history.py
   pypy/branch/pyjitpl5/pypy/jit/metainterp/optimize.py
   pypy/branch/pyjitpl5/pypy/jit/metainterp/rpyjitpl.py
Log:
fix imports


Modified: pypy/branch/pyjitpl5/pypy/jit/metainterp/codewriter.py
==============================================================================
--- pypy/branch/pyjitpl5/pypy/jit/metainterp/codewriter.py	(original)
+++ pypy/branch/pyjitpl5/pypy/jit/metainterp/codewriter.py	Wed Feb 11 12:53:25 2009
@@ -4,8 +4,8 @@
 from pypy.objspace.flow.model import Variable, Constant, Link, c_last_exception
 from pypy.rlib import objectmodel
 from pypy.rlib.objectmodel import we_are_translated
-from history import Const, getkind, getkind_num
-import heaptracker, support, history, optimize
+from pypy.jit.metainterp.history import Const, getkind, getkind_num
+from pypy.jit.metainterp import heaptracker, support, history, optimize
 
 import py
 from pypy.tool.ansi_print import ansi_log

Modified: pypy/branch/pyjitpl5/pypy/jit/metainterp/compile.py
==============================================================================
--- pypy/branch/pyjitpl5/pypy/jit/metainterp/compile.py	(original)
+++ pypy/branch/pyjitpl5/pypy/jit/metainterp/compile.py	Wed Feb 11 12:53:25 2009
@@ -4,8 +4,8 @@
 from pypy.rlib.objectmodel import we_are_translated
 from pypy.conftest import option
 
-from history import Graph, Jump, log, Box
-import optimize
+from pypy.jit.metainterp.history import Graph, Jump, log, Box
+from pypy.jit.metainterp import optimize
 
 
 def compile_new_loop(metainterp, old_loops, endliveboxes):

Modified: pypy/branch/pyjitpl5/pypy/jit/metainterp/dump.py
==============================================================================
--- pypy/branch/pyjitpl5/pypy/jit/metainterp/dump.py	(original)
+++ pypy/branch/pyjitpl5/pypy/jit/metainterp/dump.py	Wed Feb 11 12:53:25 2009
@@ -1,4 +1,4 @@
-import codewriter
+from pypy.jit.metainterp import codewriter
 
 
 class SourceIterator:

Modified: pypy/branch/pyjitpl5/pypy/jit/metainterp/graphpage.py
==============================================================================
--- pypy/branch/pyjitpl5/pypy/jit/metainterp/graphpage.py	(original)
+++ pypy/branch/pyjitpl5/pypy/jit/metainterp/graphpage.py	Wed Feb 11 12:53:25 2009
@@ -1,7 +1,7 @@
 
 from pypy.translator.tool.graphpage import GraphPage
 from pypy.translator.tool.make_dot import DotGen
-from history import Box
+from pypy.jit.metainterp.history import Box
 
 
 class ResOpGraphPage(GraphPage):

Modified: pypy/branch/pyjitpl5/pypy/jit/metainterp/history.py
==============================================================================
--- pypy/branch/pyjitpl5/pypy/jit/metainterp/history.py	(original)
+++ pypy/branch/pyjitpl5/pypy/jit/metainterp/history.py	Wed Feb 11 12:53:25 2009
@@ -356,7 +356,7 @@
 
     def show(self, in_stats=None, errmsg=None, highlightops={}):
         if in_stats is None:
-            from graphpage import ResOpGraphPage
+            from pypy.jit.metainterp.graphpage import ResOpGraphPage
             ResOpGraphPage([self], errmsg, highlightops).display()
         else:
             h = dict.fromkeys(self.operations)
@@ -507,7 +507,7 @@
             self.view()
 
     def view(self, errmsg=None, extragraphs=[], highlightops={}):
-        from graphpage import ResOpGraphPage
+        from pypy.jit.metainterp.graphpage import ResOpGraphPage
         graphs = self.get_all_graphs()
         for graph in extragraphs:
             if graph in graphs:

Modified: pypy/branch/pyjitpl5/pypy/jit/metainterp/optimize.py
==============================================================================
--- pypy/branch/pyjitpl5/pypy/jit/metainterp/optimize.py	(original)
+++ pypy/branch/pyjitpl5/pypy/jit/metainterp/optimize.py	Wed Feb 11 12:53:25 2009
@@ -1,7 +1,6 @@
-from history import Box, Const, ConstInt
-from history import MergePoint, ResOperation, Jump
-from heaptracker import always_pure_operations
-
+from pypy.jit.metainterp.history import (Box, Const, ConstInt,
+                                         MergePoint, ResOperation, Jump)
+from pypy.jit.metainterp.heaptracker import always_pure_operations
 
 class CancelInefficientLoop(Exception):
     pass

Modified: pypy/branch/pyjitpl5/pypy/jit/metainterp/rpyjitpl.py
==============================================================================
--- pypy/branch/pyjitpl5/pypy/jit/metainterp/rpyjitpl.py	(original)
+++ pypy/branch/pyjitpl5/pypy/jit/metainterp/rpyjitpl.py	Wed Feb 11 12:53:25 2009
@@ -4,10 +4,10 @@
 from pypy.rpython import annlowlevel
 from pypy.annotation import model as annmodel
 
-from pyjitpl import build_meta_interp, generate_bootstrapping_code, MIFrame
-from pyjitpl import debug_checks
-from history import ResOperation, Const, Box, BoxInt, log
-import history, specnode
+from pypy.jit.metainterp.pyjitpl import (build_meta_interp, debug_checks,
+                                         generate_bootstrapping_code, MIFrame)
+from pypy.jit.metainterp.history import ResOperation, Const, Box, BoxInt, log
+from pypy.jit.metainterp import history, specnode
 
 
 def rpython_ll_meta_interp(function, args, loops=None, **kwds):