[pypy-svn] pypy default: merge heads

[antocuni]

Author: Antonio Cuni <anto.cuni at gmail.com>
Branch: 
Changeset: r43292:21463a3965de
Date: 2011-04-11 11:05 +0000
http://bitbucket.org/pypy/pypy/changeset/21463a3965de/

Log:	merge heads

diff --git a/pypy/jit/backend/x86/assembler.py b/pypy/jit/backend/x86/assembler.py
--- a/pypy/jit/backend/x86/assembler.py
+++ b/pypy/jit/backend/x86/assembler.py
@@ -1849,9 +1849,6 @@
     def implement_guard(self, guard_token, condition=None):
         # These jumps are patched later.
         if condition:
-            if condition not in ['B', 'E', 'BE']:
-                # this is a hint "branch not taken
-                self.mc.writechar('\x2E')
             self.mc.J_il(rx86.Conditions[condition], 0)
         else:
             self.mc.JMP_l(0)