[pypy-svn] r75903 - pypy/branch/x86-64-jit-backend/pypy/jit/backend/x86

[jcreigh at codespeak.net]

Author: jcreigh
Date: Tue Jul  6 14:29:59 2010
New Revision: 75903

Modified:
   pypy/branch/x86-64-jit-backend/pypy/jit/backend/x86/arch.py
   pypy/branch/x86-64-jit-backend/pypy/jit/backend/x86/assembler.py
Log:
minor comment cleanups

Modified: pypy/branch/x86-64-jit-backend/pypy/jit/backend/x86/arch.py
==============================================================================
--- pypy/branch/x86-64-jit-backend/pypy/jit/backend/x86/arch.py	(original)
+++ pypy/branch/x86-64-jit-backend/pypy/jit/backend/x86/arch.py	Tue Jul  6 14:29:59 2010
@@ -3,13 +3,15 @@
 import sys
 if sys.maxint == (2**31 - 1):
     WORD = 4
-    FRAME_FIXED_SIZE = 5     # ebp + ebx + esi + edi + force_index = 5 words
-    FORCE_INDEX_OFS = -4*WORD
+    # ebp + ebx + esi + edi + force_index = 5 words
+    FRAME_FIXED_SIZE = 5
     IS_X86_32 = True
     IS_X86_64 = False
 else:
     WORD = 8
+    # rbp + rbx + r12 + r13 + r14 + r15 + force_index = 7 words
     FRAME_FIXED_SIZE = 7
-    FORCE_INDEX_OFS = -6*WORD
     IS_X86_32 = False
     IS_X86_64 = True
+
+FORCE_INDEX_OFS = -(FRAME_FIXED_SIZE-1)*WORD

Modified: pypy/branch/x86-64-jit-backend/pypy/jit/backend/x86/assembler.py
==============================================================================
--- pypy/branch/x86-64-jit-backend/pypy/jit/backend/x86/assembler.py	(original)
+++ pypy/branch/x86-64-jit-backend/pypy/jit/backend/x86/assembler.py	Tue Jul  6 14:29:59 2010
@@ -31,9 +31,6 @@
 from pypy.rlib import rgc
 from pypy.jit.backend.x86.jump import remap_frame_layout
 
-# our calling convention - we pass first 6 args in registers
-# and the rest stays on the stack
-
 # darwin requires the stack to be 16 bytes aligned on calls. Same for gcc 4.5.0,
 # better safe than sorry
 CALL_ALIGN = 16 // WORD
@@ -499,6 +496,8 @@
                 self.mc.MOVSD(loc, X86_64_XMM_SCRATCH_REG)
             else:
                 self.mc.MOV_rb(X86_64_SCRATCH_REG.value, (2 + i) * WORD)
+                # XXX: We're assuming that "loc" won't require regloc to
+                # clobber the scratch register
                 self.mc.MOV(loc, X86_64_SCRATCH_REG)
 
         self.mc.JMP(imm(jmpadr))