[pypy-commit] pypy vecopt: rpython hint, attach_bridge is now called stitch_bridge

[plan_rich]

Author: Richard Plangger <rich at pasra.at>
Branch: vecopt
Changeset: r78585:6b68821bc6e3
Date: 2015-07-17 17:30 +0200
http://bitbucket.org/pypy/pypy/changeset/6b68821bc6e3/

Log:	rpython hint, attach_bridge is now called stitch_bridge

diff --git a/rpython/jit/backend/llsupport/assembler.py b/rpython/jit/backend/llsupport/assembler.py
--- a/rpython/jit/backend/llsupport/assembler.py
+++ b/rpython/jit/backend/llsupport/assembler.py
@@ -69,7 +69,7 @@
         self.rtyper = cpu.rtyper
         self._debug = False
 
-    def attach_bridge(self, failargs, token):
+    def stitch_bridge(self, failargs, token):
         raise NotImplementedError
 
     def setup_once(self):
diff --git a/rpython/jit/backend/llsupport/llmodel.py b/rpython/jit/backend/llsupport/llmodel.py
--- a/rpython/jit/backend/llsupport/llmodel.py
+++ b/rpython/jit/backend/llsupport/llmodel.py
@@ -97,8 +97,8 @@
                                             inputargs, operations,
                                             looptoken, log=log)
 
-    def attach_bridge(self, faildescr, token):
-        self.assembler.attach_bridge(faildescr, token)
+    def stitch_bridge(self, faildescr, token):
+        self.assembler.stitch_bridge(faildescr, token)
 
     def _setup_frame_realloc(self, translate_support_code):
         FUNC_TP = lltype.Ptr(lltype.FuncType([llmemory.GCREF, lltype.Signed],
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
@@ -589,7 +589,7 @@
                                                        rawstart, fullsize)
         return AsmInfo(ops_offset, startpos + rawstart, codeendpos - startpos)
 
-    def attach_bridge(self, failargs, token):
+    def attach_bridge(self, faildescr, token):
         rawstart = self.materialize_loop(token)
         self.patch_jump_for_descr(faildescr, rawstart)
 
diff --git a/rpython/jit/metainterp/compile.py b/rpython/jit/metainterp/compile.py
--- a/rpython/jit/metainterp/compile.py
+++ b/rpython/jit/metainterp/compile.py
@@ -211,7 +211,7 @@
                                    version.operations, jitcell_token)
             record_loop_or_bridge(metainterp_sd, vl)
             for faildescr in version.faildescrs[1:]:
-                cpu.attach_bridge(faildescr, jitcell_token)
+                cpu.stitch_bridge(faildescr, jitcell_token)
     loop.versions = None
 
 def compile_retrace(metainterp, greenkey, start,