[pypy-svn] r74746 - in pypy/branch/blackhole-improvement/pypy/jit/codewriter: . test

[arigo at codespeak.net]

Author: arigo
Date: Tue May 25 20:28:36 2010
New Revision: 74746

Modified:
   pypy/branch/blackhole-improvement/pypy/jit/codewriter/format.py
   pypy/branch/blackhole-improvement/pypy/jit/codewriter/jitcode.py
   pypy/branch/blackhole-improvement/pypy/jit/codewriter/test/test_jitcode.py
Log:
Clean up format.py.


Modified: pypy/branch/blackhole-improvement/pypy/jit/codewriter/format.py
==============================================================================
--- pypy/branch/blackhole-improvement/pypy/jit/codewriter/format.py	(original)
+++ pypy/branch/blackhole-improvement/pypy/jit/codewriter/format.py	Tue May 25 20:28:36 2010
@@ -54,12 +54,14 @@
         insns = insns[:-1]
     for i, asm in enumerate(insns):
         if ssarepr._insns_pos:
-            print >> output, '%4d ' % ssarepr._insns_pos[i],
+            prefix = '%4d  ' % ssarepr._insns_pos[i]
+        else:
+            prefix = ''
         if isinstance(asm[0], Label):
             if asm[0].name in seenlabels:
-                print >> output, '%s:' % getlabelname(asm[0])
+                print >> output, prefix + '%s:' % getlabelname(asm[0])
         else:
-            print >> output, asm[0],
+            print >> output, prefix + asm[0],
             if len(asm) > 1:
                 if asm[-2] == '->':
                     if len(asm) == 3:

Modified: pypy/branch/blackhole-improvement/pypy/jit/codewriter/jitcode.py
==============================================================================
--- pypy/branch/blackhole-improvement/pypy/jit/codewriter/jitcode.py	(original)
+++ pypy/branch/blackhole-improvement/pypy/jit/codewriter/jitcode.py	Tue May 25 20:28:36 2010
@@ -59,11 +59,11 @@
         # for testing only
         info = self.get_live_vars_info(pc)
         lst_i = ['%%i%d' % info.get_register_index_i(index)
-                 for index in range(info.get_register_count_i())]
+                 for index in range(info.get_register_count_i()-1, -1, -1)]
         lst_r = ['%%r%d' % info.get_register_index_r(index)
-                 for index in range(info.get_register_count_r())]
+                 for index in range(info.get_register_count_r()-1, -1, -1)]
         lst_f = ['%%f%d' % info.get_register_index_f(index)
-                 for index in range(info.get_register_count_f())]
+                 for index in range(info.get_register_count_f()-1, -1, -1)]
         return ' '.join(lst_i + lst_r + lst_f)
 
     def _missing_liveness(self, pc):

Modified: pypy/branch/blackhole-improvement/pypy/jit/codewriter/test/test_jitcode.py
==============================================================================
--- pypy/branch/blackhole-improvement/pypy/jit/codewriter/test/test_jitcode.py	(original)
+++ pypy/branch/blackhole-improvement/pypy/jit/codewriter/test/test_jitcode.py	Tue May 25 20:28:36 2010
@@ -21,4 +21,4 @@
     j.setup(liveness={5: (" A", "b", "CD")})
     assert j.has_liveness_info(5)
     assert not j.has_liveness_info(4)
-    assert j._live_vars(5) == "%i65 %i32 %r98 %f68 %f67"
+    assert j._live_vars(5) == "%i32 %i65 %r98 %f67 %f68"