[pypy-commit] pypy guard-compatible: Use the existing style: rename setup_once to build_once

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: guard-compatible
Changeset: r84660:55afd0f027f1
Date: 2016-05-24 17:22 +0200
http://bitbucket.org/pypy/pypy/changeset/55afd0f027f1/

Log:	Use the existing style: rename setup_once to build_once

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
@@ -143,6 +143,8 @@
                                               track_allocation=False)
         self.gcmap_for_finish[0] = r_uint(1)
 
+        self._build_guard_compat_slowpath()
+
     def setup(self, looptoken):
         if self.cpu.HAS_CODEMAP:
             self.codemap_builder = CodemapBuilder()
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
@@ -69,7 +69,6 @@
 
     def setup_once(self):
         BaseAssembler.setup_once(self)
-        guard_compat.setup_once(self)
         if self.cpu.supports_floats:
             support.ensure_sse2_floats()
             self._build_float_constants()
@@ -2072,6 +2071,9 @@
         self.failure_recovery_code[exc + 2 * withfloats] = rawstart
         self.mc = None
 
+    def _build_guard_compat_slowpath(self):
+        guard_compat.build_once(self)
+
     def genop_finish(self, op, arglocs, result_loc):
         base_ofs = self.cpu.get_baseofs_of_frame_field()
         if len(arglocs) > 0:
diff --git a/rpython/jit/backend/x86/guard_compat.py b/rpython/jit/backend/x86/guard_compat.py
--- a/rpython/jit/backend/x86/guard_compat.py
+++ b/rpython/jit/backend/x86/guard_compat.py
@@ -174,7 +174,7 @@
     assert 0 < offset <= 127
     mc.overwrite(jmp_location-1, chr(offset))
 
-def setup_once(assembler):
+def build_once(assembler):
     """Generate the 'search_tree' block of code"""
     rax = regloc.eax.value
     rdx = regloc.edx.value