Author: Maciej Fijalkowski <[email protected]>
Branch: jitframe-on-heap
Changeset: r60042:7cd874a1c1ce
Date: 2013-01-13 22:05 +0200
http://bitbucket.org/pypy/pypy/changeset/7cd874a1c1ce/
Log: some frontend renaming
diff --git a/pypy/jit/metainterp/compile.py b/pypy/jit/metainterp/compile.py
--- a/pypy/jit/metainterp/compile.py
+++ b/pypy/jit/metainterp/compile.py
@@ -422,26 +422,26 @@
class DoneWithThisFrameDescrInt(_DoneWithThisFrameDescr):
def handle_fail(self, deadframe, metainterp_sd, jitdriver_sd):
assert jitdriver_sd.result_type == history.INT
- result = metainterp_sd.cpu.get_latest_value_int(deadframe, 0)
+ result = metainterp_sd.cpu.get_int_value(deadframe, 0)
raise metainterp_sd.DoneWithThisFrameInt(result)
class DoneWithThisFrameDescrRef(_DoneWithThisFrameDescr):
def handle_fail(self, deadframe, metainterp_sd, jitdriver_sd):
assert jitdriver_sd.result_type == history.REF
cpu = metainterp_sd.cpu
- result = cpu.get_latest_value_ref(deadframe, 0)
+ result = cpu.get_ref_value(deadframe, 0)
raise metainterp_sd.DoneWithThisFrameRef(cpu, result)
class DoneWithThisFrameDescrFloat(_DoneWithThisFrameDescr):
def handle_fail(self, deadframe, metainterp_sd, jitdriver_sd):
assert jitdriver_sd.result_type == history.FLOAT
- result = metainterp_sd.cpu.get_latest_value_float(deadframe, 0)
+ result = metainterp_sd.cpu.get_float_value(deadframe, 0)
raise metainterp_sd.DoneWithThisFrameFloat(result)
class ExitFrameWithExceptionDescrRef(_DoneWithThisFrameDescr):
def handle_fail(self, deadframe, metainterp_sd, jitdriver_sd):
cpu = metainterp_sd.cpu
- value = cpu.get_latest_value_ref(deadframe, 0)
+ value = cpu.get_ref_value(deadframe, 0)
raise metainterp_sd.ExitFrameWithExceptionRef(cpu, value)
@@ -573,7 +573,7 @@
typetag = self._counter & self.CNT_TYPE_MASK
counters = self._counters
if typetag == self.CNT_INT:
- intvalue = metainterp_sd.cpu.get_latest_value_int(
+ intvalue = metainterp_sd.cpu.get_int_value(
deadframe, index)
if counters is None:
self._counters = counters = ResumeGuardCountersInt()
@@ -581,7 +581,7 @@
assert isinstance(counters, ResumeGuardCountersInt)
counter = counters.see_int(intvalue)
elif typetag == self.CNT_REF:
- refvalue = metainterp_sd.cpu.get_latest_value_ref(
+ refvalue = metainterp_sd.cpu.get_ref_value(
deadframe, index)
if counters is None:
self._counters = counters = ResumeGuardCountersRef()
@@ -589,7 +589,7 @@
assert isinstance(counters, ResumeGuardCountersRef)
counter = counters.see_ref(refvalue)
elif typetag == self.CNT_FLOAT:
- floatvalue = metainterp_sd.cpu.get_latest_value_float(
+ floatvalue = metainterp_sd.cpu.get_float_value(
deadframe, index)
if counters is None:
self._counters = counters = ResumeGuardCountersFloat()
diff --git a/pypy/jit/metainterp/optimizeopt/test/test_util.py
b/pypy/jit/metainterp/optimizeopt/test/test_util.py
--- a/pypy/jit/metainterp/optimizeopt/test/test_util.py
+++ b/pypy/jit/metainterp/optimizeopt/test/test_util.py
@@ -383,7 +383,7 @@
boxkinds=boxkinds,
invent_fail_descr=self.invent_fail_descr)
- def invent_fail_descr(self, model, fail_args):
+ def invent_fail_descr(self, model, opnum, fail_args):
if fail_args is None:
return None
descr = Storage()
diff --git a/pypy/jit/metainterp/resume.py b/pypy/jit/metainterp/resume.py
--- a/pypy/jit/metainterp/resume.py
+++ b/pypy/jit/metainterp/resume.py
@@ -974,11 +974,11 @@
num += len(self.liveboxes)
assert num >= 0
if kind == INT:
- box = BoxInt(self.cpu.get_latest_value_int(self.deadframe, num))
+ box = BoxInt(self.cpu.get_int_value(self.deadframe, num))
elif kind == REF:
- box = BoxPtr(self.cpu.get_latest_value_ref(self.deadframe, num))
+ box = BoxPtr(self.cpu.get_ref_value(self.deadframe, num))
elif kind == FLOAT:
- box = BoxFloat(self.cpu.get_latest_value_float(self.deadframe,num))
+ box = BoxFloat(self.cpu.get_float_value(self.deadframe,num))
else:
assert 0, "bad kind: %d" % ord(kind)
self.liveboxes[num] = box
@@ -1244,7 +1244,7 @@
assert tag == TAGBOX
if num < 0:
num += self.cpu.get_latest_value_count(self.deadframe)
- return self.cpu.get_latest_value_int(self.deadframe, num)
+ return self.cpu.get_int_value(self.deadframe, num)
def decode_ref(self, tagged):
num, tag = untag(tagged)
@@ -1258,7 +1258,7 @@
assert tag == TAGBOX
if num < 0:
num += self.cpu.get_latest_value_count(self.deadframe)
- return self.cpu.get_latest_value_ref(self.deadframe, num)
+ return self.cpu.get_ref_value(self.deadframe, num)
def decode_float(self, tagged):
num, tag = untag(tagged)
@@ -1268,7 +1268,7 @@
assert tag == TAGBOX
if num < 0:
num += self.cpu.get_latest_value_count(self.deadframe)
- return self.cpu.get_latest_value_float(self.deadframe, num)
+ return self.cpu.get_float_value(self.deadframe, num)
def write_an_int(self, index, int):
self.blackholeinterp.setarg_i(index, int)
diff --git a/pypy/jit/metainterp/test/support.py
b/pypy/jit/metainterp/test/support.py
--- a/pypy/jit/metainterp/test/support.py
+++ b/pypy/jit/metainterp/test/support.py
@@ -149,11 +149,11 @@
faildescr = cpu.get_latest_descr(deadframe)
assert faildescr.__class__.__name__.startswith('DoneWithThisFrameDescr')
if metainterp.jitdriver_sd.result_type == history.INT:
- return cpu.get_latest_value_int(deadframe, 0)
+ return cpu.get_int_value(deadframe, 0)
elif metainterp.jitdriver_sd.result_type == history.REF:
- return cpu.get_latest_value_ref(deadframe, 0)
+ return cpu.get_ref_value(deadframe, 0)
elif metainterp.jitdriver_sd.result_type == history.FLOAT:
- return cpu.get_latest_value_float(deadframe, 0)
+ return cpu.get_float_value(deadframe, 0)
else:
return None
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
