[pypy-svn] r63619 - pypy/branch/pyjitpl5-simplify/pypy/jit/backend/x86

[fijal at codespeak.net]

Author: fijal
Date: Sat Apr  4 17:37:49 2009
New Revision: 63619

Modified:
   pypy/branch/pyjitpl5-simplify/pypy/jit/backend/x86/regalloc.py
   pypy/branch/pyjitpl5-simplify/pypy/jit/backend/x86/runner.py
Log:
A couple of asserts of classes for translation


Modified: pypy/branch/pyjitpl5-simplify/pypy/jit/backend/x86/regalloc.py
==============================================================================
--- pypy/branch/pyjitpl5-simplify/pypy/jit/backend/x86/regalloc.py	(original)
+++ pypy/branch/pyjitpl5-simplify/pypy/jit/backend/x86/regalloc.py	Sat Apr  4 17:37:49 2009
@@ -823,10 +823,16 @@
     consider_call_pure = consider_call
 
     def consider_new(self, op, ignored):
-        return self._call(op, [imm(op.descr.v[0])])
+        from pypy.jit.backend.x86.runner import ConstDescr3
+        descr = op.descr
+        assert isinstance(descr, ConstDescr3)
+        return self._call(op, [imm(descr.v[0])])
 
     def consider_new_with_vtable(self, op, ignored):
-        return self._call(op, [imm(op.descr.v[0]), self.loc(op.args[0])])
+        from pypy.jit.backend.x86.runner import ConstDescr3
+        descr = op.descr
+        assert isinstance(descr, ConstDescr3)
+        return self._call(op, [imm(descr.v[0]), self.loc(op.args[0])])
 
     def consider_newstr(self, op, ignored):
         ofs_items, _, ofs = symbolic.get_array_token(rstr.STR, self.translate_support_code)

Modified: pypy/branch/pyjitpl5-simplify/pypy/jit/backend/x86/runner.py
==============================================================================
--- pypy/branch/pyjitpl5-simplify/pypy/jit/backend/x86/runner.py	(original)
+++ pypy/branch/pyjitpl5-simplify/pypy/jit/backend/x86/runner.py	Sat Apr  4 17:37:49 2009
@@ -507,6 +507,7 @@
 
     def do_call(self, args, calldescr):
         num_args, size, ptr = self.unpack_calldescr(calldescr)
+        assert isinstance(calldescr, ConstDescr3)
         loop = self._get_loop_for_call(num_args, calldescr, ptr)
         op = self.execute_operations(loop, args)
         if size == 0: