Author: Alex Gaynor <[email protected]>
Branch:
Changeset: r65797:1b006d0e4bcd
Date: 2013-07-29 13:36 -0700
http://bitbucket.org/pypy/pypy/changeset/1b006d0e4bcd/
Log: Removed some more OO specific code
diff --git a/rpython/jit/backend/model.py b/rpython/jit/backend/model.py
--- a/rpython/jit/backend/model.py
+++ b/rpython/jit/backend/model.py
@@ -187,10 +187,6 @@
# with Voids removed
raise NotImplementedError
- def methdescrof(self, SELFTYPE, methname):
- # must return a subclass of history.AbstractMethDescr
- raise NotImplementedError
-
def typedescrof(self, TYPE):
raise NotImplementedError
diff --git a/rpython/jit/metainterp/history.py
b/rpython/jit/metainterp/history.py
--- a/rpython/jit/metainterp/history.py
+++ b/rpython/jit/metainterp/history.py
@@ -34,7 +34,6 @@
return 'int' # singlefloats are stored in an int
if TYPE in (lltype.Float, lltype.SingleFloat):
raise NotImplementedError("type %s not supported" % TYPE)
- # XXX fix this for oo...
if (TYPE != llmemory.Address and
rffi.sizeof(TYPE) > rffi.sizeof(lltype.Signed)):
if supports_longlong and TYPE is not lltype.LongFloat:
@@ -168,18 +167,11 @@
def __init__(self, identifier=None):
self.identifier = identifier # for testing
+
class BasicFailDescr(AbstractFailDescr):
def __init__(self, identifier=None):
self.identifier = identifier # for testing
-class AbstractMethDescr(AbstractDescr):
- # the base class of the result of cpu.methdescrof()
- jitcodes = None
- def setup(self, jitcodes):
- # jitcodes maps { runtimeClass -> jitcode for runtimeClass.methname }
- self.jitcodes = jitcodes
- def get_jitcode_for_class(self, oocls):
- return self.jitcodes[oocls]
class Const(AbstractValue):
__slots__ = ()
diff --git a/rpython/rlib/longlong2float.py b/rpython/rlib/longlong2float.py
--- a/rpython/rlib/longlong2float.py
+++ b/rpython/rlib/longlong2float.py
@@ -68,14 +68,12 @@
uint2singlefloat = rffi.llexternal(
"pypy__uint2singlefloat", [rffi.UINT], rffi.FLOAT,
_callable=uint2singlefloat_emulator, compilation_info=eci,
- _nowrapper=True, elidable_function=True, sandboxsafe=True,
- oo_primitive="pypy__uint2singlefloat")
+ _nowrapper=True, elidable_function=True, sandboxsafe=True)
singlefloat2uint = rffi.llexternal(
"pypy__singlefloat2uint", [rffi.FLOAT], rffi.UINT,
_callable=singlefloat2uint_emulator, compilation_info=eci,
- _nowrapper=True, elidable_function=True, sandboxsafe=True,
- oo_primitive="pypy__singlefloat2uint")
+ _nowrapper=True, elidable_function=True, sandboxsafe=True)
class Float2LongLongEntry(ExtRegistryEntry):
diff --git a/rpython/rlib/rlocale.py b/rpython/rlib/rlocale.py
--- a/rpython/rlib/rlocale.py
+++ b/rpython/rlib/rlocale.py
@@ -193,11 +193,11 @@
raise LocaleError("unsupported locale setting")
return rffi.charp2str(ll_result)
-isalpha = external('isalpha', [rffi.INT], rffi.INT,
oo_primitive='locale_isalpha')
-isupper = external('isupper', [rffi.INT], rffi.INT,
oo_primitive='locale_isupper')
-islower = external('islower', [rffi.INT], rffi.INT,
oo_primitive='locale_islower')
-tolower = external('tolower', [rffi.INT], rffi.INT,
oo_primitive='locale_tolower')
-isalnum = external('isalnum', [rffi.INT], rffi.INT,
oo_primitive='locale_isalnum')
+isalpha = external('isalpha', [rffi.INT], rffi.INT)
+isupper = external('isupper', [rffi.INT], rffi.INT)
+islower = external('islower', [rffi.INT], rffi.INT)
+tolower = external('tolower', [rffi.INT], rffi.INT)
+isalnum = external('isalnum', [rffi.INT], rffi.INT)
if HAVE_LANGINFO:
_nl_langinfo = external('nl_langinfo', [rffi.INT], rffi.CCHARP)
diff --git a/rpython/rtyper/lltypesystem/rffi.py
b/rpython/rtyper/lltypesystem/rffi.py
--- a/rpython/rtyper/lltypesystem/rffi.py
+++ b/rpython/rtyper/lltypesystem/rffi.py
@@ -62,8 +62,8 @@
compilation_info=ExternalCompilationInfo(),
sandboxsafe=False, threadsafe='auto',
_nowrapper=False, calling_conv='c',
- oo_primitive=None, elidable_function=False,
- macro=None, random_effects_on_gcobjs='auto'):
+ elidable_function=False, macro=None,
+ random_effects_on_gcobjs='auto'):
"""Build an external function that will invoke the C function 'name'
with the given 'args' types and 'result' type.
@@ -97,8 +97,6 @@
if elidable_function:
_callable._elidable_function_ = True
kwds = {}
- if oo_primitive:
- kwds['oo_primitive'] = oo_primitive
has_callback = False
for ARG in args:
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
