[pypy-svn] r57842 - pypy/branch/oo-jit/pypy/translator/jvm

[antocuni at codespeak.net]

Author: antocuni
Date: Fri Sep  5 14:08:22 2008
New Revision: 57842

Modified:
   pypy/branch/oo-jit/pypy/translator/jvm/cmpopcodes.py
   pypy/branch/oo-jit/pypy/translator/jvm/opcodes.py
Log:
ooisnull, oononnull and oois are handled by cmpopcodes.py, so they are not
needed in opcodes.py



Modified: pypy/branch/oo-jit/pypy/translator/jvm/cmpopcodes.py
==============================================================================
--- pypy/branch/oo-jit/pypy/translator/jvm/cmpopcodes.py	(original)
+++ pypy/branch/oo-jit/pypy/translator/jvm/cmpopcodes.py	Fri Sep  5 14:08:22 2008
@@ -1,6 +1,6 @@
 from pypy.translator.jvm.typesystem import \
      IFLT, IFLE, IFEQ, IFNE, IFGT, IFGE, \
-     IFNONNULL, IF_ACMPEQ, GOTO, ICONST, \
+     IFNULL, IFNONNULL, IF_ACMPEQ, GOTO, ICONST, \
      DCONST_0, DCMPG, LCONST_0, LCMP, \
      IF_ICMPLT, IF_ICMPLE, IF_ICMPEQ, IF_ICMPNE, IF_ICMPGT, IF_ICMPGE, \
      PYPYUINTCMP, PYPYULONGCMP
@@ -52,6 +52,7 @@
 
     # Double operand entries:
     'oononnull': [IFNONNULL],
+    'ooisnull': [IFNULL],
     'oois': [IF_ACMPEQ],
 
     'unichar_eq': [IF_ICMPEQ],

Modified: pypy/branch/oo-jit/pypy/translator/jvm/opcodes.py
==============================================================================
--- pypy/branch/oo-jit/pypy/translator/jvm/opcodes.py	(original)
+++ pypy/branch/oo-jit/pypy/translator/jvm/opcodes.py	Fri Sep  5 14:08:22 2008
@@ -77,9 +77,6 @@
     'oosend':                   [JvmCallMethod, StoreResult],
     'ooupcast':                 DoNothing,
     'oodowncast':               [DownCast, StoreResult],
-    'oois':                     'ref_is_eq',
-    'ooisnull':                 'is_null',
-    'oononnull':                'is_not_null',
     'instanceof':               [CastTo, StoreResult],
     'subclassof':               [PushAllArgs, jvm.SWAP, jvm.CLASSISASSIGNABLEFROM, StoreResult],
     'ooidentityhash':           [PushAllArgs, jvm.OBJHASHCODE, StoreResult],