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

arigo at codespeak.net arigo at codespeak.net
Tue Jan 9 14:00:56 CET 2007


Author: arigo
Date: Tue Jan  9 14:00:54 2007
New Revision: 36351

Modified:
   pypy/dist/pypy/jit/codegen/i386/conftest.py
   pypy/dist/pypy/jit/codegen/i386/rgenop.py
   pypy/dist/pypy/jit/codegen/model.py
Log:
(mwh, arigo)

Couple of minor tweaks.  The codegen/i386 tests pass again.


Modified: pypy/dist/pypy/jit/codegen/i386/conftest.py
==============================================================================
--- pypy/dist/pypy/jit/codegen/i386/conftest.py	(original)
+++ pypy/dist/pypy/jit/codegen/i386/conftest.py	Tue Jan  9 14:00:54 2007
@@ -5,7 +5,6 @@
 class Directory(py.test.collect.Directory):
 
     def run(self):
-        import py; py.test.skip("in-progress")
         try:
             processor = detect_cpu.autodetect()
         except detect_cpu.ProcessorAutodetectError, e:

Modified: pypy/dist/pypy/jit/codegen/i386/rgenop.py
==============================================================================
--- pypy/dist/pypy/jit/codegen/i386/rgenop.py	(original)
+++ pypy/dist/pypy/jit/codegen/i386/rgenop.py	Tue Jan  9 14:00:54 2007
@@ -905,9 +905,6 @@
     def add_case(self, gv_case):
         return self.replay_builder
 
-    def add_default(self):
-        return self.replay_builder
-
 class ReplayBuilder(GenBuilder):
 
     def __init__(self, rgenop):
@@ -963,10 +960,10 @@
     def enter_next_block(self, kinds, args_gv):
         return None
 
-    def jump_if_false(self, gv_condition):
+    def jump_if_false(self, gv_condition, args_gv):
         return self
 
-    def jump_if_true(self, gv_condition):
+    def jump_if_true(self, gv_condition, args_gv):
         return self
 
     def finish_and_return(self, sigtoken, gv_returnvar):
@@ -975,8 +972,9 @@
     def finish_and_goto(self, outputargs_gv, target):
         pass
 
-    def flexswitch(self, gv_exitswitch):
-        return ReplayFlexSwitch(self)
+    def flexswitch(self, gv_exitswitch, args_gv):
+        flexswitch = ReplayFlexSwitch(self)
+        return flexswitch, self
 
     def show_incremental_progress(self):
         pass

Modified: pypy/dist/pypy/jit/codegen/model.py
==============================================================================
--- pypy/dist/pypy/jit/codegen/model.py	(original)
+++ pypy/dist/pypy/jit/codegen/model.py	Tue Jan  9 14:00:54 2007
@@ -95,6 +95,7 @@
 
         Returns an instance of GenLabel that can later be jumped to.
         '''
+        raise NotImplementedError
 
     def jump_if_false(self, gv_condition, args_for_jump_gv):
         '''Make a fresh builder, insert in the current block a
@@ -106,13 +107,16 @@
         easier it must be closed before the fresh builder is used at
         all, and the first thing to call on the latter is
         start_writing().'''
+        raise NotImplementedError
 
     def jump_if_true(self, gv_condition, args_for_jump_gv):
         '''See above, with the obvious difference :)'''
+        raise NotImplementedError
 
     def finish_and_return(self, sigtoken, gv_returnvar):
         '''Emit the epilogue code for the function, and the code to
         return gv_returnvar.  This "closes" the current builder.'''
+        raise NotImplementedError
 
     def finish_and_goto(self, outputargs_gv, target):
         '''Insert an unconditional jump to target.
@@ -125,6 +129,7 @@
 
         This "closes" the current builder.
         '''
+        raise NotImplementedError
 
     def flexswitch(self, gv_exitswitch, args_gv):
         '''The Fun Stuff.
@@ -143,6 +148,7 @@
 
         This "closes" the current builder.
         '''
+        raise NotImplementedError
 
     def show_incremental_progress(self):
         '''Give some indication of the code that this instance has generated.
@@ -187,6 +193,7 @@
         entrypoint is the address of the new function as GenConst and
         inputargs_gv is the location of each argument on entry to the
         function.  name is for debugging purposes"""
+        raise NotImplementedError
 
     # all staticmethods commented out for the sake of the annotator
 
@@ -215,6 +222,7 @@
         The purpose of this is to reconstruct the knowledge of the
         locations of the GenVars at some later point in the code, any
         code actually generated during replaying is thrown away.'''
+        raise NotImplementedError
 
     #@staticmethod
     #def erasedType(T):
@@ -273,3 +281,4 @@
     def add_case(self, gv_case):
         '''Make a new builder that will be jumped to when the
         switched-on GenVar takes the value of the GenConst gv_case.'''
+        raise NotImplementedError



More information about the Pypy-commit mailing list