[pypy-commit] stmgc default: More compatibility

arigo noreply at buildbot.pypy.org
Fri Mar 14 08:13:09 CET 2014


Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r1006:f0a5e8de6637
Date: 2014-03-14 08:13 +0100
http://bitbucket.org/pypy/stmgc/changeset/f0a5e8de6637/

Log:	More compatibility

diff --git a/gil-c7/stmgc.c b/gil-c7/stmgc.c
--- a/gil-c7/stmgc.c
+++ b/gil-c7/stmgc.c
@@ -4,6 +4,7 @@
 
 pthread_mutex_t _stm_gil = PTHREAD_MUTEX_INITIALIZER;
 stm_thread_local_t *_stm_tloc;
+struct stm_segment_info_s _stm_segment;
 
 
 /************************************************************/
@@ -160,6 +161,7 @@
 char *_stm_nursery_base    = NULL;
 char *_stm_nursery_current = NULL;
 char *_stm_nursery_end     = NULL;
+#define _stm_nursery_start ((uintptr_t)_stm_nursery_base)
 
 static bool _is_in_nursery(object_t *obj)
 {
diff --git a/gil-c7/stmgc.h b/gil-c7/stmgc.h
--- a/gil-c7/stmgc.h
+++ b/gil-c7/stmgc.h
@@ -28,6 +28,10 @@
 extern stm_thread_local_t *_stm_tloc;
 extern char *_stm_nursery_current, *_stm_nursery_end;
 
+struct stm_segment_info_s { stm_jmpbuf_t *jmpbuf_ptr; };
+extern struct stm_segment_info_s _stm_segment;
+#define STM_SEGMENT (&_stm_segment)
+
 #ifdef NDEBUG
 #define OPT_ASSERT(cond) do { if (!(cond)) __builtin_unreachable(); } while (0)
 #else


More information about the pypy-commit mailing list