Author: Carl Friedrich Bolz <[email protected]>
Branch: space-newtext
Changeset: r88317:f4971678b89f
Date: 2016-11-10 18:17 +0100
http://bitbucket.org/pypy/pypy/changeset/f4971678b89f/
Log: pypyjit
diff --git a/pypy/module/pypyjit/hooks.py b/pypy/module/pypyjit/hooks.py
--- a/pypy/module/pypyjit/hooks.py
+++ b/pypy/module/pypyjit/hooks.py
@@ -18,9 +18,9 @@
try:
try:
space.call_function(cache.w_abort_hook,
- space.wrap(jitdriver.name),
+ space.newtext(jitdriver.name),
wrap_greenkey(space, jitdriver, greenkey,
greenkey_repr),
- space.wrap(Counters.counter_names[reason]),
+ space.newtext(Counters.counter_names[reason]),
space.newlist(oplist_w)
)
except OperationError as e:
@@ -38,7 +38,7 @@
try:
try:
space.call_function(cache.w_trace_too_long_hook,
- space.wrap(jitdriver.name),
+ space.newtext(jitdriver.name),
wrap_greenkey(space, jitdriver, greenkey,
greenkey_repr))
except OperationError as e:
e.write_unraisable(space, "jit hook",
cache.w_trace_too_long_hook)
@@ -69,7 +69,7 @@
try:
try:
space.call_function(cache.w_compile_hook,
- space.wrap(w_debug_info))
+ w_debug_info)
except OperationError as e:
e.write_unraisable(space, "jit hook ",
cache.w_compile_hook)
finally:
diff --git a/pypy/module/pypyjit/interp_resop.py
b/pypy/module/pypyjit/interp_resop.py
--- a/pypy/module/pypyjit/interp_resop.py
+++ b/pypy/module/pypyjit/interp_resop.py
@@ -361,19 +361,19 @@
w_times = space.newdict()
if ll_times:
for i in range(len(ll_times)):
- w_key = space.newtuple([space.wrap(ll_times[i].type),
- space.wrap(ll_times[i].number)])
+ w_key = space.newtuple([space.newtext(ll_times[i].type),
+ space.newint(ll_times[i].number)])
space.setitem(w_times, w_key,
- space.wrap(ll_times[i].counter))
+ space.newint(ll_times[i].counter))
w_counters = space.newdict()
for i, counter_name in enumerate(Counters.counter_names):
v = jit_hooks.stats_get_counter_value(None, i)
- space.setitem_str(w_counters, counter_name, space.wrap(v))
+ space.setitem_str(w_counters, counter_name, space.newint(v))
w_counter_times = space.newdict()
tr_time = jit_hooks.stats_get_times_value(None, Counters.TRACING)
- space.setitem_str(w_counter_times, 'TRACING', space.wrap(tr_time))
+ space.setitem_str(w_counter_times, 'TRACING', space.newfloat(tr_time))
b_time = jit_hooks.stats_get_times_value(None, Counters.BACKEND)
- space.setitem_str(w_counter_times, 'BACKEND', space.wrap(b_time))
+ space.setitem_str(w_counter_times, 'BACKEND', space.newfloat(b_time))
return W_JitInfoSnapshot(space, w_times, w_counters, w_counter_times)
def get_stats_asmmemmgr(space):
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
