Author: Alex Gaynor <[email protected]>
Branch:
Changeset: r61736:01ebd2e2a49f
Date: 2013-02-24 09:54 -0800
http://bitbucket.org/pypy/pypy/changeset/01ebd2e2a49f/
Log: style cleanups to resume.py
diff --git a/rpython/jit/metainterp/resume.py b/rpython/jit/metainterp/resume.py
--- a/rpython/jit/metainterp/resume.py
+++ b/rpython/jit/metainterp/resume.py
@@ -1,19 +1,15 @@
-import sys, os
-from rpython.jit.metainterp.history import Box, Const, ConstInt, getkind
-from rpython.jit.metainterp.history import BoxInt, BoxPtr, BoxFloat
-from rpython.jit.metainterp.history import INT, REF, FLOAT, HOLE
-from rpython.jit.metainterp.history import AbstractDescr
+from rpython.jit.codewriter.effectinfo import EffectInfo
+from rpython.jit.metainterp import jitprof
+from rpython.jit.metainterp.history import (Box, Const, ConstInt, getkind,
+ BoxInt, BoxPtr, BoxFloat, INT, REF, FLOAT, AbstractDescr)
from rpython.jit.metainterp.resoperation import rop
-from rpython.jit.metainterp import jitprof
-from rpython.jit.codewriter.effectinfo import EffectInfo
+from rpython.rlib import rarithmetic, rstack
+from rpython.rlib.objectmodel import we_are_translated, specialize,
compute_unique_id
+from rpython.rlib.debug import (have_debug_prints, ll_assert, debug_start,
+ debug_stop, debug_print)
+from rpython.rtyper import annlowlevel
from rpython.rtyper.lltypesystem import lltype, llmemory, rffi, rstr
-from rpython.rtyper import annlowlevel
-from rpython.rlib import rarithmetic, rstack
-from rpython.rlib.objectmodel import we_are_translated, specialize
-from rpython.rlib.objectmodel import compute_unique_id
-from rpython.rlib.debug import have_debug_prints, ll_assert
-from rpython.rlib.debug import debug_start, debug_stop, debug_print
-from rpython.jit.metainterp.optimize import InvalidLoop
+
# Logic to encode the chain of frames and the state of the boxes at a
# guard operation, and to decode it again. This is a bit advanced,
@@ -39,11 +35,11 @@
target = framestack[n]
if n == 0:
return
- back = framestack[n-1]
+ back = framestack[n - 1]
if target.parent_resumedata_frame_info_list is not None:
assert target.parent_resumedata_frame_info_list.pc == back.pc
return
- _ensure_parent_resumedata(framestack, n-1)
+ _ensure_parent_resumedata(framestack, n - 1)
target.parent_resumedata_frame_info_list = FrameInfo(
back.parent_resumedata_frame_info_list,
back.jitcode,
@@ -106,8 +102,8 @@
def untag(value):
value = rarithmetic.widen(value)
- tagbits = value&TAGMASK
- return value>>2, tagbits
+ tagbits = value & TAGMASK
+ return value >> 2, tagbits
def tagged_eq(x, y):
# please rpython :(
@@ -126,8 +122,8 @@
TAGBOX = 2
TAGVIRTUAL = 3
-UNASSIGNED = tag(-1<<13, TAGBOX)
-UNASSIGNEDVIRTUAL = tag(-1<<13, TAGVIRTUAL)
+UNASSIGNED = tag(-1 << 13, TAGBOX)
+UNASSIGNEDVIRTUAL = tag(-1 << 13, TAGVIRTUAL)
NULLREF = tag(-1, TAGCONST)
UNINITIALIZED = tag(-2, TAGCONST) # used for uninitialized string characters
@@ -191,7 +187,7 @@
return numb, liveboxes.copy(), v
numb1, liveboxes, v = self.number(optimizer, snapshot.prev)
- n = len(liveboxes)-v
+ n = len(liveboxes) - v
boxes = snapshot.boxes
length = len(boxes)
numb = lltype.malloc(NUMBERING, length)
@@ -232,7 +228,7 @@
# returns a negative number
if box in self.cached_boxes:
num = self.cached_boxes[box]
- boxes[-num-1] = box
+ boxes[-num - 1] = box
else:
boxes.append(box)
num = -len(boxes)
@@ -261,8 +257,8 @@
_frame_info_placeholder = (None, 0, 0)
+
class ResumeDataVirtualAdder(object):
-
def __init__(self, storage, memo):
self.storage = storage
self.memo = memo
@@ -333,7 +329,7 @@
# collect liveboxes and virtuals
n = len(liveboxes_from_env) - v
- liveboxes = [None]*n
+ liveboxes = [None] * n
self.vfieldboxes = {}
for box, tagged in liveboxes_from_env.iteritems():
i, tagbits = untag(tagged)
@@ -415,7 +411,7 @@
# xxx heuristic a bit out of thin air
failargs_limit = memo.metainterp_sd.options.failargs_limit
if nliveboxes > (failargs_limit // 2):
- if nholes > nliveboxes//3:
+ if nholes > nliveboxes // 3:
return True
return False
@@ -434,10 +430,10 @@
raise TagOverflow
itemindex = rffi.cast(rffi.INT, itemindex)
#
- rd_pendingfields[i].lldescr = lldescr
- rd_pendingfields[i].num = num
+ rd_pendingfields[i].lldescr = lldescr
+ rd_pendingfields[i].num = num
rd_pendingfields[i].fieldnum = fieldnum
- rd_pendingfields[i].itemindex= itemindex
+ rd_pendingfields[i].itemindex = itemindex
self.storage.rd_pendingfields = rd_pendingfields
def _gettagged(self, box):
@@ -729,10 +725,10 @@
def _prepare_pendingfields(self, pendingfields):
if pendingfields:
for i in range(len(pendingfields)):
- lldescr = pendingfields[i].lldescr
- num = pendingfields[i].num
+ lldescr = pendingfields[i].lldescr
+ num = pendingfields[i].num
fieldnum = pendingfields[i].fieldnum
- itemindex= pendingfields[i].itemindex
+ itemindex = pendingfields[i].itemindex
descr = annlowlevel.cast_base_ptr_to_instance(AbstractDescr,
lldescr)
struct = self.decode_ref(num)
@@ -791,6 +787,7 @@
metainterp.framestack.reverse()
return resumereader.liveboxes, virtualizable_boxes, virtualref_boxes
+
class ResumeDataBoxReader(AbstractResumeDataReader):
unique_id = lambda: None
@@ -946,8 +943,10 @@
def decode_int(self, tagged):
return self.decode_box(tagged, INT)
+
def decode_ref(self, tagged):
return self.decode_box(tagged, REF)
+
def decode_float(self, tagged):
return self.decode_box(tagged, FLOAT)
@@ -979,7 +978,7 @@
elif kind == REF:
box = BoxPtr(self.cpu.get_latest_value_ref(self.deadframe, num))
elif kind == FLOAT:
- box = BoxFloat(self.cpu.get_latest_value_float(self.deadframe,num))
+ box = BoxFloat(self.cpu.get_latest_value_float(self.deadframe,
num))
else:
assert 0, "bad kind: %d" % ord(kind)
self.liveboxes[num] = box
@@ -987,17 +986,23 @@
def decode_box_of_type(self, TYPE, tagged):
kind = getkind(TYPE)
- if kind == 'int': kind = INT
- elif kind == 'ref': kind = REF
- elif kind == 'float': kind = FLOAT
- else: raise AssertionError(kind)
+ if kind == 'int':
+ kind = INT
+ elif kind == 'ref':
+ kind = REF
+ elif kind == 'float':
+ kind = FLOAT
+ else:
+ raise AssertionError(kind)
return self.decode_box(tagged, kind)
decode_box_of_type._annspecialcase_ = 'specialize:arg(1)'
def write_an_int(self, index, box):
self.boxes_i[index] = box
+
def write_a_ref(self, index, box):
self.boxes_r[index] = box
+
def write_a_float(self, index, box):
self.boxes_f[index] = box
@@ -1052,6 +1057,7 @@
resumereader.consume_vref_and_vable(vrefinfo, vinfo, ginfo)
return resumereader.force_all_virtuals()
+
class ResumeDataDirectReader(AbstractResumeDataReader):
unique_id = lambda: None
virtual_default = lltype.nullptr(llmemory.GCREF.TO)
@@ -1091,7 +1097,7 @@
assert (end & 1) == 0
for i in range(0, end, 2):
virtual = self.decode_ref(numb.nums[i])
- vref = self.decode_ref(numb.nums[i+1])
+ vref = self.decode_ref(numb.nums[i + 1])
# For each pair, we store the virtual inside the vref.
vrefinfo.continue_tracing(vref, virtual)
@@ -1134,7 +1140,8 @@
self.cur_numb = numb.prev
if self.resume_after_guard_not_forced != 2:
end_vref = self.consume_vable_info(vinfo, numb)
- if ginfo is not None: end_vref -= 1
+ if ginfo is not None:
+ end_vref -= 1
self.consume_virtualref_info(vrefinfo, numb, end_vref)
def allocate_with_vtable(self, known_class):
@@ -1319,10 +1326,10 @@
if storage.rd_pendingfields:
debug_print('\tpending setfields')
for i in range(len(storage.rd_pendingfields)):
- lldescr = storage.rd_pendingfields[i].lldescr
- num = storage.rd_pendingfields[i].num
+ lldescr = storage.rd_pendingfields[i].lldescr
+ num = storage.rd_pendingfields[i].num
fieldnum = storage.rd_pendingfields[i].fieldnum
- itemindex= storage.rd_pendingfields[i].itemindex
+ itemindex = storage.rd_pendingfields[i].itemindex
debug_print("\t\t", str(lldescr), str(untag(num)),
str(untag(fieldnum)), itemindex)
debug_stop("jit-resume")
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
