[pypy-svn] r33127 - in pypy/dist/pypy/jit/codegen/i386: . test

[arigo at codespeak.net]

Author: arigo
Date: Tue Oct 10 18:43:38 2006
New Revision: 33127

Added:
   pypy/dist/pypy/jit/codegen/i386/rgenop.py
      - copied unchanged from r33124, pypy/dist/pypy/jit/codegen/i386/ri386genop.py
   pypy/dist/pypy/jit/codegen/i386/test/test_rgenop.py
      - copied, changed from r33124, pypy/dist/pypy/jit/codegen/i386/test/test_ri386genop.py
Removed:
   pypy/dist/pypy/jit/codegen/i386/ri386genop.py
   pypy/dist/pypy/jit/codegen/i386/test/test_ri386genop.py
Modified:
   pypy/dist/pypy/jit/codegen/i386/codebuf.py
   pypy/dist/pypy/jit/codegen/i386/ri386.py
   pypy/dist/pypy/jit/codegen/i386/ri386setup.py
   pypy/dist/pypy/jit/codegen/i386/test/test_auto_encoding.py
   pypy/dist/pypy/jit/codegen/i386/test/test_genc_ts.py
   pypy/dist/pypy/jit/codegen/i386/test/test_interp_ts.py
   pypy/dist/pypy/jit/codegen/i386/test/test_operation.py
   pypy/dist/pypy/jit/codegen/i386/test/test_ri386.py
Log:
Some renamings of a class and a file for clarification.


Modified: pypy/dist/pypy/jit/codegen/i386/codebuf.py
==============================================================================
--- pypy/dist/pypy/jit/codegen/i386/codebuf.py	(original)
+++ pypy/dist/pypy/jit/codegen/i386/codebuf.py	Tue Oct 10 18:43:38 2006
@@ -1,6 +1,6 @@
 import os
 from ctypes import POINTER, cast, c_char, c_void_p, CFUNCTYPE, c_int
-from ri386 import AbstractCodeBuilder
+from ri386 import I386CodeBuilder
 
 
 modname = 'pypy.jit.codegen.i386.codebuf_' + os.name
@@ -12,7 +12,7 @@
 class CodeBlockOverflow(Exception):
     pass
 
-class MachineCodeBlock(AbstractCodeBuilder):
+class MachineCodeBlock(I386CodeBuilder):
 
     def __init__(self, map_size):
         res = memhandler.alloc(map_size)
@@ -48,7 +48,7 @@
 
 BUF = lltype.GcArray(lltype.Char)
 
-class LLTypeMachineCodeBlock(AbstractCodeBuilder):
+class LLTypeMachineCodeBlock(I386CodeBuilder):
     # for testing only
 
     class State:

Modified: pypy/dist/pypy/jit/codegen/i386/ri386.py
==============================================================================
--- pypy/dist/pypy/jit/codegen/i386/ri386.py	(original)
+++ pypy/dist/pypy/jit/codegen/i386/ri386.py	Tue Oct 10 18:43:38 2006
@@ -242,7 +242,7 @@
 # __________________________________________________________
 # Abstract base class, with methods like NOP(), ADD(x, y), etc.
 
-class AbstractCodeBuilder(object):
+class I386CodeBuilder(object):
 
     def write(self, data):
         raise NotImplementedError
@@ -251,4 +251,4 @@
         raise NotImplementedError
 
 
-import ri386setup  # side-effect: add methods to AbstractCodeBuilder
+import ri386setup  # side-effect: add methods to I386CodeBuilder

Modified: pypy/dist/pypy/jit/codegen/i386/ri386setup.py
==============================================================================
--- pypy/dist/pypy/jit/codegen/i386/ri386setup.py	(original)
+++ pypy/dist/pypy/jit/codegen/i386/ri386setup.py	Tue Oct 10 18:43:38 2006
@@ -1,6 +1,6 @@
 """
 List of i386 instructions.
-This module contains the logic to set up the AbstractCodeBuilder multimethods.
+This module contains the logic to set up the I386CodeBuilder multimethods.
 Not for direct importing.
 """
 from ri386 import *
