[pypy-svn] r68075 - in pypy/branch/floats-via-sse2/pypy/jit/backend/x86: . test

[fijal at codespeak.net]

Author: fijal
Date: Thu Oct  1 00:24:55 2009
New Revision: 68075

Modified:
   pypy/branch/floats-via-sse2/pypy/jit/backend/x86/ri386setup.py
   pypy/branch/floats-via-sse2/pypy/jit/backend/x86/test/test_ri386_auto_encoding.py
Log:
I think this is correct encoding, not sure...


Modified: pypy/branch/floats-via-sse2/pypy/jit/backend/x86/ri386setup.py
==============================================================================
--- pypy/branch/floats-via-sse2/pypy/jit/backend/x86/ri386setup.py	(original)
+++ pypy/branch/floats-via-sse2/pypy/jit/backend/x86/ri386setup.py	Thu Oct  1 00:24:55 2009
@@ -489,10 +489,10 @@
 FUCOMPP = Instruction()
 FUCOMPP.mode0(['\xDA\xE9'])
 
-FSTPL = Instruction()
-FSTPL.mode1(MODRM64, ['\xDD', orbyte(3<<3), modrm(1)])
-FSTL = Instruction()
-FSTL.mode1(MODRM64, ['\xDD', orbyte(2<<3), modrm(1)])
+FSTP = Instruction()
+FSTP.mode1(MODRM64, ['\xDD', orbyte(3<<3), modrm(1)])
+FST = Instruction()
+FST.mode1(MODRM64, ['\xDD', orbyte(2<<3), modrm(1)])
 
 FISTP = Instruction()
 FISTP.mode1(MODRM, ['\xDB', orbyte(3<<3), modrm(1)])

Modified: pypy/branch/floats-via-sse2/pypy/jit/backend/x86/test/test_ri386_auto_encoding.py
==============================================================================
--- pypy/branch/floats-via-sse2/pypy/jit/backend/x86/test/test_ri386_auto_encoding.py	(original)
+++ pypy/branch/floats-via-sse2/pypy/jit/backend/x86/test/test_ri386_auto_encoding.py	Thu Oct  1 00:24:55 2009
@@ -141,8 +141,10 @@
         all = instr.as_all_suffixes
         for m, extra in args:
             if m in (i386.MODRM, i386.MODRM8) or all:
-                if not instrname == 'FNSTCW':
+                if instrname != 'FNSTCW':
                     suffix = suffixes[sizes[m]] + suffix
+            if m is i386.MODRM64 and instrname in ['FST', 'FSTP']:
+                suffix = 'l'
         following = ""
         if instr.indirect:
             suffix = ""