Author: Remi Meier
Branch:
Changeset: r1108:f6d1d934b8ab
Date: 2014-03-27 16:42 +0100
http://bitbucket.org/pypy/stmgc/changeset/f6d1d934b8ab/
Log: make htm-c7 pypy-compatible
diff --git a/htm-c7/stmgc.h b/htm-c7/stmgc.h
--- a/htm-c7/stmgc.h
+++ b/htm-c7/stmgc.h
@@ -21,7 +21,7 @@
extern __thread struct htm_transaction_info_s _htm_info;
-typedef struct { /* empty */ } stm_jmpbuf_t;
+typedef void* stm_jmpbuf_t[5]; /* for use with __builtin_setjmp() */
typedef struct object_s {
uint32_t gil_flags;
@@ -32,6 +32,8 @@
object_t **shadowstack_base;
object_t *thread_local_obj;
long last_abort__bytes_in_nursery;
+ char *mem_clear_on_abort; /* compat only -- always NULL */
+ size_t mem_bytes_to_clear_on_abort; /* compat only -- always NULL */
} stm_thread_local_t;
extern stm_thread_local_t *_stm_tloc;
@@ -92,6 +94,9 @@
void stm_start_inevitable_transaction(stm_thread_local_t *tl);
void stm_commit_transaction(void);
+inline static void _stm_start_transaction(stm_thread_local_t *tl, stm_jmpbuf_t
*buf)
+{ stm_start_inevitable_transaction(tl); }
+
inline static void stm_become_inevitable(
stm_thread_local_t *tl, const char *msg) { }
inline static void _stm_become_inevitable(const char *msg) { }
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
