[pypy-svn] r65792 - pypy/branch/pyjitpl5/pypy/jit/backend/x86

[arigo at codespeak.net]

Author: arigo
Date: Tue Jun 16 18:48:21 2009
New Revision: 65792

Modified:
   pypy/branch/pyjitpl5/pypy/jit/backend/x86/gc.py
   pypy/branch/pyjitpl5/pypy/jit/backend/x86/ri386setup.py
Log:
Fix for test_ri386_auto_encoding.


Modified: pypy/branch/pyjitpl5/pypy/jit/backend/x86/gc.py
==============================================================================
--- pypy/branch/pyjitpl5/pypy/jit/backend/x86/gc.py	(original)
+++ pypy/branch/pyjitpl5/pypy/jit/backend/x86/gc.py	Tue Jun 16 18:48:21 2009
@@ -451,7 +451,7 @@
         mc.write('\x74')             # JZ label_end
         mc.write(chr(bytes_count))
         start = mc.tell()
-        mc.PUSHAD()                  # 1 byte
+        mc.PUSHA()                   # 1 byte
         mc.PUSH(value_reg)           # 1 or 5 bytes
         mc.PUSH(base_reg)            # 1 or 5 bytes
         funcptr = llop.get_write_barrier_failing_case(self.WB_FUNCPTR)
@@ -459,7 +459,7 @@
         mc.CALL(rel32(funcaddr))     # 5 bytes
         mc.POP(eax)                  # 1 byte
         mc.POP(eax)                  # 1 byte
-        mc.POPAD()                   # 1 byte
+        mc.POPA()                    # 1 byte
                               # total: 11+(4?)+(4?) bytes
         assert mc.tell() == start + bytes_count
 

Modified: pypy/branch/pyjitpl5/pypy/jit/backend/x86/ri386setup.py
==============================================================================
--- pypy/branch/pyjitpl5/pypy/jit/backend/x86/ri386setup.py	(original)
+++ pypy/branch/pyjitpl5/pypy/jit/backend/x86/ri386setup.py	Tue Jun 16 18:48:21 2009
@@ -331,8 +331,8 @@
 PUSHF = Instruction()
 PUSHF.mode0(['\x9C'])
 
-PUSHAD = Instruction()
-PUSHAD.mode0(['\x60'])
+PUSHA = Instruction()
+PUSHA.mode0(['\x60'])
 
 POP = Instruction()
 POP.mode1(REG,   [register(1), '\x58'])
@@ -341,8 +341,8 @@
 POPF = Instruction()
 POPF.mode0(['\x9D'])
 
-POPAD = Instruction()
-POPAD.mode0(['\x61'])
+POPA = Instruction()
+POPA.mode0(['\x61'])
 
 IMUL = Instruction()
 IMUL.mode1(MODRM,  ['\xF7', orbyte(5<<3), modrm(1)])