Author: Armin Rigo <[email protected]>
Branch: stm-thread-2
Changeset: r61599:cf4450c80c67
Date: 2013-02-22 12:50 +0100
http://bitbucket.org/pypy/pypy/changeset/cf4450c80c67/
Log: Fix
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
@@ -50,7 +50,7 @@
def stm_extraref_lladdr(funcgen, op):
arg0 = funcgen.expr(op.args[0])
result = funcgen.expr(op.result)
- return '%s = stm_extraref_lladdr(%s);' % (result, arg0)
+ return '%s = (char *)stm_extraref_lladdr(%s);' % (result, arg0)
def _stm_nogc_init_function():
"""Called at process start-up when running with no GC."""
diff --git a/rpython/translator/stm/src_stm/et.h
b/rpython/translator/stm/src_stm/et.h
--- a/rpython/translator/stm/src_stm/et.h
+++ b/rpython/translator/stm/src_stm/et.h
@@ -126,7 +126,7 @@
void stm_abort_info_pop(long);
char *stm_inspect_abort_info(void);
long stm_extraref_llcount(void);
-gcptr stm_extraref_lladdr(long);
+gcptr *stm_extraref_lladdr(long);
#ifdef USING_NO_GC_AT_ALL
# define OP_GC_ADR_OF_ROOT_STACK_TOP(r) r = NULL
diff --git a/rpython/translator/stm/src_stm/rpyintf.c
b/rpython/translator/stm/src_stm/rpyintf.c
--- a/rpython/translator/stm/src_stm/rpyintf.c
+++ b/rpython/translator/stm/src_stm/rpyintf.c
@@ -297,10 +297,10 @@
return d->abortinfo.size / 2;
}
-gcptr stm_extraref_lladdr(long index)
+gcptr *stm_extraref_lladdr(long index)
{
struct tx_descriptor *d = thread_descriptor;
- return d->abortinfo.items[index * 2];
+ return &d->abortinfo.items[index * 2];
}
#ifdef USING_NO_GC_AT_ALL
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
