Commits

Maciej Fijalkowski committed 7cd874a

some frontend renaming

  • Participants
  • Parent commits 315200d
  • Branches jitframe-on-heap

Comments (0)

Files changed (4)

File pypy/jit/metainterp/compile.py

 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)
 
 
             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()
                     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()
                     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()

File pypy/jit/metainterp/optimizeopt/test/test_util.py

                      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()

File pypy/jit/metainterp/resume.py

             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
             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)
             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)
             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)

File pypy/jit/metainterp/test/support.py

     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