Author: Armin Rigo <ar...@tunes.org>
Branch: stmgc-c7
Changeset: r70684:7780bb8b2a13
Date: 2014-04-16 17:43 +0200
http://bitbucket.org/pypy/pypy/changeset/7780bb8b2a13/
Log: kill more
diff --git a/rpython/memory/gctransform/stmframework.py
b/rpython/memory/gctransform/stmframework.py
--- a/rpython/memory/gctransform/stmframework.py
+++ b/rpython/memory/gctransform/stmframework.py
@@ -123,7 +123,6 @@
gct_stm_become_globally_unique_transaction = _gct_with_roots_pushed
gct_stm_perform_transaction = _gct_with_roots_pushed
- gct_stm_inspect_abort_info = _gct_with_roots_pushed
gct_stm_threadlocalref_set = _gct_with_roots_pushed
diff --git a/rpython/rtyper/llinterp.py b/rpython/rtyper/llinterp.py
--- a/rpython/rtyper/llinterp.py
+++ b/rpython/rtyper/llinterp.py
@@ -959,9 +959,6 @@
op_stm_get_atomic = _stm_not_implemented
op_stm_change_atomic = _stm_not_implemented
op_stm_set_transaction_length = _stm_not_implemented
- op_stm_abort_info_push = _stm_not_implemented
- op_stm_abort_info_pop = _stm_not_implemented
- op_stm_inspect_abort_info = _stm_not_implemented
op_stm_threadlocal_get = _stm_not_implemented
op_stm_threadlocal_set = _stm_not_implemented
op_stm_threadlocalref_get = _stm_not_implemented
diff --git a/rpython/rtyper/lltypesystem/lloperation.py
b/rpython/rtyper/lltypesystem/lloperation.py
--- a/rpython/rtyper/lltypesystem/lloperation.py
+++ b/rpython/rtyper/lltypesystem/lloperation.py
@@ -448,10 +448,6 @@
'stm_decrement_atomic': LLOp(),
'stm_get_atomic': LLOp(sideeffects=False),
- 'stm_abort_info_push': LLOp(),
- 'stm_abort_info_pop': LLOp(),
- 'stm_inspect_abort_info': LLOp(sideeffects=False, canmallocgc=True),
-
'stm_ignored_start': LLOp(canrun=True),
'stm_ignored_stop': LLOp(canrun=True),
diff --git a/rpython/translator/stm/funcgen.py
b/rpython/translator/stm/funcgen.py
--- a/rpython/translator/stm/funcgen.py
+++ b/rpython/translator/stm/funcgen.py
@@ -196,19 +196,6 @@
def stm_abort_and_retry(funcgen, op):
return 'stm_abort_transaction();'
-def stm_abort_info_push(funcgen, op):
- arg0 = funcgen.expr(op.args[0])
- arg1 = funcgen.expr(op.args[1])
- return '//XXX stm_abort_info_push((gcptr)%s, %s);' % (arg0, arg1)
-
-def stm_abort_info_pop(funcgen, op):
- arg0 = funcgen.expr(op.args[0])
- return '//XXX stm_abort_info_pop(%s);' % (arg0,)
-
-def stm_inspect_abort_info(funcgen, op):
- result = funcgen.expr(op.result)
- return '%s = NULL; //XXX stm_inspect_abort_info();' % (result,)
-
def stm_ignored_start(funcgen, op):
return '/* stm_ignored_start */'
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
