[pypy-commit] pypy resume-refactor: (fijal, arigo) change resume_put to backend_put for backend operations

[fijal]

Author: Maciej Fijalkowski <fijall at gmail.com>
Branch: resume-refactor
Changeset: r66427:539d5f8c5ee9
Date: 2013-08-29 11:23 +0100
http://bitbucket.org/pypy/pypy/changeset/539d5f8c5ee9/

Log:	(fijal, arigo) change resume_put to backend_put for backend
	operations

diff --git a/rpython/jit/backend/llsupport/resumebuilder.py b/rpython/jit/backend/llsupport/resumebuilder.py
--- a/rpython/jit/backend/llsupport/resumebuilder.py
+++ b/rpython/jit/backend/llsupport/resumebuilder.py
@@ -38,7 +38,7 @@
         v = op.getarg(0)
         loc = self.regalloc.loc(v)
         pos = loc.get_jitframe_position()
-        self.newops.append(op.copy_and_change(rop.RESUME_PUT,
+        self.newops.append(op.copy_and_change(rop.BACKEND_PUT,
                                               args=[ConstInt(pos),
                                                     op.getarg(1),
                                                     op.getarg(2)]))
diff --git a/rpython/jit/backend/llsupport/test/test_resume.py b/rpython/jit/backend/llsupport/test/test_resume.py
--- a/rpython/jit/backend/llsupport/test/test_resume.py
+++ b/rpython/jit/backend/llsupport/test/test_resume.py
@@ -36,7 +36,7 @@
         expected_resume = parse("""
         []
         enter_frame(-1, descr=jitcode)
-        resume_put(28, 0, 2)
+        backend_put(28, 0, 2)
         leave_frame()
         """, namespace={'jitcode': jitcode}).operations
         equaloplists(descr.rd_loop_token.rd_bytecode, expected_resume)
diff --git a/rpython/jit/metainterp/resume2.py b/rpython/jit/metainterp/resume2.py
--- a/rpython/jit/metainterp/resume2.py
+++ b/rpython/jit/metainterp/resume2.py
@@ -23,7 +23,7 @@
                 self.enter_frame(op.getarg(0).getint(), descr)
             elif op.getopnum() == rop.LEAVE_FRAME:
                 self.leave_frame()
-            elif op.getopnum() == rop.RESUME_PUT:
+            elif op.getopnum() == rop.BACKEND_PUT:
                 self.put(op.getarg(0).getint(), op.getarg(1).getint(),
                          op.getarg(2).getint())
             else:
diff --git a/rpython/jit/metainterp/test/test_resume2.py b/rpython/jit/metainterp/test/test_resume2.py
--- a/rpython/jit/metainterp/test/test_resume2.py
+++ b/rpython/jit/metainterp/test/test_resume2.py
@@ -40,7 +40,7 @@
         resume_loop = parse("""
         []
         enter_frame(-1, descr=jitcode1)
-        resume_put(10, 0, 1)
+        backend_put(10, 0, 1)
         leave_frame()
         """, namespace={'jitcode1': jitcode})
         descr = Descr()
@@ -62,12 +62,12 @@
         resume_loop = parse("""
         []
         enter_frame(-1, descr=jitcode1)
-        resume_put(11, 0, 2)
+        backend_put(11, 0, 2)
         enter_frame(12, descr=jitcode2)
-        resume_put(12, 0, 3)
-        resume_put(8, 1, 4)
+        backend_put(12, 0, 3)
+        backend_put(8, 1, 4)
         leave_frame()
-        resume_put(10, 0, 1)
+        backend_put(10, 0, 1)
         leave_frame()
         """, namespace={'jitcode1': jitcode1, 'jitcode2': jitcode2})
         metainterp = MockMetaInterp()