[pypy-commit] pypy jitframe-on-heap: merge

[fijal]

Author: Maciej Fijalkowski <fijall at gmail.com>
Branch: jitframe-on-heap
Changeset: r60808:d9931f21e284
Date: 2013-02-01 14:03 +0200
http://bitbucket.org/pypy/pypy/changeset/d9931f21e284/

Log:	merge

diff --git a/rpython/jit/backend/x86/assembler.py b/rpython/jit/backend/x86/assembler.py
--- a/rpython/jit/backend/x86/assembler.py
+++ b/rpython/jit/backend/x86/assembler.py
@@ -874,10 +874,10 @@
             xxx
         self.mc.ADD_ri(ebx.value, WORD)
         if rx86.fits_in_32bits(rst):
-            self.mc.MOV_jr(rst, ebx.value)            # MOV [rootstacktop], edx
+            self.mc.MOV_jr(rst, ebx.value)            # MOV [rootstacktop], ebx
         else:
             self.mc.MOV_mr((X86_64_SCRATCH_REG.value, 0),
-                           ebx.value) # MOV [r11], edx
+                           ebx.value) # MOV [r11], ebx
 
     def _call_footer_shadowstack(self, gcrootmap):
         rst = gcrootmap.get_root_stack_top_addr()