Author: David Schneider <[email protected]>
Branch: jitframe-on-heap
Changeset: r61256:28c020a9f122
Date: 2013-02-15 14:44 +0100
http://bitbucket.org/pypy/pypy/changeset/28c020a9f122/
Log: rename _{arm,x86}_loop_code variable to _ll_loop_code
diff --git a/rpython/jit/backend/arm/assembler.py
b/rpython/jit/backend/arm/assembler.py
--- a/rpython/jit/backend/arm/assembler.py
+++ b/rpython/jit/backend/arm/assembler.py
@@ -602,7 +602,7 @@
clt.allgcrefs)
loop_head = self.mc.get_relative_pos()
- looptoken._arm_loop_code = loop_head
+ looptoken._ll_loop_code = loop_head
#
frame_depth_no_fixed_size = self._assemble(regalloc, inputargs,
operations)
self.update_frame_depth(frame_depth_no_fixed_size +
JITFRAME_FIXED_SIZE)
@@ -815,7 +815,7 @@
def fixup_target_tokens(self, rawstart):
for targettoken in self.target_tokens_currently_compiling:
- targettoken._arm_loop_code += rawstart
+ targettoken._ll_loop_code += rawstart
self.target_tokens_currently_compiling = None
def _patch_stackadjust(self, adr, allocated_depth):
diff --git a/rpython/jit/backend/arm/opassembler.py
b/rpython/jit/backend/arm/opassembler.py
--- a/rpython/jit/backend/arm/opassembler.py
+++ b/rpython/jit/backend/arm/opassembler.py
@@ -306,7 +306,7 @@
# stack locations both before and after the jump.
#
target_token = op.getdescr()
- target = target_token._arm_loop_code
+ target = target_token._ll_loop_code
assert isinstance(target_token, TargetToken)
assert fcond == c.AL
my_nbargs = self.current_clt._debug_nbargs
diff --git a/rpython/jit/backend/arm/regalloc.py
b/rpython/jit/backend/arm/regalloc.py
--- a/rpython/jit/backend/arm/regalloc.py
+++ b/rpython/jit/backend/arm/regalloc.py
@@ -34,9 +34,9 @@
from rpython.jit.backend.llsupport.descr import unpack_interiorfielddescr
-# xxx hack: set a default value for TargetToken._arm_loop_code. If 0, we know
+# xxx hack: set a default value for TargetToken._ll_loop_code. If 0, we know
# that it is a LABEL that was not compiled yet.
-TargetToken._arm_loop_code = 0
+TargetToken._ll_loop_code = 0
class TempInt(TempBox):
type = INT
@@ -725,7 +725,7 @@
self.final_jump_op = op
descr = op.getdescr()
assert isinstance(descr, TargetToken)
- if descr._arm_loop_code != 0:
+ if descr._ll_loop_code != 0:
# if the target LABEL was already compiled, i.e. if it belongs
# to some already-compiled piece of code
self._compute_hint_frame_locations_from_descr(descr)
@@ -1082,7 +1082,7 @@
self.frame_manager.mark_as_free(arg)
#
descr._arm_arglocs = arglocs
- descr._arm_loop_code = self.assembler.mc.currpos()
+ descr._ll_loop_code = self.assembler.mc.currpos()
descr._arm_clt = self.assembler.current_clt
self.assembler.target_tokens_currently_compiling[descr] = None
self.possibly_free_vars_for_op(op)
diff --git a/rpython/jit/backend/arm/test/test_regalloc.py
b/rpython/jit/backend/arm/test/test_regalloc.py
--- a/rpython/jit/backend/arm/test/test_regalloc.py
+++ b/rpython/jit/backend/arm/test/test_regalloc.py
@@ -121,8 +121,8 @@
fdescr3 = BasicFailDescr(3)
def setup_method(self, meth):
- self.targettoken._arm_loop_code = 0
- self.targettoken2._arm_loop_code = 0
+ self.targettoken._ll_loop_code = 0
+ self.targettoken2._ll_loop_code = 0
def f1(x):
return x + 1
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
@@ -473,7 +473,7 @@
def assemble_loop(self, loopname, inputargs, operations, looptoken, log):
'''adds the following attributes to looptoken:
_ll_function_addr (address of the generated func, as an int)
- _x86_loop_code (debug: addr of the start of the ResOps)
+ _ll_loop_code (debug: addr of the start of the ResOps)
_x86_fullsize (debug: full size including failure)
_x86_debug_checksum
'''
@@ -515,7 +515,7 @@
full_size = self.mc.get_relative_pos()
#
rawstart = self.materialize_loop(looptoken)
- looptoken._x86_loop_code = looppos + rawstart
+ looptoken._ll_loop_code = looppos + rawstart
debug_start("jit-backend-addr")
debug_print("Loop %d (%s) has address %x to %x (bootstrap %x)" % (
looptoken.number, loopname,
@@ -733,7 +733,7 @@
def fixup_target_tokens(self, rawstart):
for targettoken in self.target_tokens_currently_compiling:
- targettoken._x86_loop_code += rawstart
+ targettoken._ll_loop_code += rawstart
self.target_tokens_currently_compiling = None
def _append_debugging_code(self, operations, tp, number, token):
@@ -2434,7 +2434,7 @@
expected_size=expected_size)
def closing_jump(self, target_token):
- target = target_token._x86_loop_code
+ target = target_token._ll_loop_code
if target_token in self.target_tokens_currently_compiling:
curpos = self.mc.get_relative_pos() + 5
self.mc.JMP_l(target - curpos)
diff --git a/rpython/jit/backend/x86/regalloc.py
b/rpython/jit/backend/x86/regalloc.py
--- a/rpython/jit/backend/x86/regalloc.py
+++ b/rpython/jit/backend/x86/regalloc.py
@@ -1186,7 +1186,7 @@
self.final_jump_op = op
descr = op.getdescr()
assert isinstance(descr, TargetToken)
- if descr._x86_loop_code != 0:
+ if descr._ll_loop_code != 0:
# if the target LABEL was already compiled, i.e. if it belongs
# to some already-compiled piece of code
self._compute_hint_frame_locations_from_descr(descr)
@@ -1298,7 +1298,7 @@
self.flush_loop()
#
descr._x86_arglocs = arglocs
- descr._x86_loop_code = self.assembler.mc.get_relative_pos()
+ descr._ll_loop_code = self.assembler.mc.get_relative_pos()
descr._x86_clt = self.assembler.current_clt
self.assembler.target_tokens_currently_compiling[descr] = None
self.possibly_free_vars_for_op(op)
@@ -1364,6 +1364,6 @@
os.write(2, '[x86/regalloc] %s\n' % msg)
raise NotImplementedError(msg)
-# xxx hack: set a default value for TargetToken._x86_loop_code.
+# xxx hack: set a default value for TargetToken._ll_loop_code.
# If 0, we know that it is a LABEL that was not compiled yet.
-TargetToken._x86_loop_code = 0
+TargetToken._ll_loop_code = 0
diff --git a/rpython/jit/backend/x86/test/test_regalloc.py
b/rpython/jit/backend/x86/test/test_regalloc.py
--- a/rpython/jit/backend/x86/test/test_regalloc.py
+++ b/rpython/jit/backend/x86/test/test_regalloc.py
@@ -115,8 +115,8 @@
fdescr3 = BasicFailDescr(3)
def setup_method(self, meth):
- self.targettoken._x86_loop_code = 0
- self.targettoken2._x86_loop_code = 0
+ self.targettoken._ll_loop_code = 0
+ self.targettoken2._ll_loop_code = 0
def f1(x):
return x+1
diff --git a/rpython/jit/backend/x86/test/test_runner.py
b/rpython/jit/backend/x86/test/test_runner.py
--- a/rpython/jit/backend/x86/test/test_runner.py
+++ b/rpython/jit/backend/x86/test/test_runner.py
@@ -380,7 +380,7 @@
self.cpu.compile_loop(inputargs, operations, looptoken)
name, loopaddress, loopsize = agent.functions[0]
assert name == "Loop # 17: hello (loop counter 0)"
- assert loopaddress <= looptoken._x86_loop_code
+ assert loopaddress <= looptoken._ll_loop_code
assert loopsize >= 40 # randomish number
i1b = BoxInt()
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