@@ -197,7 +197,7 @@
             mmmin = min([len(mm) for mm in self.modes])
             if mmmin < arity:
                 encoder.func_defaults = (missing,) * (arity - mmmin)
-        setattr(AbstractCodeBuilder, name, encoder)
+        setattr(I386CodeBuilder, name, encoder)
 
     def __repr__(self):
         return '<%s>' % self.name

Modified: pypy/dist/pypy/jit/codegen/i386/test/test_auto_encoding.py
==============================================================================
--- pypy/dist/pypy/jit/codegen/i386/test/test_auto_encoding.py	(original)
+++ pypy/dist/pypy/jit/codegen/i386/test/test_auto_encoding.py	Tue Oct 10 18:43:38 2006
@@ -216,7 +216,7 @@
     return string.join(["%02X" % ord(c) for c in s], " ")
 
 
-class CodeChecker(i386.AbstractCodeBuilder):
+class CodeChecker(i386.I386CodeBuilder):
     
     def __init__(self, expected):
         self.expected = expected

Modified: pypy/dist/pypy/jit/codegen/i386/test/test_genc_ts.py
==============================================================================
--- pypy/dist/pypy/jit/codegen/i386/test/test_genc_ts.py	(original)
+++ pypy/dist/pypy/jit/codegen/i386/test/test_genc_ts.py	Tue Oct 10 18:43:38 2006
@@ -5,7 +5,7 @@
 from pypy.jit.timeshifter.test import test_timeshift
 from pypy.translator.c.genc import CStandaloneBuilder
 from pypy.rpython.unroll import unrolling_iterable
-from pypy.jit.codegen.i386.ri386genop import RI386GenOp
+from pypy.jit.codegen.i386.rgenop import RI386GenOp
 from pypy.jit.conftest import Benchmark
 
 

Modified: pypy/dist/pypy/jit/codegen/i386/test/test_interp_ts.py
==============================================================================
--- pypy/dist/pypy/jit/codegen/i386/test/test_interp_ts.py	(original)
+++ pypy/dist/pypy/jit/codegen/i386/test/test_interp_ts.py	Tue Oct 10 18:43:38 2006
@@ -1,7 +1,7 @@
 import os
 from pypy.annotation import model as annmodel
 from pypy.jit.timeshifter.test import test_timeshift
-from pypy.jit.codegen.i386.ri386genop import RI386GenOp, IntConst
+from pypy.jit.codegen.i386.rgenop import RI386GenOp, IntConst
 from pypy.jit.codegen.i386.test.test_operation import RGenOpPacked
 
 

Modified: pypy/dist/pypy/jit/codegen/i386/test/test_operation.py
==============================================================================
--- pypy/dist/pypy/jit/codegen/i386/test/test_operation.py	(original)
+++ pypy/dist/pypy/jit/codegen/i386/test/test_operation.py	Tue Oct 10 18:43:38 2006
@@ -4,7 +4,7 @@
 from pypy.rpython.lltypesystem import lltype
 from pypy.translator.translator import TranslationContext, graphof
 from pypy.jit.codegen import graph2rgenop
-from pypy.jit.codegen.i386.ri386genop import RI386GenOp
+from pypy.jit.codegen.i386.rgenop import RI386GenOp
 from pypy.rpython.memory.lltypelayout import convert_offset_to_int
 from ctypes import cast, c_void_p, CFUNCTYPE, c_int
 

Modified: pypy/dist/pypy/jit/codegen/i386/test/test_ri386.py
==============================================================================
--- pypy/dist/pypy/jit/codegen/i386/test/test_ri386.py	(original)
+++ pypy/dist/pypy/jit/codegen/i386/test/test_ri386.py	Tue Oct 10 18:43:38 2006
@@ -1,7 +1,7 @@
 import py
 from pypy.jit.codegen.i386.ri386 import *
 
-class CodeBuilder(AbstractCodeBuilder):
+class CodeBuilder(I386CodeBuilder):
     def __init__(self):
         self.buffer = []