Author: Armin Rigo <[email protected]>
Branch: stmgc-c7
Changeset: r70242:e2ff7181a058
Date: 2014-03-24 11:18 +0100
http://bitbucket.org/pypy/pypy/changeset/e2ff7181a058/
Log: more typos
diff --git a/rpython/rlib/rstm.py b/rpython/rlib/rstm.py
--- a/rpython/rlib/rstm.py
+++ b/rpython/rlib/rstm.py
@@ -12,7 +12,7 @@
adr_nursery_free = CDefinedIntSymbolic('((long)&STM_SEGMENT->nursery_current)')
adr_nursery_top = CDefinedIntSymbolic('((long)&STM_SEGMENT->nursery_end)')
adr_pypy_stm_nursery_low_fill_mark = (
- CDefinedIntSymbolic('((long)&pypy_stm_nursery_low_fill_mark'))
+ CDefinedIntSymbolic('((long)&pypy_stm_nursery_low_fill_mark)'))
adr_transaction_read_version = (
CDefinedIntSymbolic('((long)&STM_SEGMENT->transaction_read_version)'))
adr_jmpbuf_ptr = (
@@ -20,7 +20,7 @@
adr_write_slowpath = CDefinedIntSymbolic('((long)&_stm_write_slowpath)')
adr_jit_default_msg = (
- CDefinedIntSymbolic('((long)"return from JITted function")'))
+ CDefinedIntSymbolic('((long)(char *)"return from JITted function")'))
adr__stm_become_inevitable = (
CDefinedIntSymbolic('((long)&_stm_become_inevitable)'))
adr_stm_commit_transaction = (
diff --git a/rpython/translator/c/src/mem.h b/rpython/translator/c/src/mem.h
--- a/rpython/translator/c/src/mem.h
+++ b/rpython/translator/c/src/mem.h
@@ -11,6 +11,10 @@
#define OP_STACK_CURRENT(r) r = (Signed)&r
+#define OP_JIT_STM_TRANSACTION_BREAK_POINT(r) /* nothing */
+#define OP_JIT_STM_SHOULD_BREAK_TRANSACTION(x, r) r = 0
+
+
#ifdef RPY_STM
void _pypy_stm_free(void *);
#define _OP_RAW_MALLOCED(r) stm_call_on_abort(&stm_thread_local, r, \
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
@@ -222,13 +222,6 @@
## stm_clear_on_abort(&pypy_g_ExcData, sizeof(pypy_g_ExcData));
## '''
-##def jit_stm_transaction_break_point(funcgen, op):
-## return '/* jit_stm_transaction_break_point */'
-
-##def jit_stm_should_break_transaction(funcgen, op):
-## result = funcgen.expr(op.result)
-## return '%s = 0; /* jit_stm_should_break_transaction */' % (result, )
-
##def stm_finalize(funcgen, op):
## return 'stm_finalize();'
diff --git a/rpython/translator/stm/src_stm/stmgcintf.c
b/rpython/translator/stm/src_stm/stmgcintf.c
--- a/rpython/translator/stm/src_stm/stmgcintf.c
+++ b/rpython/translator/stm/src_stm/stmgcintf.c
@@ -152,7 +152,7 @@
assert(v_old_shadowstack == stm_thread_local.shadowstack);
STM_PUSH_ROOT(stm_thread_local, arg);
- long result = v_callback(arg, counter);
+ long result = v_callback(arg, v_counter);
if (result <= 0)
break;
v_counter = 0;
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
