[pypy-svn] r46215 - in pypy/dist/pypy/translator/jvm: . test
antocuni at codespeak.net
antocuni at codespeak.net
Fri Aug 31 13:55:00 CEST 2007
Author: antocuni
Date: Fri Aug 31 13:54:57 2007
New Revision: 46215
Modified:
pypy/dist/pypy/translator/jvm/generator.py
pypy/dist/pypy/translator/jvm/opcodes.py
pypy/dist/pypy/translator/jvm/test/test_op.py
Log:
don't forget to StoreResult after having computed it. This makes
test_and_or passing
Modified: pypy/dist/pypy/translator/jvm/generator.py
==============================================================================
--- pypy/dist/pypy/translator/jvm/generator.py (original)
+++ pypy/dist/pypy/translator/jvm/generator.py Fri Aug 31 13:54:57 2007
@@ -1342,7 +1342,7 @@
return str(arg)
strargs = [jasmin_syntax(arg) for arg in args]
instr_text = '%s %s' % (jvmstr, " ".join(strargs))
- self.curclass.out(' .line %d\n' % self.curfunc.instr_counter)
+ #self.curclass.out(' .line %d\n' % self.curfunc.instr_counter)
self.curclass.out(' %-60s\n' % (instr_text,))
self.curfunc.instr_counter+=1
Modified: pypy/dist/pypy/translator/jvm/opcodes.py
==============================================================================
--- pypy/dist/pypy/translator/jvm/opcodes.py (original)
+++ pypy/dist/pypy/translator/jvm/opcodes.py Fri Aug 31 13:54:57 2007
@@ -154,9 +154,7 @@
'uint_rshift': jvmgen.IUSHR,
'uint_xor': jvmgen.IXOR,
- 'float_is_true': [PushAllArgs,
- jvmgen.DCONST_0,
- 'dbl_not_equals'],
+ 'float_is_true': [PushAllArgs, jvmgen.DCONST_0, 'dbl_not_equals', StoreResult],
'float_neg': jvmgen.DNEG,
'float_abs': 'dbl_abs',
@@ -172,9 +170,7 @@
'float_gt': 'dbl_greater_than',
'float_ge': 'dbl_greater_equals',
- 'llong_is_true': [PushAllArgs,
- jvmgen.LCONST_0,
- 'long_not_equals'],
+ 'llong_is_true': [PushAllArgs, jvmgen.LCONST_0, 'long_not_equals', StoreResult],
'llong_neg': jvmgen.LNEG,
'llong_neg_ovf': jvmgen.LNEGOVF,
'llong_abs': jvmgen.MATHLABS,
@@ -205,9 +201,7 @@
'llong_mod_ovf': jvmgen.LREMOVF,
'llong_lshift_ovf': jvmgen.LSHLOVF,
- 'ullong_is_true': [PushAllArgs,
- jvmgen.LCONST_0,
- 'long_not_equals'],
+ 'ullong_is_true': [PushAllArgs, jvmgen.LCONST_0, 'long_not_equals', StoreResult],
'ullong_invert': jvmgen.PYPYLONGBITWISENEGATE,
'ullong_add': jvmgen.LADD,
Modified: pypy/dist/pypy/translator/jvm/test/test_op.py
==============================================================================
--- pypy/dist/pypy/translator/jvm/test/test_op.py (original)
+++ pypy/dist/pypy/translator/jvm/test/test_op.py Fri Aug 31 13:54:57 2007
@@ -6,9 +6,6 @@
class TestOperations(JvmTest, BaseTestOperations):
- def test_and_not(self):
- py.test.skip("VerifyError happens. Accessing uninit reg")
-
def test_modulo(self):
py.test.skip("Backend lacks appropriate precision")
More information about the Pypy-commit
mailing list