Author: Maciej Fijalkowski <[email protected]>
Branch: optresult
Changeset: r77610:d6e687eb5ea4
Date: 2015-05-27 09:46 +0200
http://bitbucket.org/pypy/pypy/changeset/d6e687eb5ea4/
Log: more unused code
diff --git a/rpython/jit/metainterp/optimizeopt/heap.py
b/rpython/jit/metainterp/optimizeopt/heap.py
--- a/rpython/jit/metainterp/optimizeopt/heap.py
+++ b/rpython/jit/metainterp/optimizeopt/heap.py
@@ -6,7 +6,6 @@
from rpython.jit.metainterp.history import Const, ConstInt
from rpython.jit.metainterp.jitexc import JitException
from rpython.jit.metainterp.optimizeopt.optimizer import Optimization, REMOVED
-from rpython.jit.metainterp.optimizeopt.info import MODE_ARRAY
from rpython.jit.metainterp.optimizeopt.util import make_dispatcher_method
from rpython.jit.metainterp.optimizeopt.intutils import IntBound
from rpython.jit.metainterp.optimize import InvalidLoop
diff --git a/rpython/jit/metainterp/optimizeopt/info.py
b/rpython/jit/metainterp/optimizeopt/info.py
--- a/rpython/jit/metainterp/optimizeopt/info.py
+++ b/rpython/jit/metainterp/optimizeopt/info.py
@@ -3,19 +3,8 @@
from rpython.jit.metainterp.resoperation import AbstractValue, ResOperation,\
rop
from rpython.jit.metainterp.history import ConstInt
-from rpython.rtyper.lltypesystem import rstr, lltype
+from rpython.rtyper.lltypesystem import lltype
-""" The tag field on PtrOptInfo has a following meaning:
-
-lower two bits are LEVEL
-"""
-
-
-MODE_ARRAY = '\x00'
-MODE_STR = '\x01'
-MODE_UNICODE = '\x02'
-MODE_INSTANCE = '\x03'
-MODE_STRUCT = '\x04'
INFO_NULL = 0
INFO_NONNULL = 1
@@ -359,119 +348,3 @@
lgt, mode)
-class XPtrOptInfo(AbstractInfo):
- _attrs_ = ('_tag', 'known_class', 'last_guard_pos', 'lenbound')
- is_info_class = True
-
- _tag = 0
- known_class = None
- last_guard_pos = -1
- lenbound = None
-
- #def __init__(self, level=None, known_class=None, intbound=None):
- # OptValue.__init__(self, box, level, None, intbound)
- # if not isinstance(box, Const):
- # self.known_class = known_class
-
- def getlevel(self):
- return self._tag & 0x3
-
- def setlevel(self, level):
- self._tag = (self._tag & (~0x3)) | level
-
- def __repr__(self):
- level = {LEVEL_UNKNOWN: 'UNKNOWN',
- LEVEL_NONNULL: 'NONNULL',
- LEVEL_KNOWNCLASS: 'KNOWNCLASS',
- LEVEL_CONSTANT: 'CONSTANT'}.get(self.getlevel(),
- self.getlevel())
- return '<%s %s %s>' % (
- self.__class__.__name__,
- level,
- self.box)
-
- def make_len_gt(self, mode, descr, val):
- if self.lenbound:
- if self.lenbound.mode != mode or self.lenbound.descr != descr:
- # XXX a rare case? it seems to occur sometimes when
- # running lib-python's test_io.py in PyPy on Linux 32...
- from rpython.jit.metainterp.optimize import InvalidLoop
- raise InvalidLoop("bad mode/descr")
- self.lenbound.bound.make_gt(IntBound(val, val))
- else:
- self.lenbound = LenBound(mode, descr, IntLowerBound(val + 1))
-
- def make_nonnull(self, optimizer):
- assert self.getlevel() < LEVEL_NONNULL
- self.setlevel(LEVEL_NONNULL)
- if optimizer is not None:
- self.last_guard_pos = len(optimizer._newoperations) - 1
- assert self.get_last_guard(optimizer).is_guard()
-
- def make_constant_class(self, optimizer, classbox):
- assert self.getlevel() < LEVEL_KNOWNCLASS
- self.known_class = classbox
- self.setlevel(LEVEL_KNOWNCLASS)
- if optimizer is not None:
- self.last_guard_pos = len(optimizer._newoperations) - 1
- assert self.get_last_guard(optimizer).is_guard()
-
- def import_from(self, other, optimizer):
- OptValue.import_from(self, other, optimizer)
- if self.getlevel() != LEVEL_CONSTANT:
- if other.getlenbound():
- if self.lenbound:
- assert other.getlenbound().mode == self.lenbound.mode
- assert other.getlenbound().descr == self.lenbound.descr
- self.lenbound.bound.intersect(other.getlenbound().bound)
- else:
- self.lenbound = other.getlenbound().clone()
-
- def make_guards(self, box):
- guards = []
- level = self.getlevel()
- if level == LEVEL_CONSTANT:
- op = ResOperation(rop.GUARD_VALUE, [box, self.box], None)
- guards.append(op)
- elif level == LEVEL_KNOWNCLASS:
- op = ResOperation(rop.GUARD_NONNULL_CLASS,
- [box, self.known_class], None)
- guards.append(op)
- else:
- if level == LEVEL_NONNULL:
- op = ResOperation(rop.GUARD_NONNULL, [box], None)
- guards.append(op)
- if self.lenbound:
- lenbox = BoxInt()
- if self.lenbound.mode == MODE_ARRAY:
- op = ResOperation(rop.ARRAYLEN_GC, [box], lenbox,
self.lenbound.descr)
- elif self.lenbound.mode == MODE_STR:
- op = ResOperation(rop.STRLEN, [box], lenbox,
self.lenbound.descr)
- elif self.lenbound.mode == MODE_UNICODE:
- op = ResOperation(rop.UNICODELEN, [box], lenbox,
self.lenbound.descr)
- else:
- debug_print("Unknown lenbound mode")
- assert False
- guards.append(op)
- self.lenbound.bound.make_guards(lenbox, guards)
- return guards
-
- def get_constant_class(self, cpu):
- level = self.getlevel()
- if level == LEVEL_KNOWNCLASS:
- return self.known_class
- elif level == LEVEL_CONSTANT and not self.is_null():
- return cpu.ts.cls_of_box(self.box)
- else:
- return None
-
- def getlenbound(self):
- return self.lenbound
-
- def get_last_guard(self, optimizer):
- if self.last_guard_pos == -1:
- return None
- return optimizer._newoperations[self.last_guard_pos]
-
- def get_known_class(self):
- return self.known_class
diff --git a/rpython/jit/metainterp/optimizeopt/intbounds.py
b/rpython/jit/metainterp/optimizeopt/intbounds.py
--- a/rpython/jit/metainterp/optimizeopt/intbounds.py
+++ b/rpython/jit/metainterp/optimizeopt/intbounds.py
@@ -5,8 +5,6 @@
IntLowerBound, IntUpperBound, ConstIntBound)
from rpython.jit.metainterp.optimizeopt.optimizer import (Optimization,
CONST_1,
CONST_0)
-from rpython.jit.metainterp.optimizeopt.info import MODE_ARRAY, MODE_STR,\
- MODE_UNICODE
from rpython.jit.metainterp.optimizeopt.util import make_dispatcher_method
from rpython.jit.metainterp.resoperation import rop, AbstractResOp
from rpython.jit.metainterp.optimizeopt import vstring
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
