[pypy-commit] pypy stmgc-c7: import stmgc/8bd21f95eb8a (branch "marker")

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: stmgc-c7
Changeset: r70775:db460ef20c68
Date: 2014-04-19 18:42 +0200
http://bitbucket.org/pypy/pypy/changeset/db460ef20c68/

Log:	import stmgc/8bd21f95eb8a (branch "marker")

diff --git a/rpython/translator/stm/src_stm/revision b/rpython/translator/stm/src_stm/revision
--- a/rpython/translator/stm/src_stm/revision
+++ b/rpython/translator/stm/src_stm/revision
@@ -1,1 +1,1 @@
-035e1c7879be
+8bd21f95eb8a
diff --git a/rpython/translator/stm/src_stm/stm/marker.c b/rpython/translator/stm/src_stm/stm/marker.c
--- a/rpython/translator/stm/src_stm/stm/marker.c
+++ b/rpython/translator/stm/src_stm/stm/marker.c
@@ -4,7 +4,7 @@
 #endif
 
 
-void (*stmcb_expand_marker)(uintptr_t odd_number,
+void (*stmcb_expand_marker)(char *segment_base, uintptr_t odd_number,
                             object_t *following_object,
                             char *outputbuf, size_t outputbufsize);
 
@@ -22,7 +22,7 @@
             uintptr_t x = (uintptr_t)current->ss;
             if (x & 1) {
                 /* the stack entry is an odd number */
-                stmcb_expand_marker(x, current[1].ss,
+                stmcb_expand_marker(pseg->pub.segment_base, x, current[1].ss,
                                     pseg->marker_self, _STM_MARKER_LEN);
 
                 if (pseg->marker_self[0] == 0) {
diff --git a/rpython/translator/stm/src_stm/stmgc.h b/rpython/translator/stm/src_stm/stmgc.h
--- a/rpython/translator/stm/src_stm/stmgc.h
+++ b/rpython/translator/stm/src_stm/stmgc.h
@@ -379,7 +379,7 @@
 /* The markers pushed in the shadowstack are an odd number followed by a
    regular pointer.  When needed, this library invokes this callback to
    turn this pair into a human-readable explanation. */
-extern void (*stmcb_expand_marker)(uintptr_t odd_number,
+extern void (*stmcb_expand_marker)(char *segment_base, uintptr_t odd_number,
                                    object_t *following_object,
                                    char *outputbuf, size_t outputbufsize);