[pypy-commit] pypy safe-win-mmap: merge default into branch
mattip
noreply at buildbot.pypy.org
Sun Sep 15 19:14:54 CEST 2013
Author: mattip <matti.picus at gmail.com>
Branch: safe-win-mmap
Changeset: r66958:9fae0928dc2f
Date: 2013-09-15 20:02 +0300
http://bitbucket.org/pypy/pypy/changeset/9fae0928dc2f/
Log: merge default into branch
diff too long, truncating to 2000 out of 2774 lines
diff --git a/pypy/module/__pypy__/interp_time.py b/pypy/module/__pypy__/interp_time.py
--- a/pypy/module/__pypy__/interp_time.py
+++ b/pypy/module/__pypy__/interp_time.py
@@ -48,11 +48,11 @@
c_clock_gettime = rffi.llexternal("clock_gettime",
[lltype.Signed, lltype.Ptr(TIMESPEC)], rffi.INT,
- compilation_info=CConfig._compilation_info_, threadsafe=False
+ compilation_info=CConfig._compilation_info_, releasegil=False
)
c_clock_getres = rffi.llexternal("clock_getres",
[lltype.Signed, lltype.Ptr(TIMESPEC)], rffi.INT,
- compilation_info=CConfig._compilation_info_, threadsafe=False
+ compilation_info=CConfig._compilation_info_, releasegil=False
)
@unwrap_spec(clk_id="c_int")
diff --git a/pypy/module/_multiprocessing/interp_semaphore.py b/pypy/module/_multiprocessing/interp_semaphore.py
--- a/pypy/module/_multiprocessing/interp_semaphore.py
+++ b/pypy/module/_multiprocessing/interp_semaphore.py
@@ -28,7 +28,7 @@
'CreateSemaphoreA', [rffi.VOIDP, rffi.LONG, rffi.LONG, rwin32.LPCSTR],
rwin32.HANDLE)
_CloseHandle = rwin32.winexternal('CloseHandle', [rwin32.HANDLE],
- rwin32.BOOL, threadsafe=False)
+ rwin32.BOOL, releasegil=False)
_ReleaseSemaphore = rwin32.winexternal(
'ReleaseSemaphore', [rwin32.HANDLE, rffi.LONG, rffi.LONGP],
rwin32.BOOL)
@@ -82,8 +82,8 @@
_sem_open = external('sem_open',
[rffi.CCHARP, rffi.INT, rffi.INT, rffi.UINT],
SEM_T)
- # tread sem_close as not threadsafe for now to be able to use the __del__
- _sem_close = external('sem_close', [SEM_T], rffi.INT, threadsafe=False)
+ # sem_close is releasegil=False to be able to use it in the __del__
+ _sem_close = external('sem_close', [SEM_T], rffi.INT, releasegil=False)
_sem_unlink = external('sem_unlink', [rffi.CCHARP], rffi.INT)
_sem_wait = external('sem_wait', [SEM_T], rffi.INT)
_sem_trywait = external('sem_trywait', [SEM_T], rffi.INT)
diff --git a/pypy/module/bz2/interp_bz2.py b/pypy/module/bz2/interp_bz2.py
--- a/pypy/module/bz2/interp_bz2.py
+++ b/pypy/module/bz2/interp_bz2.py
@@ -144,12 +144,12 @@
BZ2_bzCompressInit = external('BZ2_bzCompressInit', [bz_stream, rffi.INT,
rffi.INT, rffi.INT], rffi.INT)
BZ2_bzCompressEnd = external('BZ2_bzCompressEnd', [bz_stream], rffi.INT,
- threadsafe=False)
+ releasegil=False)
BZ2_bzCompress = external('BZ2_bzCompress', [bz_stream, rffi.INT], rffi.INT)
BZ2_bzDecompressInit = external('BZ2_bzDecompressInit', [bz_stream, rffi.INT,
rffi.INT], rffi.INT)
BZ2_bzDecompressEnd = external('BZ2_bzDecompressEnd', [bz_stream], rffi.INT,
- threadsafe=False)
+ releasegil=False)
BZ2_bzDecompress = external('BZ2_bzDecompress', [bz_stream], rffi.INT)
def _catch_bz2_error(space, bzerror):
diff --git a/pypy/module/cppyy/capi/builtin_capi.py b/pypy/module/cppyy/capi/builtin_capi.py
--- a/pypy/module/cppyy/capi/builtin_capi.py
+++ b/pypy/module/cppyy/capi/builtin_capi.py
@@ -27,7 +27,7 @@
_c_num_scopes = rffi.llexternal(
"cppyy_num_scopes",
[C_SCOPE], rffi.INT,
- threadsafe=ts_reflect,
+ releasegil=ts_reflect,
compilation_info=backend.eci)
def c_num_scopes(space, cppscope):
return _c_num_scopes(cppscope.handle)
@@ -41,28 +41,28 @@
_c_resolve_name = rffi.llexternal(
"cppyy_resolve_name",
[rffi.CCHARP], rffi.CCHARP,
- threadsafe=ts_reflect,
+ releasegil=ts_reflect,
compilation_info=backend.eci)
def c_resolve_name(space, name):
return charp2str_free(space, _c_resolve_name(name))
_c_get_scope_opaque = rffi.llexternal(
"cppyy_get_scope",
[rffi.CCHARP], C_SCOPE,
- threadsafe=ts_reflect,
+ releasegil=ts_reflect,
compilation_info=backend.eci)
def c_get_scope_opaque(space, name):
return _c_get_scope_opaque(name)
_c_get_template = rffi.llexternal(
"cppyy_get_template",
[rffi.CCHARP], C_TYPE,
- threadsafe=ts_reflect,
+ releasegil=ts_reflect,
compilation_info=backend.eci)
def c_get_template(space, name):
return _c_get_template(name)
_c_actual_class = rffi.llexternal(
"cppyy_actual_class",
[C_TYPE, C_OBJECT], C_TYPE,
- threadsafe=ts_reflect,
+ releasegil=ts_reflect,
compilation_info=backend.eci)
def c_actual_class(space, cppclass, cppobj):
return _c_actual_class(cppclass.handle, cppobj)
@@ -71,21 +71,21 @@
_c_allocate = rffi.llexternal(
"cppyy_allocate",
[C_TYPE], C_OBJECT,
- threadsafe=ts_memory,
+ releasegil=ts_memory,
compilation_info=backend.eci)
def c_allocate(space, cppclass):
return _c_allocate(cppclass.handle)
_c_deallocate = rffi.llexternal(
"cppyy_deallocate",
[C_TYPE, C_OBJECT], lltype.Void,
- threadsafe=ts_memory,
+ releasegil=ts_memory,
compilation_info=backend.eci)
def c_deallocate(space, cppclass, cppobject):
_c_deallocate(cppclass.handle, cppobject)
_c_destruct = rffi.llexternal(
"cppyy_destruct",
[C_TYPE, C_OBJECT], lltype.Void,
- threadsafe=ts_call,
+ releasegil=ts_call,
compilation_info=backend.eci)
def c_destruct(space, cppclass, cppobject):
_c_destruct(cppclass.handle, cppobject)
@@ -94,63 +94,63 @@
_c_call_v = rffi.llexternal(
"cppyy_call_v",
[C_METHOD, C_OBJECT, rffi.INT, rffi.VOIDP], lltype.Void,
- threadsafe=ts_call,
+ releasegil=ts_call,
compilation_info=backend.eci)
def c_call_v(space, cppmethod, cppobject, nargs, args):
_c_call_v(cppmethod, cppobject, nargs, args)
_c_call_b = rffi.llexternal(
"cppyy_call_b",
[C_METHOD, C_OBJECT, rffi.INT, rffi.VOIDP], rffi.UCHAR,
- threadsafe=ts_call,
+ releasegil=ts_call,
compilation_info=backend.eci)
def c_call_b(space, cppmethod, cppobject, nargs, args):
return _c_call_b(cppmethod, cppobject, nargs, args)
_c_call_c = rffi.llexternal(
"cppyy_call_c",
[C_METHOD, C_OBJECT, rffi.INT, rffi.VOIDP], rffi.CHAR,
- threadsafe=ts_call,
+ releasegil=ts_call,
compilation_info=backend.eci)
def c_call_c(space, cppmethod, cppobject, nargs, args):
return _c_call_c(cppmethod, cppobject, nargs, args)
_c_call_h = rffi.llexternal(
"cppyy_call_h",
[C_METHOD, C_OBJECT, rffi.INT, rffi.VOIDP], rffi.SHORT,
- threadsafe=ts_call,
+ releasegil=ts_call,
compilation_info=backend.eci)
def c_call_h(space, cppmethod, cppobject, nargs, args):
return _c_call_h(cppmethod, cppobject, nargs, args)
_c_call_i = rffi.llexternal(
"cppyy_call_i",
[C_METHOD, C_OBJECT, rffi.INT, rffi.VOIDP], rffi.INT,
- threadsafe=ts_call,
+ releasegil=ts_call,
compilation_info=backend.eci)
def c_call_i(space, cppmethod, cppobject, nargs, args):
return _c_call_i(cppmethod, cppobject, nargs, args)
_c_call_l = rffi.llexternal(
"cppyy_call_l",
[C_METHOD, C_OBJECT, rffi.INT, rffi.VOIDP], rffi.LONG,
- threadsafe=ts_call,
+ releasegil=ts_call,
compilation_info=backend.eci)
def c_call_l(space, cppmethod, cppobject, nargs, args):
return _c_call_l(cppmethod, cppobject, nargs, args)
_c_call_ll = rffi.llexternal(
"cppyy_call_ll",
[C_METHOD, C_OBJECT, rffi.INT, rffi.VOIDP], rffi.LONGLONG,
- threadsafe=ts_call,
+ releasegil=ts_call,
compilation_info=backend.eci)
def c_call_ll(space, cppmethod, cppobject, nargs, args):
return _c_call_ll(cppmethod, cppobject, nargs, args)
_c_call_f = rffi.llexternal(
"cppyy_call_f",
[C_METHOD, C_OBJECT, rffi.INT, rffi.VOIDP], rffi.FLOAT,
- threadsafe=ts_call,
+ releasegil=ts_call,
compilation_info=backend.eci)
def c_call_f(space, cppmethod, cppobject, nargs, args):
return _c_call_f(cppmethod, cppobject, nargs, args)
_c_call_d = rffi.llexternal(
"cppyy_call_d",
[C_METHOD, C_OBJECT, rffi.INT, rffi.VOIDP], rffi.DOUBLE,
- threadsafe=ts_call,
+ releasegil=ts_call,
compilation_info=backend.eci)
def c_call_d(space, cppmethod, cppobject, nargs, args):
return _c_call_d(cppmethod, cppobject, nargs, args)
@@ -158,14 +158,14 @@
_c_call_r = rffi.llexternal(
"cppyy_call_r",
[C_METHOD, C_OBJECT, rffi.INT, rffi.VOIDP], rffi.VOIDP,
- threadsafe=ts_call,
+ releasegil=ts_call,
compilation_info=backend.eci)
def c_call_r(space, cppmethod, cppobject, nargs, args):
return _c_call_r(cppmethod, cppobject, nargs, args)
_c_call_s = rffi.llexternal(
"cppyy_call_s",
[C_METHOD, C_OBJECT, rffi.INT, rffi.VOIDP], rffi.CCHARP,
- threadsafe=ts_call,
+ releasegil=ts_call,
compilation_info=backend.eci)
def c_call_s(space, cppmethod, cppobject, nargs, args):
return _c_call_s(cppmethod, cppobject, nargs, args)
@@ -173,14 +173,14 @@
_c_constructor = rffi.llexternal(
"cppyy_constructor",
[C_METHOD, C_TYPE, rffi.INT, rffi.VOIDP], C_OBJECT,
- threadsafe=ts_call,
+ releasegil=ts_call,
compilation_info=backend.eci)
def c_constructor(space, cppmethod, cppobject, nargs, args):
return _c_constructor(cppmethod, cppobject, nargs, args)
_c_call_o = rffi.llexternal(
"cppyy_call_o",
[C_METHOD, C_OBJECT, rffi.INT, rffi.VOIDP, C_TYPE], rffi.LONG,
- threadsafe=ts_call,
+ releasegil=ts_call,
compilation_info=backend.eci)
def c_call_o(space, method, cppobj, nargs, args, cppclass):
return _c_call_o(method, cppobj, nargs, args, cppclass.handle)
@@ -188,7 +188,7 @@
_c_get_methptr_getter = rffi.llexternal(
"cppyy_get_methptr_getter",
[C_SCOPE, C_INDEX], C_METHPTRGETTER_PTR,
- threadsafe=ts_reflect,
+ releasegil=ts_reflect,
compilation_info=backend.eci,
elidable_function=True)
def c_get_methptr_getter(space, cppscope, index):
@@ -198,21 +198,21 @@
_c_allocate_function_args = rffi.llexternal(
"cppyy_allocate_function_args",
[rffi.SIZE_T], rffi.VOIDP,
- threadsafe=ts_memory,
+ releasegil=ts_memory,
compilation_info=backend.eci)
def c_allocate_function_args(space, size):
return _c_allocate_function_args(size)
_c_deallocate_function_args = rffi.llexternal(
"cppyy_deallocate_function_args",
[rffi.VOIDP], lltype.Void,
- threadsafe=ts_memory,
+ releasegil=ts_memory,
compilation_info=backend.eci)
def c_deallocate_function_args(space, args):
_c_deallocate_function_args(args)
_c_function_arg_sizeof = rffi.llexternal(
"cppyy_function_arg_sizeof",
[], rffi.SIZE_T,
- threadsafe=ts_memory,
+ releasegil=ts_memory,
compilation_info=backend.eci,
elidable_function=True)
def c_function_arg_sizeof(space):
@@ -220,7 +220,7 @@
_c_function_arg_typeoffset = rffi.llexternal(
"cppyy_function_arg_typeoffset",
[], rffi.SIZE_T,
- threadsafe=ts_memory,
+ releasegil=ts_memory,
compilation_info=backend.eci,
elidable_function=True)
def c_function_arg_typeoffset(space):
@@ -230,14 +230,14 @@
_c_is_namespace = rffi.llexternal(
"cppyy_is_namespace",
[C_SCOPE], rffi.INT,
- threadsafe=ts_reflect,
+ releasegil=ts_reflect,
compilation_info=backend.eci)
def c_is_namespace(space, scope):
return _c_is_namespace(scope)
_c_is_enum = rffi.llexternal(
"cppyy_is_enum",
[rffi.CCHARP], rffi.INT,
- threadsafe=ts_reflect,
+ releasegil=ts_reflect,
compilation_info=backend.eci)
def c_is_enum(space, name):
return _c_is_enum(name)
@@ -246,42 +246,42 @@
_c_final_name = rffi.llexternal(
"cppyy_final_name",
[C_TYPE], rffi.CCHARP,
- threadsafe=ts_reflect,
+ releasegil=ts_reflect,
compilation_info=backend.eci)
def c_final_name(space, cpptype):
return charp2str_free(space, _c_final_name(cpptype))
_c_scoped_final_name = rffi.llexternal(
"cppyy_scoped_final_name",
[C_TYPE], rffi.CCHARP,
- threadsafe=ts_reflect,
+ releasegil=ts_reflect,
compilation_info=backend.eci)
def c_scoped_final_name(space, cpptype):
return charp2str_free(space, _c_scoped_final_name(cpptype))
_c_has_complex_hierarchy = rffi.llexternal(
"cppyy_has_complex_hierarchy",
[C_TYPE], rffi.INT,
- threadsafe=ts_reflect,
+ releasegil=ts_reflect,
compilation_info=backend.eci)
def c_has_complex_hierarchy(space, cpptype):
return _c_has_complex_hierarchy(cpptype)
_c_num_bases = rffi.llexternal(
"cppyy_num_bases",
[C_TYPE], rffi.INT,
- threadsafe=ts_reflect,
+ releasegil=ts_reflect,
compilation_info=backend.eci)
def c_num_bases(space, cppclass):
return _c_num_bases(cppclass.handle)
_c_base_name = rffi.llexternal(
"cppyy_base_name",
[C_TYPE, rffi.INT], rffi.CCHARP,
- threadsafe=ts_reflect,
+ releasegil=ts_reflect,
compilation_info=backend.eci)
def c_base_name(space, cppclass, base_index):
return charp2str_free(space, _c_base_name(cppclass.handle, base_index))
_c_is_subtype = rffi.llexternal(
"cppyy_is_subtype",
[C_TYPE, C_TYPE], rffi.INT,
- threadsafe=ts_reflect,
+ releasegil=ts_reflect,
compilation_info=backend.eci,
elidable_function=True)
@jit.elidable_promote('2')
@@ -293,7 +293,7 @@
_c_base_offset = rffi.llexternal(
"cppyy_base_offset",
[C_TYPE, C_TYPE, C_OBJECT, rffi.INT], rffi.SIZE_T,
- threadsafe=ts_reflect,
+ releasegil=ts_reflect,
compilation_info=backend.eci,
elidable_function=True)
@jit.elidable_promote('1,2,4')
@@ -308,21 +308,21 @@
_c_num_methods = rffi.llexternal(
"cppyy_num_methods",
[C_SCOPE], rffi.INT,
- threadsafe=ts_reflect,
+ releasegil=ts_reflect,
compilation_info=backend.eci)
def c_num_methods(space, cppscope):
return _c_num_methods(cppscope.handle)
_c_method_index_at = rffi.llexternal(
"cppyy_method_index_at",
[C_SCOPE, rffi.INT], C_INDEX,
- threadsafe=ts_reflect,
+ releasegil=ts_reflect,
compilation_info=backend.eci)
def c_method_index_at(space, cppscope, imethod):
return _c_method_index_at(cppscope.handle, imethod)
_c_method_indices_from_name = rffi.llexternal(
"cppyy_method_indices_from_name",
[C_SCOPE, rffi.CCHARP], C_INDEX_ARRAY,
- threadsafe=ts_reflect,
+ releasegil=ts_reflect,
compilation_info=backend.eci)
def c_method_indices_from_name(space, cppscope, name):
indices = _c_method_indices_from_name(cppscope.handle, name)
@@ -341,49 +341,49 @@
_c_method_name = rffi.llexternal(
"cppyy_method_name",
[C_SCOPE, C_INDEX], rffi.CCHARP,
- threadsafe=ts_reflect,
+ releasegil=ts_reflect,
compilation_info=backend.eci)
def c_method_name(space, cppscope, index):
return charp2str_free(space, _c_method_name(cppscope.handle, index))
_c_method_result_type = rffi.llexternal(
"cppyy_method_result_type",
[C_SCOPE, C_INDEX], rffi.CCHARP,
- threadsafe=ts_reflect,
+ releasegil=ts_reflect,
compilation_info=backend.eci)
def c_method_result_type(space, cppscope, index):
return charp2str_free(space, _c_method_result_type(cppscope.handle, index))
_c_method_num_args = rffi.llexternal(
"cppyy_method_num_args",
[C_SCOPE, C_INDEX], rffi.INT,
- threadsafe=ts_reflect,
+ releasegil=ts_reflect,
compilation_info=backend.eci)
def c_method_num_args(space, cppscope, index):
return _c_method_num_args(cppscope.handle, index)
_c_method_req_args = rffi.llexternal(
"cppyy_method_req_args",
[C_SCOPE, C_INDEX], rffi.INT,
- threadsafe=ts_reflect,
+ releasegil=ts_reflect,
compilation_info=backend.eci)
def c_method_req_args(space, cppscope, index):
return _c_method_req_args(cppscope.handle, index)
_c_method_arg_type = rffi.llexternal(
"cppyy_method_arg_type",
[C_SCOPE, C_INDEX, rffi.INT], rffi.CCHARP,
- threadsafe=ts_reflect,
+ releasegil=ts_reflect,
compilation_info=backend.eci)
def c_method_arg_type(space, cppscope, index, arg_index):
return charp2str_free(space, _c_method_arg_type(cppscope.handle, index, arg_index))
_c_method_arg_default = rffi.llexternal(
"cppyy_method_arg_default",
[C_SCOPE, C_INDEX, rffi.INT], rffi.CCHARP,
- threadsafe=ts_reflect,
+ releasegil=ts_reflect,
compilation_info=backend.eci)
def c_method_arg_default(space, cppscope, index, arg_index):
return charp2str_free(space, _c_method_arg_default(cppscope.handle, index, arg_index))
_c_method_signature = rffi.llexternal(
"cppyy_method_signature",
[C_SCOPE, C_INDEX], rffi.CCHARP,
- threadsafe=ts_reflect,
+ releasegil=ts_reflect,
compilation_info=backend.eci)
def c_method_signature(space, cppscope, index):
return charp2str_free(space, _c_method_signature(cppscope.handle, index))
@@ -391,19 +391,19 @@
_c_method_is_template = rffi.llexternal(
"cppyy_method_is_template",
[C_SCOPE, C_INDEX], rffi.INT,
- threadsafe=ts_reflect,
+ releasegil=ts_reflect,
compilation_info=backend.eci)
def c_method_is_template(space, cppscope, index):
return _c_method_is_template(cppscope.handle, index)
_c_method_num_template_args = rffi.llexternal(
"cppyy_method_num_template_args",
[C_SCOPE, C_INDEX], rffi.INT,
- threadsafe=ts_reflect,
+ releasegil=ts_reflect,
compilation_info=backend.eci)
_c_method_template_arg_name = rffi.llexternal(
"cppyy_method_template_arg_name",
[C_SCOPE, C_INDEX, C_INDEX], rffi.CCHARP,
- threadsafe=ts_reflect,
+ releasegil=ts_reflect,
compilation_info=backend.eci)
def c_template_args(space, cppscope, index):
nargs = _c_method_num_template_args(cppscope.handle, index)
@@ -415,14 +415,14 @@
_c_get_method = rffi.llexternal(
"cppyy_get_method",
[C_SCOPE, C_INDEX], C_METHOD,
- threadsafe=ts_reflect,
+ releasegil=ts_reflect,
compilation_info=backend.eci)
def c_get_method(space, cppscope, index):
return _c_get_method(cppscope.handle, index)
_c_get_global_operator = rffi.llexternal(
"cppyy_get_global_operator",
[C_SCOPE, C_SCOPE, C_SCOPE, rffi.CCHARP], WLAVC_INDEX,
- threadsafe=ts_reflect,
+ releasegil=ts_reflect,
compilation_info=backend.eci)
def c_get_global_operator(space, nss, lc, rc, op):
if nss is not None:
@@ -433,14 +433,14 @@
_c_is_constructor = rffi.llexternal(
"cppyy_is_constructor",
[C_TYPE, C_INDEX], rffi.INT,
- threadsafe=ts_reflect,
+ releasegil=ts_reflect,
compilation_info=backend.eci)
def c_is_constructor(space, cppclass, index):
return _c_is_constructor(cppclass.handle, index)
_c_is_staticmethod = rffi.llexternal(
"cppyy_is_staticmethod",
[C_TYPE, C_INDEX], rffi.INT,
- threadsafe=ts_reflect,
+ releasegil=ts_reflect,
compilation_info=backend.eci)
def c_is_staticmethod(space, cppclass, index):
return _c_is_staticmethod(cppclass.handle, index)
@@ -449,28 +449,28 @@
_c_num_datamembers = rffi.llexternal(
"cppyy_num_datamembers",
[C_SCOPE], rffi.INT,
- threadsafe=ts_reflect,
+ releasegil=ts_reflect,
compilation_info=backend.eci)
def c_num_datamembers(space, cppscope):
return _c_num_datamembers(cppscope.handle)
_c_datamember_name = rffi.llexternal(
"cppyy_datamember_name",
[C_SCOPE, rffi.INT], rffi.CCHARP,
- threadsafe=ts_reflect,
+ releasegil=ts_reflect,
compilation_info=backend.eci)
def c_datamember_name(space, cppscope, datamember_index):
return charp2str_free(space, _c_datamember_name(cppscope.handle, datamember_index))
_c_datamember_type = rffi.llexternal(
"cppyy_datamember_type",
[C_SCOPE, rffi.INT], rffi.CCHARP,
- threadsafe=ts_reflect,
+ releasegil=ts_reflect,
compilation_info=backend.eci)
def c_datamember_type(space, cppscope, datamember_index):
return charp2str_free(space, _c_datamember_type(cppscope.handle, datamember_index))
_c_datamember_offset = rffi.llexternal(
"cppyy_datamember_offset",
[C_SCOPE, rffi.INT], rffi.SIZE_T,
- threadsafe=ts_reflect,
+ releasegil=ts_reflect,
compilation_info=backend.eci)
def c_datamember_offset(space, cppscope, datamember_index):
return _c_datamember_offset(cppscope.handle, datamember_index)
@@ -478,7 +478,7 @@
_c_datamember_index = rffi.llexternal(
"cppyy_datamember_index",
[C_SCOPE, rffi.CCHARP], rffi.INT,
- threadsafe=ts_reflect,
+ releasegil=ts_reflect,
compilation_info=backend.eci)
def c_datamember_index(space, cppscope, name):
return _c_datamember_index(cppscope.handle, name)
@@ -487,14 +487,14 @@
_c_is_publicdata = rffi.llexternal(
"cppyy_is_publicdata",
[C_SCOPE, rffi.INT], rffi.INT,
- threadsafe=ts_reflect,
+ releasegil=ts_reflect,
compilation_info=backend.eci)
def c_is_publicdata(space, cppscope, datamember_index):
return _c_is_publicdata(cppscope.handle, datamember_index)
_c_is_staticdata = rffi.llexternal(
"cppyy_is_staticdata",
[C_SCOPE, rffi.INT], rffi.INT,
- threadsafe=ts_reflect,
+ releasegil=ts_reflect,
compilation_info=backend.eci)
def c_is_staticdata(space, cppscope, datamember_index):
return _c_is_staticdata(cppscope.handle, datamember_index)
@@ -503,21 +503,21 @@
_c_strtoll = rffi.llexternal(
"cppyy_strtoll",
[rffi.CCHARP], rffi.LONGLONG,
- threadsafe=ts_helper,
+ releasegil=ts_helper,
compilation_info=backend.eci)
def c_strtoll(space, svalue):
return _c_strtoll(svalue)
_c_strtoull = rffi.llexternal(
"cppyy_strtoull",
[rffi.CCHARP], rffi.ULONGLONG,
- threadsafe=ts_helper,
+ releasegil=ts_helper,
compilation_info=backend.eci)
def c_strtoull(space, svalue):
return _c_strtoull(svalue)
c_free = rffi.llexternal(
"cppyy_free",
[rffi.VOIDP], lltype.Void,
- threadsafe=ts_memory,
+ releasegil=ts_memory,
compilation_info=backend.eci)
def charp2str_free(space, charp):
@@ -529,7 +529,7 @@
_c_charp2stdstring = rffi.llexternal(
"cppyy_charp2stdstring",
[rffi.CCHARP], C_OBJECT,
- threadsafe=ts_helper,
+ releasegil=ts_helper,
compilation_info=backend.eci)
def c_charp2stdstring(space, svalue):
charp = rffi.str2charp(svalue)
@@ -539,14 +539,14 @@
_c_stdstring2stdstring = rffi.llexternal(
"cppyy_stdstring2stdstring",
[C_OBJECT], C_OBJECT,
- threadsafe=ts_helper,
+ releasegil=ts_helper,
compilation_info=backend.eci)
def c_stdstring2stdstring(space, cppobject):
return _c_stdstring2stdstring(cppobject)
_c_assign2stdstring = rffi.llexternal(
"cppyy_assign2stdstring",
[C_OBJECT, rffi.CCHARP], lltype.Void,
- threadsafe=ts_helper,
+ releasegil=ts_helper,
compilation_info=backend.eci)
def c_assign2stdstring(space, cppobject, svalue):
charp = rffi.str2charp(svalue)
@@ -555,7 +555,7 @@
_c_free_stdstring = rffi.llexternal(
"cppyy_free_stdstring",
[C_OBJECT], lltype.Void,
- threadsafe=ts_helper,
+ releasegil=ts_helper,
compilation_info=backend.eci)
def c_free_stdstring(space, cppobject):
_c_free_stdstring(cppobject)
diff --git a/pypy/module/cppyy/capi/cint_capi.py b/pypy/module/cppyy/capi/cint_capi.py
--- a/pypy/module/cppyy/capi/cint_capi.py
+++ b/pypy/module/cppyy/capi/cint_capi.py
@@ -60,7 +60,7 @@
_c_load_dictionary = rffi.llexternal(
"cppyy_load_dictionary",
[rffi.CCHARP], rdynload.DLLHANDLE,
- threadsafe=False,
+ releasegil=False,
compilation_info=eci)
def c_load_dictionary(name):
@@ -84,7 +84,7 @@
_ttree_Branch = rffi.llexternal(
"cppyy_ttree_Branch",
[rffi.VOIDP, rffi.CCHARP, rffi.CCHARP, rffi.VOIDP, rffi.INT, rffi.INT], rffi.LONG,
- threadsafe=False,
+ releasegil=False,
compilation_info=eci)
@unwrap_spec(args_w='args_w')
@@ -158,7 +158,7 @@
c_ttree_GetEntry = rffi.llexternal(
"cppyy_ttree_GetEntry",
[rffi.VOIDP, rffi.LONGLONG], rffi.LONGLONG,
- threadsafe=False,
+ releasegil=False,
compilation_info=eci)
@unwrap_spec(args_w='args_w')
diff --git a/pypy/module/crypt/interp_crypt.py b/pypy/module/crypt/interp_crypt.py
--- a/pypy/module/crypt/interp_crypt.py
+++ b/pypy/module/crypt/interp_crypt.py
@@ -8,7 +8,7 @@
else:
eci = ExternalCompilationInfo(libraries=['crypt'])
c_crypt = rffi.llexternal('crypt', [rffi.CCHARP, rffi.CCHARP], rffi.CCHARP,
- compilation_info=eci, threadsafe=False)
+ compilation_info=eci, releasegil=False)
@unwrap_spec(word=str, salt=str)
def crypt(space, word, salt):
diff --git a/pypy/module/micronumpy/test/test_dtypes.py b/pypy/module/micronumpy/test/test_dtypes.py
--- a/pypy/module/micronumpy/test/test_dtypes.py
+++ b/pypy/module/micronumpy/test/test_dtypes.py
@@ -776,7 +776,13 @@
def test_unicode_boxes(self):
from numpypy import unicode_
- assert isinstance(unicode_(3), unicode)
+ try:
+ u = unicode_(3)
+ except NotImplementedError, e:
+ if e.message.find('not supported yet') >= 0:
+ skip('unicode box not implemented')
+ else:
+ assert isinstance(u, unicode)
def test_character_dtype(self):
from numpypy import array, character
diff --git a/pypy/module/pyexpat/interp_pyexpat.py b/pypy/module/pyexpat/interp_pyexpat.py
--- a/pypy/module/pyexpat/interp_pyexpat.py
+++ b/pypy/module/pyexpat/interp_pyexpat.py
@@ -356,7 +356,7 @@
XML_ParserCreateNS = expat_external(
'XML_ParserCreateNS', [rffi.CCHARP, rffi.CHAR], XML_Parser)
XML_ParserFree = expat_external(
- 'XML_ParserFree', [XML_Parser], lltype.Void, threadsafe=False)
+ 'XML_ParserFree', [XML_Parser], lltype.Void, releasegil=False)
XML_SetUserData = expat_external(
'XML_SetUserData', [XML_Parser, rffi.VOIDP], lltype.Void)
def XML_GetUserData(parser):
diff --git a/pypy/module/rctime/interp_time.py b/pypy/module/rctime/interp_time.py
--- a/pypy/module/rctime/interp_time.py
+++ b/pypy/module/rctime/interp_time.py
@@ -151,7 +151,7 @@
return rffi.llexternal(name, args, result,
compilation_info=eci,
calling_conv=calling_conv,
- threadsafe=False)
+ releasegil=False)
if _POSIX:
cConfig.timeval.__name__ = "_timeval"
diff --git a/pypy/module/test_lib_pypy/test_resource.py b/pypy/module/test_lib_pypy/test_resource.py
--- a/pypy/module/test_lib_pypy/test_resource.py
+++ b/pypy/module/test_lib_pypy/test_resource.py
@@ -3,6 +3,9 @@
from lib_pypy.ctypes_config_cache import rebuild
from pypy.module.test_lib_pypy.support import import_lib_pypy
+import os
+if os.name != 'posix':
+ skip('resource.h only available on unix')
class AppTestResource:
diff --git a/rpython/jit/backend/arm/runner.py b/rpython/jit/backend/arm/runner.py
--- a/rpython/jit/backend/arm/runner.py
+++ b/rpython/jit/backend/arm/runner.py
@@ -56,13 +56,13 @@
def finish_once(self):
self.assembler.finish_once()
- def compile_loop(self, logger, inputargs, operations, looptoken,
- log=True, name=''):
+ def compile_loop(self, inputargs, operations, looptoken,
+ log=True, name='', logger=None):
return self.assembler.assemble_loop(logger, name, inputargs, operations,
looptoken, log=log)
- def compile_bridge(self, logger, faildescr, inputargs, operations,
- original_loop_token, log=True):
+ def compile_bridge(self, faildescr, inputargs, operations,
+ original_loop_token, log=True, logger=None):
clt = original_loop_token.compiled_loop_token
clt.compiling_a_bridge()
return self.assembler.assemble_bridge(logger, faildescr, inputargs,
diff --git a/rpython/jit/backend/arm/test/test_generated.py b/rpython/jit/backend/arm/test/test_generated.py
--- a/rpython/jit/backend/arm/test/test_generated.py
+++ b/rpython/jit/backend/arm/test/test_generated.py
@@ -40,7 +40,7 @@
looptoken = JitCellToken()
operations[2].setfailargs([v12, v8, v3, v2, v1, v11])
operations[3].setfailargs([v9, v6, v10, v2, v8, v5, v1, v4])
- cpu.compile_loop(None, inputargs, operations, looptoken)
+ cpu.compile_loop(inputargs, operations, looptoken)
args = [-12 , -26 , -19 , 7 , -5 , -24 , -37 , 62 , 9 , 12]
deadframe = cpu.execute_token(looptoken, *args)
assert cpu.get_int_value(deadframe, 0) == 0
@@ -92,7 +92,7 @@
operations[9].setfailargs([v15, v7, v10, v18, v4, v17, v1])
operations[-1].setfailargs([v7, v1, v2])
looptoken = JitCellToken()
- cpu.compile_loop(None, inputargs, operations, looptoken)
+ cpu.compile_loop(inputargs, operations, looptoken)
args = [16 , 5 , 5 , 16 , 46 , 6 , 63 , 39 , 78 , 0]
deadframe = cpu.execute_token(looptoken, *args)
assert cpu.get_int_value(deadframe, 0) == 105
@@ -136,7 +136,7 @@
operations[-1].setfailargs([v5, v2, v1, v10, v3, v8, v4, v6])
looptoken = JitCellToken()
- cpu.compile_loop(None, inputargs, operations, looptoken)
+ cpu.compile_loop(inputargs, operations, looptoken)
args = [-5 , 24 , 46 , -15 , 13 , -8 , 0 , -6 , 6 , 6]
deadframe = cpu.execute_token(looptoken, *args)
assert cpu.get_latest_descr(deadframe).identifier == 2
@@ -179,7 +179,7 @@
operations[5].setfailargs([])
operations[-1].setfailargs([v8, v2, v6, v5, v7, v1, v10])
looptoken = JitCellToken()
- cpu.compile_loop(None, inputargs, operations, looptoken)
+ cpu.compile_loop(inputargs, operations, looptoken)
args = [19 , -3 , -58 , -7 , 12 , 22 , -54 , -29 , -19 , -64]
deadframe = cpu.execute_token(looptoken, *args)
assert cpu.get_int_value(deadframe, 0) == -29
@@ -223,7 +223,7 @@
looptoken = JitCellToken()
operations[5].setfailargs([])
operations[-1].setfailargs([v1, v4, v10, v8, v7, v3])
- cpu.compile_loop(None, inputargs, operations, looptoken)
+ cpu.compile_loop(inputargs, operations, looptoken)
args = [1073741824 , 95 , -16 , 5 , 92 , 12 , 32 , 17 , 37 , -63]
deadframe = cpu.execute_token(looptoken, *args)
assert cpu.get_int_value(deadframe, 0) == 1073741824
@@ -280,7 +280,7 @@
operations[9].setfailargs([v10, v13])
operations[-1].setfailargs([v8, v10, v6, v3, v2, v9])
args = [32 , 41 , -9 , 12 , -18 , 46 , 15 , 17 , 10 , 12]
- cpu.compile_loop(None, inputargs, operations, looptoken)
+ cpu.compile_loop(inputargs, operations, looptoken)
deadframe = cpu.execute_token(looptoken, *args)
assert cpu.get_latest_descr(deadframe).identifier == 3
assert cpu.get_int_value(deadframe, 0) == 12
@@ -328,7 +328,7 @@
operations[8].setfailargs([v5, v9])
operations[-1].setfailargs([v4, v10, v6, v5, v9, v7])
looptoken = JitCellToken()
- cpu.compile_loop(None, inputargs, operations, looptoken)
+ cpu.compile_loop(inputargs, operations, looptoken)
args = [-8 , 0 , 62 , 35 , 16 , 9 , 30 , 581610154 , -1 , 738197503]
deadframe = cpu.execute_token(looptoken, *args)
assert cpu.get_latest_descr(deadframe).identifier == 2
@@ -378,7 +378,7 @@
operations[-2].setfailargs([v9, v4, v10, v11, v14])
operations[-1].setfailargs([v10, v8, v1, v6, v4])
looptoken = JitCellToken()
- cpu.compile_loop(None, inputargs, operations, looptoken)
+ cpu.compile_loop(inputargs, operations, looptoken)
args = [-39 , -18 , 1588243114 , -9 , -4 , 1252698794 , 0 , 715827882 , -15 , 536870912]
deadframe = cpu.execute_token(looptoken, *args)
assert cpu.get_latest_descr(deadframe).identifier == 1
@@ -433,7 +433,7 @@
operations[9].setfailargs([v5, v7, v12, v14, v2, v13, v8])
operations[-1].setfailargs([v1, v2, v9])
looptoken = JitCellToken()
- cpu.compile_loop(None, inputargs, operations, looptoken)
+ cpu.compile_loop(inputargs, operations, looptoken)
args = [0 , -2 , 24 , 1 , -4 , 13 , -95 , 33 , 2 , -44]
deadframe = cpu.execute_token(looptoken, *args)
assert cpu.get_latest_descr(deadframe).identifier == 3
@@ -475,7 +475,7 @@
operations[2].setfailargs([v10, v3, v6, v11, v9, v2])
operations[-1].setfailargs([v8, v2, v10, v6, v7, v9, v5, v4])
looptoken = JitCellToken()
- cpu.compile_loop(None, inputargs, operations, looptoken)
+ cpu.compile_loop(inputargs, operations, looptoken)
args = [3 , -5 , 1431655765 , 47 , 12 , 1789569706 , 15 , 939524096 , 16 , -43]
deadframe = cpu.execute_token(looptoken, *args)
assert cpu.get_latest_descr(deadframe).identifier == 1
@@ -524,7 +524,7 @@
operations[-1].setfailargs([v2, v3, v5, v7, v10, v8, v9])
operations[4].setfailargs([v14])
looptoken = JitCellToken()
- cpu.compile_loop(None, inputargs, operations, looptoken)
+ cpu.compile_loop(inputargs, operations, looptoken)
args = [14 , -20 , 18 , -2058005163 , 6 , 1 , -16 , 11 , 0 , 19]
deadframe = cpu.execute_token(looptoken, *args)
assert cpu.get_latest_descr(deadframe).identifier == 1
diff --git a/rpython/jit/backend/arm/test/test_regalloc2.py b/rpython/jit/backend/arm/test/test_regalloc2.py
--- a/rpython/jit/backend/arm/test/test_regalloc2.py
+++ b/rpython/jit/backend/arm/test/test_regalloc2.py
@@ -24,7 +24,7 @@
cpu = CPU(None, None)
cpu.setup_once()
looptoken = JitCellToken()
- cpu.compile_loop(None, inputargs, operations, looptoken)
+ cpu.compile_loop(inputargs, operations, looptoken)
deadframe = cpu.execute_token(looptoken, 9)
assert cpu.get_int_value(deadframe, 0) == (9 >> 3)
assert cpu.get_int_value(deadframe, 1) == (~18)
@@ -48,7 +48,7 @@
cpu = CPU(None, None)
cpu.setup_once()
looptoken = JitCellToken()
- cpu.compile_loop(None, inputargs, operations, looptoken)
+ cpu.compile_loop(inputargs, operations, looptoken)
deadframe = cpu.execute_token(looptoken, -10)
assert cpu.get_int_value(deadframe, 0) == 0
assert cpu.get_int_value(deadframe, 1) == -1000
@@ -145,7 +145,7 @@
cpu = CPU(None, None)
cpu.setup_once()
looptoken = JitCellToken()
- cpu.compile_loop(None, inputargs, operations, looptoken)
+ cpu.compile_loop(inputargs, operations, looptoken)
args = [-13 , 10 , 10 , 8 , -8 , -16 , -18 , 46 , -12 , 26]
deadframe = cpu.execute_token(looptoken, *args)
assert cpu.get_int_value(deadframe, 0) == 0
@@ -252,7 +252,7 @@
cpu = CPU(None, None)
cpu.setup_once()
looptoken = JitCellToken()
- cpu.compile_loop(None, inputargs, operations, looptoken)
+ cpu.compile_loop(inputargs, operations, looptoken)
args = [17 , -20 , -6 , 6 , 1 , 13 , 13 , 9 , 49 , 8]
deadframe = cpu.execute_token(looptoken, *args)
assert cpu.get_int_value(deadframe, 0) == 0
diff --git a/rpython/jit/backend/arm/test/test_runner.py b/rpython/jit/backend/arm/test/test_runner.py
--- a/rpython/jit/backend/arm/test/test_runner.py
+++ b/rpython/jit/backend/arm/test/test_runner.py
@@ -75,7 +75,7 @@
ResOperation(rop.FINISH, [inp[1]], None, descr=BasicFinalDescr(1)),
]
operations[-2].setfailargs(out)
- cpu.compile_loop(None, inp, operations, looptoken)
+ cpu.compile_loop(inp, operations, looptoken)
args = [i for i in range(1, 15)]
deadframe = self.cpu.execute_token(looptoken, *args)
output = [self.cpu.get_int_value(deadframe, i - 1) for i in range(1, 15)]
@@ -117,9 +117,9 @@
i1 = int_sub(i0, 1)
finish(i1)
''')
- self.cpu.compile_loop(None, loop2.inputargs, loop2.operations, lt2)
- self.cpu.compile_loop(None, loop3.inputargs, loop3.operations, lt3)
- self.cpu.compile_loop(None, loop1.inputargs, loop1.operations, lt1)
+ self.cpu.compile_loop(loop2.inputargs, loop2.operations, lt2)
+ self.cpu.compile_loop(loop3.inputargs, loop3.operations, lt3)
+ self.cpu.compile_loop(loop1.inputargs, loop1.operations, lt1)
df = self.cpu.execute_token(lt1, 10)
assert self.cpu.get_int_value(df, 0) == 7
@@ -214,7 +214,7 @@
ops = "".join(ops)
loop = parse(ops)
looptoken = JitCellToken()
- self.cpu.compile_loop(None, loop.inputargs, loop.operations, looptoken)
+ self.cpu.compile_loop(loop.inputargs, loop.operations, looptoken)
ARGS = [lltype.Signed] * numargs
RES = lltype.Signed
args = [i+1 for i in range(numargs)]
@@ -246,7 +246,7 @@
try:
self.cpu.assembler.set_debug(True)
looptoken = JitCellToken()
- self.cpu.compile_loop(None, ops.inputargs, ops.operations, looptoken)
+ self.cpu.compile_loop(ops.inputargs, ops.operations, looptoken)
self.cpu.execute_token(looptoken, 0)
# check debugging info
struct = self.cpu.assembler.loop_run_counters[0]
@@ -280,7 +280,7 @@
faildescr = BasicFailDescr(2)
loop = parse(ops, self.cpu, namespace=locals())
looptoken = JitCellToken()
- info = self.cpu.compile_loop(None, loop.inputargs, loop.operations, looptoken)
+ info = self.cpu.compile_loop(loop.inputargs, loop.operations, looptoken)
ops2 = """
[i0, f1]
i1 = same_as(i0)
@@ -293,7 +293,7 @@
"""
loop2 = parse(ops2, self.cpu, namespace=locals())
looptoken2 = JitCellToken()
- info = self.cpu.compile_loop(None, loop2.inputargs, loop2.operations, looptoken2)
+ info = self.cpu.compile_loop(loop2.inputargs, loop2.operations, looptoken2)
deadframe = self.cpu.execute_token(looptoken, -9, longlong.getfloatstorage(-13.5))
res = longlong.getrealfloat(self.cpu.get_float_value(deadframe, 0))
diff --git a/rpython/jit/backend/llgraph/runner.py b/rpython/jit/backend/llgraph/runner.py
--- a/rpython/jit/backend/llgraph/runner.py
+++ b/rpython/jit/backend/llgraph/runner.py
@@ -183,8 +183,8 @@
self.stats = stats or MiniStats()
self.vinfo_for_tests = kwds.get('vinfo_for_tests', None)
- def compile_loop(self, logger, inputargs, operations, looptoken, log=True,
- name=''):
+ def compile_loop(self, inputargs, operations, looptoken, log=True,
+ name='', logger=None):
clt = model.CompiledLoopToken(self, looptoken.number)
looptoken.compiled_loop_token = clt
lltrace = LLTrace(inputargs, operations)
@@ -192,8 +192,8 @@
clt._llgraph_alltraces = [lltrace]
self._record_labels(lltrace)
- def compile_bridge(self, logger, faildescr, inputargs, operations,
- original_loop_token, log=True):
+ def compile_bridge(self, faildescr, inputargs, operations,
+ original_loop_token, log=True, logger=None):
clt = original_loop_token.compiled_loop_token
clt.compiling_a_bridge()
lltrace = LLTrace(inputargs, operations)
diff --git a/rpython/jit/backend/llsupport/regalloc.py b/rpython/jit/backend/llsupport/regalloc.py
--- a/rpython/jit/backend/llsupport/regalloc.py
+++ b/rpython/jit/backend/llsupport/regalloc.py
@@ -68,14 +68,32 @@
function(arg, node.val)
node = node.next
- def pop(self, size, tp):
+ def pop(self, size, tp, hint=-1):
if size == 2:
- return self._pop_two(tp)
+ return self._pop_two(tp) # 'hint' ignored for floats on 32-bit
assert size == 1
if not self.master_node:
return None
node = self.master_node
- self.master_node = node.next
+ #
+ if hint >= 0:
+ # Look for and remove the Node with the .val matching 'hint'.
+ # If not found, fall back to removing the first Node.
+ # Note that the loop below ignores the first Node, but
+ # even if by chance it is the one with the correct .val,
+ # it will be the one we remove at the end anyway.
+ prev_node = node
+ while prev_node.next:
+ if prev_node.next.val == hint:
+ node = prev_node.next
+ prev_node.next = node.next
+ break
+ prev_node = prev_node.next
+ else:
+ self.master_node = node.next
+ else:
+ self.master_node = node.next
+ #
return self.fm.frame_pos(node.val, tp)
def _candidate(self, node):
@@ -131,8 +149,7 @@
def __init__(self, start_free_depth=0, freelist=None):
self.bindings = {}
self.current_frame_depth = start_free_depth
- # we disable hints for now
- #self.hint_frame_locations = {}
+ self.hint_frame_pos = {}
self.freelist = LinkedList(self, freelist)
def get_frame_depth(self):
@@ -148,22 +165,16 @@
return self.bindings[box]
except KeyError:
pass
- # check if we have a hint for this box
- #if box in self.hint_frame_locations:
- # # if we do, try to reuse the location for this box
- # loc = self.hint_frame_locations[box]
- # if self.try_to_reuse_location(box, loc):
- # return loc
- ## no valid hint. make up a new free location
return self.get_new_loc(box)
def get_new_loc(self, box):
size = self.frame_size(box.type)
+ hint = self.hint_frame_pos.get(box, -1)
# frame_depth is rounded up to a multiple of 'size', assuming
# that 'size' is a power of two. The reason for doing so is to
# avoid obscure issues in jump.py with stack locations that try
# to move from position (6,7) to position (7,8).
- newloc = self.freelist.pop(size, box.type)
+ newloc = self.freelist.pop(size, box.type, hint)
if newloc is None:
#
index = self.get_frame_depth()
@@ -232,23 +243,6 @@
all[node.val] = 1
node = node.next
- def try_to_reuse_location(self, box, loc):
- xxx
- index = self.get_loc_index(loc)
- if index < 0:
- return False
- size = self.frame_size(box.type)
- for i in range(size):
- while (index + i) >= len(self.used):
- self.used.append(False)
- if self.used[index + i]:
- return False # already in use
- # good, we can reuse the location
- for i in range(size):
- self.used[index + i] = True
- self.bindings[box] = loc
- return True
-
@staticmethod
def _gather_gcroots(lst, var):
lst.append(var)
diff --git a/rpython/jit/backend/llsupport/test/test_gc_integration.py b/rpython/jit/backend/llsupport/test/test_gc_integration.py
--- a/rpython/jit/backend/llsupport/test/test_gc_integration.py
+++ b/rpython/jit/backend/llsupport/test/test_gc_integration.py
@@ -676,7 +676,7 @@
'checkdescr': checkdescr,
'fielddescr': cpu.fielddescrof(S, 'x')})
token = JitCellToken()
- cpu.compile_loop(None, loop.inputargs, loop.operations, token)
+ cpu.compile_loop(loop.inputargs, loop.operations, token)
p0 = lltype.malloc(S, zero=True)
p1 = lltype.malloc(S)
p2 = lltype.malloc(S)
@@ -715,7 +715,7 @@
'calldescr': checkdescr,
})
token = JitCellToken()
- cpu.compile_loop(None, loop.inputargs, loop.operations, token)
+ cpu.compile_loop(loop.inputargs, loop.operations, token)
S = self.S
s = lltype.malloc(S)
cpu.execute_token(token, 1, s)
@@ -743,7 +743,7 @@
token = JitCellToken()
cpu.gc_ll_descr.init_nursery(20)
cpu.setup_once()
- cpu.compile_loop(None, loop.inputargs, loop.operations, token)
+ cpu.compile_loop(loop.inputargs, loop.operations, token)
arg = longlong.getfloatstorage(2.3)
frame = cpu.execute_token(token, arg)
ofs = cpu.get_baseofs_of_frame_field()
@@ -770,7 +770,7 @@
cpu.gc_ll_descr.collections = [[0, sizeof.size]]
cpu.gc_ll_descr.init_nursery(2 * sizeof.size)
cpu.setup_once()
- cpu.compile_loop(None, loop.inputargs, loop.operations, token)
+ cpu.compile_loop(loop.inputargs, loop.operations, token)
frame = cpu.execute_token(token)
# now we should be able to track everything from the frame
frame = lltype.cast_opaque_ptr(JITFRAMEPTR, frame)
@@ -821,7 +821,7 @@
token = JitCellToken()
cpu.gc_ll_descr.init_nursery(100)
cpu.setup_once()
- cpu.compile_loop(None, loop.inputargs, loop.operations, token)
+ cpu.compile_loop(loop.inputargs, loop.operations, token)
args = [lltype.nullptr(llmemory.GCREF.TO) for i in range(7)]
frame = cpu.execute_token(token, 1, *args)
frame = rffi.cast(JITFRAMEPTR, frame)
@@ -867,7 +867,7 @@
token = JitCellToken()
cpu.gc_ll_descr.init_nursery(100)
cpu.setup_once()
- cpu.compile_loop(None, loop.inputargs, loop.operations, token)
+ cpu.compile_loop(loop.inputargs, loop.operations, token)
frame = lltype.cast_opaque_ptr(JITFRAMEPTR,
cpu.execute_token(token, 1, a))
@@ -911,7 +911,7 @@
token = JitCellToken()
cpu.gc_ll_descr.init_nursery(100)
cpu.setup_once()
- cpu.compile_loop(None, loop.inputargs, loop.operations, token)
+ cpu.compile_loop(loop.inputargs, loop.operations, token)
frame = lltype.cast_opaque_ptr(JITFRAMEPTR,
cpu.execute_token(token, 1, a))
assert getmap(frame).count('1') == 4
diff --git a/rpython/jit/backend/llsupport/test/test_regalloc.py b/rpython/jit/backend/llsupport/test/test_regalloc.py
--- a/rpython/jit/backend/llsupport/test/test_regalloc.py
+++ b/rpython/jit/backend/llsupport/test/test_regalloc.py
@@ -379,48 +379,23 @@
def test_hint_frame_locations_1(self):
- py.test.skip("xxx")
- b0, = newboxes(0)
- fm = TFrameManager()
- loc123 = FakeFramePos(123, INT)
- fm.hint_frame_locations[b0] = loc123
- assert fm.get_frame_depth() == 0
- loc = fm.loc(b0)
- assert loc == loc123
- assert fm.get_frame_depth() == 124
-
- def test_hint_frame_locations_2(self):
- py.test.skip("xxx")
- b0, b1, b2 = newboxes(0, 1, 2)
- longevity = {b0: (0, 1), b1: (0, 2), b2: (0, 2)}
- fm = TFrameManager()
- asm = MockAsm()
- rm = RegisterManager(longevity, frame_manager=fm, assembler=asm)
- rm.force_allocate_reg(b0)
- rm.force_allocate_reg(b1)
- rm.force_allocate_reg(b2)
- rm.force_spill_var(b0)
- loc = rm.loc(b0)
- assert isinstance(loc, FakeFramePos)
- assert fm.get_loc_index(loc) == 0
- rm.position = 1
- assert fm.used == [True]
- rm.possibly_free_var(b0)
- assert fm.used == [False]
- #
- fm.hint_frame_locations[b1] = loc
- rm.force_spill_var(b1)
- loc1 = rm.loc(b1)
- assert loc1 == loc
- assert fm.used == [True]
- #
- fm.hint_frame_locations[b2] = loc
- rm.force_spill_var(b2)
- loc2 = rm.loc(b2)
- assert loc2 != loc1 # because it was not free
- assert fm.used == [True, True]
- #
- rm._check_invariants()
+ for hint_value in range(11):
+ b0, = newboxes(0)
+ fm = TFrameManager()
+ fm.hint_frame_pos[b0] = hint_value
+ blist = newboxes(*range(10))
+ for b1 in blist:
+ fm.loc(b1)
+ for b1 in blist:
+ fm.mark_as_free(b1)
+ assert fm.get_frame_depth() == 10
+ loc = fm.loc(b0)
+ if hint_value < 10:
+ expected = hint_value
+ else:
+ expected = 0
+ assert fm.get_loc_index(loc) == expected
+ assert fm.get_frame_depth() == 10
def test_linkedlist(self):
class Loc(object):
diff --git a/rpython/jit/backend/llsupport/test/test_regalloc_integration.py b/rpython/jit/backend/llsupport/test/test_regalloc_integration.py
--- a/rpython/jit/backend/llsupport/test/test_regalloc_integration.py
+++ b/rpython/jit/backend/llsupport/test/test_regalloc_integration.py
@@ -97,7 +97,7 @@
loop = self.parse(ops, namespace=namespace)
self.loop = loop
looptoken = JitCellToken()
- self.cpu.compile_loop(None, loop.inputargs, loop.operations, looptoken)
+ self.cpu.compile_loop(loop.inputargs, loop.operations, looptoken)
arguments = []
for arg in args:
if isinstance(arg, int):
@@ -147,7 +147,7 @@
assert ([box.type for box in bridge.inputargs] ==
[box.type for box in guard_op.getfailargs()])
faildescr = guard_op.getdescr()
- self.cpu.compile_bridge(None, faildescr, bridge.inputargs,
+ self.cpu.compile_bridge(faildescr, bridge.inputargs,
bridge.operations,
loop._jitcelltoken)
return bridge
diff --git a/rpython/jit/backend/llsupport/test/test_runner.py b/rpython/jit/backend/llsupport/test/test_runner.py
--- a/rpython/jit/backend/llsupport/test/test_runner.py
+++ b/rpython/jit/backend/llsupport/test/test_runner.py
@@ -14,7 +14,7 @@
def set_debug(flag):
pass
- def compile_loop(self, logger, inputargs, operations, looptoken):
+ def compile_loop(self, inputargs, operations, looptoken):
py.test.skip("llsupport test: cannot compile operations")
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
@@ -51,30 +51,21 @@
"""
return False
- def compile_loop(self, logger, inputargs, operations, looptoken,
- log=True, name=''):
+ def compile_loop(self, inputargs, operations, looptoken,
+ log=True, name='', logger=None):
"""Assemble the given loop.
Should create and attach a fresh CompiledLoopToken to
looptoken.compiled_loop_token and stick extra attributes
on it to point to the compiled loop in assembler.
-
- Optionally, return a ``ops_offset`` dictionary, which maps each operation
- to its offset in the compiled code. The ``ops_offset`` dictionary is then
- used by the operation logger to print the offsets in the log. The
- offset representing the end of the last operation is stored in
- ``ops_offset[None]``: note that this might not coincide with the end of
- the loop, because usually in the loop footer there is code which does
- not belong to any particular operation.
+ Returns either None or an instance of rpython.rlib.jit.AsmInfo.
"""
raise NotImplementedError
- def compile_bridge(self, logger, faildescr, inputargs, operations,
- original_loop_token, log=True):
+ def compile_bridge(self, faildescr, inputargs, operations,
+ original_loop_token, log=True, logger=None):
"""Assemble the bridge.
The FailDescr is the descr of the original guard that failed.
-
- Optionally, return a ``ops_offset`` dictionary. See the docstring of
- ``compiled_loop`` for more information about it.
+ Returns either None or an instance of rpython.rlib.jit.AsmInfo.
"""
raise NotImplementedError
diff --git a/rpython/jit/backend/test/calling_convention_test.py b/rpython/jit/backend/test/calling_convention_test.py
--- a/rpython/jit/backend/test/calling_convention_test.py
+++ b/rpython/jit/backend/test/calling_convention_test.py
@@ -105,7 +105,7 @@
loop = parse(ops, namespace=locals())
looptoken = JitCellToken()
- self.cpu.compile_loop(None, loop.inputargs, loop.operations, looptoken)
+ self.cpu.compile_loop(loop.inputargs, loop.operations, looptoken)
argvals, expected_result = self._prepare_args(args, floats, ints)
deadframe = self.cpu.execute_token(looptoken, *argvals)
@@ -249,7 +249,7 @@
called_looptoken = JitCellToken()
called_looptoken.outermost_jitdriver_sd = FakeJitDriverSD()
done_descr = called_loop.operations[-1].getdescr()
- self.cpu.compile_loop(None, called_loop.inputargs, called_loop.operations, called_looptoken)
+ self.cpu.compile_loop(called_loop.inputargs, called_loop.operations, called_looptoken)
argvals, expected_result = self._prepare_args(args, floats, ints)
deadframe = cpu.execute_token(called_looptoken, *argvals)
@@ -278,7 +278,7 @@
self.cpu.done_with_this_frame_descr_float = done_descr
try:
othertoken = JitCellToken()
- self.cpu.compile_loop(None, loop.inputargs, loop.operations, othertoken)
+ self.cpu.compile_loop(loop.inputargs, loop.operations, othertoken)
# prepare call to called_loop
argvals, _ = self._prepare_args(args, floats, ints)
@@ -424,7 +424,7 @@
loop = parse(ops, namespace=locals())
looptoken = JitCellToken()
- self.cpu.compile_loop(None, loop.inputargs, loop.operations, looptoken)
+ self.cpu.compile_loop(loop.inputargs, loop.operations, looptoken)
argvals, expected_result = self._prepare_args(args, floats, ints)
deadframe = self.cpu.execute_token(looptoken, *argvals)
diff --git a/rpython/jit/backend/test/runner_test.py b/rpython/jit/backend/test/runner_test.py
--- a/rpython/jit/backend/test/runner_test.py
+++ b/rpython/jit/backend/test/runner_test.py
@@ -49,7 +49,7 @@
valueboxes,
descr)
looptoken = JitCellToken()
- self.cpu.compile_loop(None, inputargs, operations, looptoken)
+ self.cpu.compile_loop(inputargs, operations, looptoken)
args = []
for box in inputargs:
if isinstance(box, BoxInt):
@@ -127,7 +127,7 @@
]
inputargs = [i0]
looptoken = JitCellToken()
- self.cpu.compile_loop(None, inputargs, operations, looptoken)
+ self.cpu.compile_loop(inputargs, operations, looptoken)
deadframe = self.cpu.execute_token(looptoken, 2)
fail = self.cpu.get_latest_descr(deadframe)
res = self.cpu.get_int_value(deadframe, 0)
@@ -145,7 +145,7 @@
]
inputargs = [i0]
looptoken = JitCellToken()
- self.cpu.compile_loop(None, inputargs, operations, looptoken)
+ self.cpu.compile_loop(inputargs, operations, looptoken)
deadframe = self.cpu.execute_token(looptoken,
longlong.getfloatstorage(2.8))
fail = self.cpu.get_latest_descr(deadframe)
@@ -170,7 +170,7 @@
inputargs = [i0]
operations[3].setfailargs([i1])
- self.cpu.compile_loop(None, inputargs, operations, looptoken)
+ self.cpu.compile_loop(inputargs, operations, looptoken)
deadframe = self.cpu.execute_token(looptoken, 2)
fail = self.cpu.get_latest_descr(deadframe)
assert fail.identifier == 2
@@ -195,7 +195,7 @@
inputargs = [i3]
operations[4].setfailargs([None, None, i1, None])
- self.cpu.compile_loop(None, inputargs, operations, looptoken)
+ self.cpu.compile_loop(inputargs, operations, looptoken)
deadframe = self.cpu.execute_token(looptoken, 44)
fail = self.cpu.get_latest_descr(deadframe)
assert fail.identifier == 2
@@ -221,7 +221,7 @@
operations[3].setfailargs([i1])
wr_i1 = weakref.ref(i1)
wr_guard = weakref.ref(operations[2])
- self.cpu.compile_loop(None, inputargs, operations, looptoken)
+ self.cpu.compile_loop(inputargs, operations, looptoken)
if hasattr(looptoken, '_x86_ops_offset'):
del looptoken._x86_ops_offset # else it's kept alive
del i0, i1, i2
@@ -249,7 +249,7 @@
]
inputargs = [i0]
operations[3].setfailargs([i1])
- self.cpu.compile_loop(None, inputargs, operations, looptoken)
+ self.cpu.compile_loop(inputargs, operations, looptoken)
i1b = BoxInt()
i3 = BoxInt()
@@ -260,7 +260,7 @@
]
bridge[1].setfailargs([i1b])
- self.cpu.compile_bridge(None, faildescr1, [i1b], bridge, looptoken)
+ self.cpu.compile_bridge(faildescr1, [i1b], bridge, looptoken)
deadframe = self.cpu.execute_token(looptoken, 2)
fail = self.cpu.get_latest_descr(deadframe)
@@ -291,7 +291,7 @@
]
inputargs = [i3]
operations[4].setfailargs([None, i1, None])
- self.cpu.compile_loop(None, inputargs, operations, looptoken)
+ self.cpu.compile_loop(inputargs, operations, looptoken)
i1b = BoxInt()
i3 = BoxInt()
@@ -302,7 +302,7 @@
]
bridge[1].setfailargs([i1b])
- self.cpu.compile_bridge(None, faildescr1, [i1b], bridge, looptoken)
+ self.cpu.compile_bridge(faildescr1, [i1b], bridge, looptoken)
deadframe = self.cpu.execute_token(looptoken, 2)
fail = self.cpu.get_latest_descr(deadframe)
@@ -320,7 +320,7 @@
]
inputargs = [i0]
operations[0].setfailargs([i0])
- self.cpu.compile_loop(None, inputargs, operations, looptoken)
+ self.cpu.compile_loop(inputargs, operations, looptoken)
i1list = [BoxInt() for i in range(150)]
bridge = []
@@ -334,7 +334,7 @@
descr=BasicFinalDescr(4)))
bridge[-2].setfailargs(i1list)
- self.cpu.compile_bridge(None, faildescr1, [i0], bridge, looptoken)
+ self.cpu.compile_bridge(faildescr1, [i0], bridge, looptoken)
deadframe = self.cpu.execute_token(looptoken, 1)
fail = self.cpu.get_latest_descr(deadframe)
@@ -358,7 +358,7 @@
operations = [
ResOperation(rop.FINISH, [i0], None, descr=faildescr)
]
- self.cpu.compile_loop(None, [i0], operations, looptoken)
+ self.cpu.compile_loop([i0], operations, looptoken)
deadframe = self.cpu.execute_token(looptoken, 99)
fail = self.cpu.get_latest_descr(deadframe)
assert fail is faildescr
@@ -369,7 +369,7 @@
operations = [
ResOperation(rop.FINISH, [ConstInt(42)], None, descr=faildescr)
]
- self.cpu.compile_loop(None, [], operations, looptoken)
+ self.cpu.compile_loop([], operations, looptoken)
deadframe = self.cpu.execute_token(looptoken)
fail = self.cpu.get_latest_descr(deadframe)
assert fail is faildescr
@@ -380,7 +380,7 @@
operations = [
ResOperation(rop.FINISH, [], None, descr=faildescr)
]
- self.cpu.compile_loop(None, [], operations, looptoken)
+ self.cpu.compile_loop([], operations, looptoken)
deadframe = self.cpu.execute_token(looptoken)
fail = self.cpu.get_latest_descr(deadframe)
assert fail is faildescr
@@ -391,7 +391,7 @@
operations = [
ResOperation(rop.FINISH, [f0], None, descr=faildescr)
]
- self.cpu.compile_loop(None, [f0], operations, looptoken)
+ self.cpu.compile_loop([f0], operations, looptoken)
value = longlong.getfloatstorage(-61.25)
deadframe = self.cpu.execute_token(looptoken, value)
fail = self.cpu.get_latest_descr(deadframe)
@@ -403,7 +403,7 @@
operations = [
ResOperation(rop.FINISH, [constfloat(42.5)], None, descr=faildescr)
]
- self.cpu.compile_loop(None, [], operations, looptoken)
+ self.cpu.compile_loop([], operations, looptoken)
deadframe = self.cpu.execute_token(looptoken)
fail = self.cpu.get_latest_descr(deadframe)
assert fail is faildescr
@@ -429,7 +429,7 @@
ResOperation(rop.JUMP, [t, z], None, descr=targettoken),
]
operations[-2].setfailargs([t, z])
- cpu.compile_loop(None, [x, y], operations, looptoken)
+ cpu.compile_loop([x, y], operations, looptoken)
deadframe = self.cpu.execute_token(looptoken, 0, 10)
assert self.cpu.get_int_value(deadframe, 0) == 0
assert self.cpu.get_int_value(deadframe, 1) == 55
@@ -488,7 +488,7 @@
ops[1].setfailargs([v_res])
#
looptoken = JitCellToken()
- self.cpu.compile_loop(None, [v1, v2], ops, looptoken)
+ self.cpu.compile_loop([v1, v2], ops, looptoken)
for x, y, z in testcases:
deadframe = self.cpu.execute_token(looptoken, x, y)
fail = self.cpu.get_latest_descr(deadframe)
@@ -1238,7 +1238,7 @@
print inputargs
for op in operations:
print op
- self.cpu.compile_loop(None, inputargs, operations, looptoken)
+ self.cpu.compile_loop(inputargs, operations, looptoken)
#
deadframe = self.cpu.execute_token(looptoken, *values)
fail = self.cpu.get_latest_descr(deadframe)
@@ -1305,7 +1305,7 @@
operations[3].setfailargs(inputargs[:])
operations[3].setdescr(faildescr)
#
- self.cpu.compile_loop(None, inputargs, operations, looptoken)
+ self.cpu.compile_loop(inputargs, operations, looptoken)
#
values = []
S = lltype.GcStruct('S')
@@ -1366,7 +1366,7 @@
operations[-3].setfailargs(fboxes)
operations[-2].setfailargs(fboxes)
looptoken = JitCellToken()
- self.cpu.compile_loop(None, fboxes, operations, looptoken)
+ self.cpu.compile_loop(fboxes, operations, looptoken)
fboxes2 = [BoxFloat() for i in range(12)]
f3 = BoxFloat()
@@ -1375,7 +1375,7 @@
ResOperation(rop.JUMP, [f3]+fboxes2[1:], None, descr=targettoken),
]
- self.cpu.compile_bridge(None, faildescr1, fboxes2, bridge, looptoken)
+ self.cpu.compile_bridge(faildescr1, fboxes2, bridge, looptoken)
args = []
for i in range(len(fboxes)):
@@ -1407,7 +1407,7 @@
finish()"""
loop = parse(loopops)
looptoken = JitCellToken()
- self.cpu.compile_loop(None, loop.inputargs, loop.operations, looptoken)
+ self.cpu.compile_loop(loop.inputargs, loop.operations, looptoken)
args = [1]
args.append(longlong.getfloatstorage(132.25))
args.append(longlong.getfloatstorage(0.75))
@@ -1428,7 +1428,7 @@
ResOperation(rop.FINISH, [], None, descr=faildescr2),
]
bridgeops[-2].setfailargs(fboxes[:])
- self.cpu.compile_bridge(None, loop.operations[-2].getdescr(), fboxes,
+ self.cpu.compile_bridge(loop.operations[-2].getdescr(), fboxes,
bridgeops, looptoken)
args = [1,
longlong.getfloatstorage(132.25),
@@ -1463,7 +1463,7 @@
]
operations[1].setfailargs([])
looptoken = JitCellToken()
- self.cpu.compile_loop(None, inputargs, operations, looptoken)
+ self.cpu.compile_loop(inputargs, operations, looptoken)
#
for value in [-42, 0, 1, 10]:
deadframe = self.cpu.execute_token(looptoken, value)
@@ -1508,7 +1508,7 @@
]
operations[-2].setfailargs([])
looptoken = JitCellToken()
- self.cpu.compile_loop(None, inputargs, operations, looptoken)
+ self.cpu.compile_loop(inputargs, operations, looptoken)
#
for test1 in [-65, -42, -11, 0, 1, 10]:
if test1 == -42 or combinaison[0] == 'b':
@@ -1560,7 +1560,7 @@
]
operations[-2].setfailargs([])
looptoken = JitCellToken()
- self.cpu.compile_loop(None, inputargs, operations, looptoken)
+ self.cpu.compile_loop(inputargs, operations, looptoken)
#
for test1 in [65, 42, 11, 0, 1]:
if test1 == 42 or combinaison[0] == 'b':
@@ -1616,7 +1616,7 @@
]
operations[-2].setfailargs([])
looptoken = JitCellToken()
- self.cpu.compile_loop(None, inputargs, operations, looptoken)
+ self.cpu.compile_loop(inputargs, operations, looptoken)
#
nan = 1e200 * 1e200
nan /= nan
@@ -1675,7 +1675,7 @@
descr=faildescr))
looptoken = JitCellToken()
#
- self.cpu.compile_loop(None, inputargs, operations, looptoken)
+ self.cpu.compile_loop(inputargs, operations, looptoken)
#
args = []
for box in inputargs:
@@ -1748,7 +1748,7 @@
looptoken = JitCellToken()
# Use "set" to unique-ify inputargs
unique_testcase_list = list(set(testcase))
- self.cpu.compile_loop(None, unique_testcase_list, operations,
+ self.cpu.compile_loop(unique_testcase_list, operations,
looptoken)
args = [box.getfloatstorage()
for box in unique_testcase_list]
@@ -2065,7 +2065,7 @@
exc_ptr = xptr
loop = parse(ops, self.cpu, namespace=locals())
looptoken = JitCellToken()
- self.cpu.compile_loop(None, loop.inputargs, loop.operations, looptoken)
+ self.cpu.compile_loop(loop.inputargs, loop.operations, looptoken)
deadframe = self.cpu.execute_token(looptoken, 1)
assert self.cpu.get_ref_value(deadframe, 0) == xptr
excvalue = self.cpu.grab_exc_value(deadframe)
@@ -2088,7 +2088,7 @@
exc_ptr = yptr
loop = parse(ops, self.cpu, namespace=locals())
looptoken = JitCellToken()
- self.cpu.compile_loop(None, loop.inputargs, loop.operations, looptoken)
+ self.cpu.compile_loop(loop.inputargs, loop.operations, looptoken)
deadframe = self.cpu.execute_token(looptoken, 1)
assert self.cpu.get_int_value(deadframe, 0) == 1
excvalue = self.cpu.grab_exc_value(deadframe)
@@ -2105,7 +2105,7 @@
'''
loop = parse(ops, self.cpu, namespace=locals())
looptoken = JitCellToken()
- self.cpu.compile_loop(None, loop.inputargs, loop.operations, looptoken)
+ self.cpu.compile_loop(loop.inputargs, loop.operations, looptoken)
deadframe = self.cpu.execute_token(looptoken, 1)
assert self.cpu.get_int_value(deadframe, 0) == 1
excvalue = self.cpu.grab_exc_value(deadframe)
@@ -2284,7 +2284,7 @@
'func_ptr': func_ptr,
'calldescr': calldescr})
looptoken = JitCellToken()
- self.cpu.compile_loop(None, loop.inputargs, loop.operations, looptoken)
+ self.cpu.compile_loop(loop.inputargs, loop.operations, looptoken)
f1 = longlong.getfloatstorage(1.2)
f2 = longlong.getfloatstorage(3.4)
frame = self.cpu.execute_token(looptoken, 1, 0, 1, 2, 3, 4, 5, f1, f2)
@@ -2329,7 +2329,7 @@
]
ops[2].setfailargs([i1, i0])
looptoken = JitCellToken()
- self.cpu.compile_loop(None, [i0, i1], ops, looptoken)
+ self.cpu.compile_loop([i0, i1], ops, looptoken)
deadframe = self.cpu.execute_token(looptoken, 20, 0)
fail = self.cpu.get_latest_descr(deadframe)
assert fail.identifier == 0
@@ -2375,7 +2375,7 @@
]
ops[2].setfailargs([i1, i2, i0])
looptoken = JitCellToken()
- self.cpu.compile_loop(None, [i0, i1], ops, looptoken)
+ self.cpu.compile_loop([i0, i1], ops, looptoken)
deadframe = self.cpu.execute_token(looptoken, 20, 0)
fail = self.cpu.get_latest_descr(deadframe)
assert fail.identifier == 0
@@ -2423,7 +2423,7 @@
]
ops[2].setfailargs([i1, f2, i0])
looptoken = JitCellToken()
- self.cpu.compile_loop(None, [i0, i1], ops, looptoken)
+ self.cpu.compile_loop([i0, i1], ops, looptoken)
deadframe = self.cpu.execute_token(looptoken, 20, 0)
fail = self.cpu.get_latest_descr(deadframe)
assert fail.identifier == 0
@@ -2465,7 +2465,7 @@
]
ops[1].setfailargs([i1, i2])
looptoken = JitCellToken()
- self.cpu.compile_loop(None, [i1], ops, looptoken)
+ self.cpu.compile_loop([i1], ops, looptoken)
deadframe = self.cpu.execute_token(looptoken, ord('G'))
fail = self.cpu.get_latest_descr(deadframe)
assert fail.identifier == 0
@@ -2523,7 +2523,7 @@
]
ops[1].setfailargs([])
looptoken = JitCellToken()
- self.cpu.compile_loop(None, [i0, i1, i2, i3], ops, looptoken)
+ self.cpu.compile_loop([i0, i1, i2, i3], ops, looptoken)
args = [rffi.cast(lltype.Signed, raw),
2,
4,
@@ -2580,7 +2580,7 @@
ResOperation(rop.FINISH, [i3], None, descr=BasicFinalDescr(0))
]
looptoken = JitCellToken()
- self.cpu.compile_loop(None, [i1, i2], ops, looptoken)
+ self.cpu.compile_loop([i1, i2], ops, looptoken)
buffer = lltype.malloc(rffi.CCHARP.TO, buflen, flavor='raw')
args = [buflen, rffi.cast(lltype.Signed, buffer)]
@@ -2650,7 +2650,7 @@
]
ops[1].setfailargs([])
looptoken = JitCellToken()
- self.cpu.compile_loop(None, [], ops, looptoken)
+ self.cpu.compile_loop([], ops, looptoken)
deadframe = self.cpu.execute_token(looptoken)
fail = self.cpu.get_latest_descr(deadframe)
@@ -2790,7 +2790,7 @@
ops.insert(-1, ResOperation(rop.SAME_AS, [b1],
b1.clonebox()))
looptoken = JitCellToken()
- self.cpu.compile_loop(None, argboxes, ops, looptoken)
+ self.cpu.compile_loop(argboxes, ops, looptoken)
#
seen = []
deadframe = self.cpu.execute_token(looptoken, *argvalues_normal)
@@ -2815,7 +2815,7 @@
]
ops[0].setfailargs([i1])
looptoken = JitCellToken()
- self.cpu.compile_loop(None, [i0, i1], ops, looptoken)
+ self.cpu.compile_loop([i0, i1], ops, looptoken)
deadframe = self.cpu.execute_token(looptoken, -42, 9)
fail = self.cpu.get_latest_descr(deadframe)
@@ -2842,7 +2842,7 @@
ResOperation(rop.FINISH, [i2], None, descr=BasicFinalDescr(3))
]
ops[0].setfailargs([])
- self.cpu.compile_bridge(None, faildescr, [i2], ops, looptoken)
+ self.cpu.compile_bridge(faildescr, [i2], ops, looptoken)
deadframe = self.cpu.execute_token(looptoken, -42, 9)
fail = self.cpu.get_latest_descr(deadframe)
@@ -2875,7 +2875,7 @@
]
ops[0].setfailargs([])
looptoken = JitCellToken()
- self.cpu.compile_loop(None, [i0], ops, looptoken)
+ self.cpu.compile_loop([i0], ops, looptoken)
# mark as failing
self.cpu.invalidate_loop(looptoken)
# attach a bridge
@@ -2883,7 +2883,7 @@
ops2 = [
ResOperation(rop.JUMP, [ConstInt(333)], None, descr=labeldescr),
]
- self.cpu.compile_bridge(None, faildescr, [], ops2, looptoken)
+ self.cpu.compile_bridge(faildescr, [], ops2, looptoken)
# run: must not be caught in an infinite loop
deadframe = self.cpu.execute_token(looptoken, 16)
fail = self.cpu.get_latest_descr(deadframe)
@@ -3091,7 +3091,7 @@
looptoken.outermost_jitdriver_sd = FakeJitDriverSD()
finish_descr = loop.operations[-1].getdescr()
self.cpu.done_with_this_frame_descr_int = BasicFinalDescr()
- self.cpu.compile_loop(None, loop.inputargs, loop.operations, looptoken)
+ self.cpu.compile_loop(loop.inputargs, loop.operations, looptoken)
ARGS = [lltype.Signed] * 10
RES = lltype.Signed
FakeJitDriverSD.portal_calldescr = self.cpu.calldescrof(
@@ -3109,7 +3109,7 @@
'''
loop = parse(ops, namespace=locals())
othertoken = JitCellToken()
- self.cpu.compile_loop(None, loop.inputargs, loop.operations, othertoken)
+ self.cpu.compile_loop(loop.inputargs, loop.operations, othertoken)
args = [i+1 for i in range(10)]
deadframe = self.cpu.execute_token(othertoken, *args)
assert self.cpu.get_int_value(deadframe, 0) == 13
@@ -3119,7 +3119,7 @@
del called[:]
self.cpu.done_with_this_frame_descr_int = finish_descr
othertoken = JitCellToken()
- self.cpu.compile_loop(None, loop.inputargs, loop.operations, othertoken)
+ self.cpu.compile_loop(loop.inputargs, loop.operations, othertoken)
args = [i+1 for i in range(10)]
deadframe = self.cpu.execute_token(othertoken, *args)
assert self.cpu.get_int_value(deadframe, 0) == 97
@@ -3157,7 +3157,7 @@
loop = parse(ops)
looptoken = JitCellToken()
looptoken.outermost_jitdriver_sd = FakeJitDriverSD()
- self.cpu.compile_loop(None, loop.inputargs, loop.operations, looptoken)
+ self.cpu.compile_loop(loop.inputargs, loop.operations, looptoken)
ARGS = [lltype.Signed] * 10
RES = lltype.Signed
FakeJitDriverSD.portal_calldescr = self.cpu.calldescrof(
@@ -3171,7 +3171,7 @@
'''
loop = parse(ops, namespace=locals())
othertoken = JitCellToken()
- self.cpu.compile_loop(None, loop.inputargs, loop.operations, othertoken)
+ self.cpu.compile_loop(loop.inputargs, loop.operations, othertoken)
deadframe = self.cpu.execute_token(othertoken, sys.maxint - 1)
assert self.cpu.get_int_value(deadframe, 0) == 3
@@ -3209,7 +3209,7 @@
looptoken = JitCellToken()
looptoken.outermost_jitdriver_sd = FakeJitDriverSD()
self.cpu.done_with_this_frame_descr_float = BasicFinalDescr()
- self.cpu.compile_loop(None, loop.inputargs, loop.operations, looptoken)
+ self.cpu.compile_loop(loop.inputargs, loop.operations, looptoken)
args = [longlong.getfloatstorage(1.2),
longlong.getfloatstorage(2.3)]
deadframe = self.cpu.execute_token(looptoken, *args)
@@ -3223,7 +3223,7 @@
'''
loop = parse(ops, namespace=locals())
othertoken = JitCellToken()
- self.cpu.compile_loop(None, loop.inputargs, loop.operations, othertoken)
+ self.cpu.compile_loop(loop.inputargs, loop.operations, othertoken)
args = [longlong.getfloatstorage(1.2),
longlong.getfloatstorage(3.2)]
deadframe = self.cpu.execute_token(othertoken, *args)
@@ -3235,7 +3235,7 @@
del called[:]
self.cpu.done_with_this_frame_descr_float = finish_descr
othertoken = JitCellToken()
- self.cpu.compile_loop(None, loop.inputargs, loop.operations, othertoken)
+ self.cpu.compile_loop(loop.inputargs, loop.operations, othertoken)
args = [longlong.getfloatstorage(1.2),
longlong.getfloatstorage(4.2)]
deadframe = self.cpu.execute_token(othertoken, *args)
@@ -3298,7 +3298,7 @@
looptoken = JitCellToken()
looptoken.outermost_jitdriver_sd = FakeJitDriverSD()
self.cpu.done_with_this_frame_descr_float = BasicFinalDescr()
- self.cpu.compile_loop(None, loop.inputargs, loop.operations, looptoken)
+ self.cpu.compile_loop(loop.inputargs, loop.operations, looptoken)
finish_descr = loop.operations[-1].getdescr()
args = [longlong.getfloatstorage(1.25),
longlong.getfloatstorage(2.35)]
@@ -3315,7 +3315,7 @@
'''
loop = parse(ops, namespace=locals())
othertoken = JitCellToken()
- self.cpu.compile_loop(None, loop.inputargs, loop.operations, othertoken)
+ self.cpu.compile_loop(loop.inputargs, loop.operations, othertoken)
# normal call_assembler: goes to looptoken
args = [longlong.getfloatstorage(1.25),
@@ -3334,7 +3334,7 @@
loop2 = parse(ops)
looptoken2 = JitCellToken()
looptoken2.outermost_jitdriver_sd = FakeJitDriverSD()
- self.cpu.compile_loop(None, loop2.inputargs, loop2.operations, looptoken2)
+ self.cpu.compile_loop(loop2.inputargs, loop2.operations, looptoken2)
finish_descr2 = loop2.operations[-1].getdescr()
# install it
@@ -3694,7 +3694,7 @@
]
inputargs = [i0]
looptoken = JitCellToken()
- self.cpu.compile_loop(None, inputargs, operations, looptoken)
+ self.cpu.compile_loop(inputargs, operations, looptoken)
# overflowing value:
deadframe = self.cpu.execute_token(looptoken, sys.maxint // 4 + 1)
fail = self.cpu.get_latest_descr(deadframe)
@@ -3747,7 +3747,7 @@
operations[3].setfailargs([i1])
operations[6].setfailargs([i1])
- self.cpu.compile_loop(None, inputargs, operations, looptoken)
+ self.cpu.compile_loop(inputargs, operations, looptoken)
deadframe = self.cpu.execute_token(looptoken, 2)
fail = self.cpu.get_latest_descr(deadframe)
assert fail.identifier == 2
@@ -3759,7 +3759,7 @@
ResOperation(rop.INT_SUB, [i0, ConstInt(20)], i2),
ResOperation(rop.JUMP, [i2], None, descr=targettoken2),
]
- self.cpu.compile_bridge(None, faildescr, inputargs2, operations2, looptoken)
+ self.cpu.compile_bridge(faildescr, inputargs2, operations2, looptoken)
deadframe = self.cpu.execute_token(looptoken, 2)
fail = self.cpu.get_latest_descr(deadframe)
@@ -3776,7 +3776,7 @@
descr = BasicFinalDescr()
loop = parse(ops, self.cpu, namespace=locals())
looptoken = JitCellToken()
- self.cpu.compile_loop(None, loop.inputargs, loop.operations, looptoken)
+ self.cpu.compile_loop(loop.inputargs, loop.operations, looptoken)
for inp, outp in [(2,2), (-3, 0)]:
deadframe = self.cpu.execute_token(looptoken, inp)
assert outp == self.cpu.get_int_value(deadframe, 0)
@@ -3805,8 +3805,8 @@
bridge = parse(bridge_ops, self.cpu, namespace=locals())
looptoken = JitCellToken()
self.cpu.assembler.set_debug(False)
- info = self.cpu.compile_loop(None, loop.inputargs, loop.operations, looptoken)
- bridge_info = self.cpu.compile_bridge(None, faildescr, bridge.inputargs,
+ info = self.cpu.compile_loop(loop.inputargs, loop.operations, looptoken)
+ bridge_info = self.cpu.compile_bridge(faildescr, bridge.inputargs,
bridge.operations,
looptoken)
self.cpu.assembler.set_debug(True) # always on untranslated
@@ -3850,7 +3850,7 @@
ResOperation(rop.FINISH, [i0], None, descr=BasicFinalDescr(1234)),
]
operations[1].setfailargs([i0])
- self.cpu.compile_loop(None, inputargs, operations, looptoken1)
+ self.cpu.compile_loop(inputargs, operations, looptoken1)
def func(a, b, c, d, e, f, g, h, i):
assert a + 2 == b
@@ -3904,14 +3904,14 @@
ResOperation(rop.JUMP, [i19], None, descr=targettoken1),
]
operations2[-2].setfailargs([])
- self.cpu.compile_bridge(None, faildescr1, inputargs, operations2, looptoken1)
+ self.cpu.compile_bridge(faildescr1, inputargs, operations2, looptoken1)
looptoken2 = JitCellToken()
inputargs = [BoxInt()]
operations3 = [
ResOperation(rop.JUMP, [ConstInt(0)], None, descr=targettoken1),
]
- self.cpu.compile_loop(None, inputargs, operations3, looptoken2)
+ self.cpu.compile_loop(inputargs, operations3, looptoken2)
deadframe = self.cpu.execute_token(looptoken2, -9)
fail = self.cpu.get_latest_descr(deadframe)
@@ -3928,11 +3928,11 @@
operations[0].setfailargs([])
looptoken = JitCellToken()
inputargs = [t_box]
- self.cpu.compile_loop(None, inputargs, operations, looptoken)
+ self.cpu.compile_loop(inputargs, operations, looptoken)
operations = [
ResOperation(rop.FINISH, [], None, descr=BasicFinalDescr(99))
]
- self.cpu.compile_bridge(None, faildescr, [], operations, looptoken)
+ self.cpu.compile_bridge(faildescr, [], operations, looptoken)
deadframe = self.cpu.execute_token(looptoken, null_box.getref_base())
fail = self.cpu.get_latest_descr(deadframe)
assert fail.identifier == 99
@@ -3960,7 +3960,7 @@
#
loop = parse(ops, self.cpu, namespace=locals())
looptoken = JitCellToken()
- self.cpu.compile_loop(None, loop.inputargs, loop.operations, looptoken)
+ self.cpu.compile_loop(loop.inputargs, loop.operations, looptoken)
deadframe = self.cpu.execute_token(looptoken,
rffi.cast(lltype.Signed, p), 16)
result = self.cpu.get_int_value(deadframe, 0)
@@ -3990,7 +3990,7 @@
#
loop = parse(ops, self.cpu, namespace=locals())
looptoken = JitCellToken()
- self.cpu.compile_loop(None, loop.inputargs, loop.operations, looptoken)
+ self.cpu.compile_loop(loop.inputargs, loop.operations, looptoken)
deadframe = self.cpu.execute_token(looptoken,
rffi.cast(lltype.Signed, p), 16)
result = self.cpu.get_float_value(deadframe, 0)
@@ -4020,7 +4020,7 @@
#
loop = parse(ops, self.cpu, namespace=locals())
looptoken = JitCellToken()
- self.cpu.compile_loop(None, loop.inputargs, loop.operations, looptoken)
+ self.cpu.compile_loop(loop.inputargs, loop.operations, looptoken)
deadframe = self.cpu.execute_token(looptoken,
rffi.cast(lltype.Signed, p), 16)
result = self.cpu.get_int_value(deadframe, 0)
@@ -4052,7 +4052,7 @@
p[i] = '\xDD'
loop = parse(ops, self.cpu, namespace=locals())
looptoken = JitCellToken()
- self.cpu.compile_loop(None, loop.inputargs, loop.operations, looptoken)
+ self.cpu.compile_loop(loop.inputargs, loop.operations, looptoken)
self.cpu.execute_token(looptoken,
rffi.cast(lltype.Signed, p), 16, value)
result = rawstorage.raw_storage_getitem(T, p, 16)
@@ -4084,7 +4084,7 @@
p[i] = '\xDD'
loop = parse(ops, self.cpu, namespace=locals())
looptoken = JitCellToken()
- self.cpu.compile_loop(None, loop.inputargs, loop.operations, looptoken)
+ self.cpu.compile_loop(loop.inputargs, loop.operations, looptoken)
self.cpu.execute_token(looptoken,
rffi.cast(lltype.Signed, p), 16,
longlong.getfloatstorage(value))
@@ -4118,7 +4118,7 @@
p[i] = '\xDD'
loop = parse(ops, self.cpu, namespace=locals())
looptoken = JitCellToken()
- self.cpu.compile_loop(None, loop.inputargs, loop.operations, looptoken)
+ self.cpu.compile_loop(loop.inputargs, loop.operations, looptoken)
self.cpu.execute_token(looptoken,
rffi.cast(lltype.Signed, p), 16,
longlong.singlefloat2int(value))
@@ -4153,7 +4153,7 @@
]
ops[2].setfailargs([i2])
looptoken = JitCellToken()
- self.cpu.compile_loop(None, [i0, i1], ops, looptoken)
+ self.cpu.compile_loop([i0, i1], ops, looptoken)
deadframe = self.cpu.execute_token(looptoken, 20, 0)
fail = self.cpu.get_latest_descr(deadframe)
assert fail.identifier == 23
@@ -4187,7 +4187,7 @@
finish(i1, descr=finaldescr)
""", namespace={'finaldescr': finaldescr, 'calldescr2': calldescr2,
'guarddescr': guarddescr, 'func2_ptr': func2_ptr})
- self.cpu.compile_bridge(None, faildescr, bridge.inputargs,
+ self.cpu.compile_bridge(faildescr, bridge.inputargs,
bridge.operations, looptoken)
cpu = self.cpu
@@ -4220,7 +4220,7 @@
guard_true(i0, descr=faildescr) [i1, i2, px]
finish(i2, descr=finaldescr2)
""", namespace=locals())
- self.cpu.compile_loop(None, loop.inputargs, loop.operations, looptoken)
+ self.cpu.compile_loop(loop.inputargs, loop.operations, looptoken)
frame = self.cpu.execute_token(looptoken, 0, 0, 3)
assert self.cpu.get_latest_descr(frame) is guarddescr
from rpython.jit.backend.llsupport.llmodel import AbstractLLCPU
@@ -4269,7 +4269,7 @@
'faildescr2': BasicFailDescr(1),
'xtp': xtp
})
- self.cpu.compile_bridge(None, faildescr, bridge.inputargs,
+ self.cpu.compile_bridge(faildescr, bridge.inputargs,
More information about the pypy-commit
mailing list