native threads - there was something missing

diff --git a/src/threads/native/threads.c b/src/threads/native/threads.c
index 0e6b4123e6a67844aef55958f40c3c09ab184946..d9e769e535cdd175189ea458cad45b2e56f862b8 100644 (file)
--- a/src/threads/native/threads.c
+++ b/src/threads/native/threads.c
@@ -126,7 +126,7 @@ void thread_registercritical(threadcritnode *n)
        avl_insert(criticaltree, n);
 }
 
-static u1 *thread_checkcritical(u1 *mcodeptr)
+u1 *thread_checkcritical(u1 *mcodeptr)
 {
        const threadcritnode *n = findcritical(mcodeptr);
        return (n && mcodeptr < n->mcodeend && mcodeptr > n->mcodebegin) ? n->mcoderestart : NULL;
@@ -203,10 +203,7 @@ static void sigsuspend_handler(ucontext_t *ctx)
        sigset_t sigs;
        void *critical;
        
-#ifdef __I386__
-       if ((critical = thread_checkcritical((void*) ctx->uc_mcontext.gregs[REG_EIP])) != NULL)
-               ctx->uc_mcontext.gregs[REG_EIP] = (long) critical;
-#endif
+       thread_restartcriticalsection(ctx);
 
        sem_post(&suspend_ack);
 

diff --git a/src/threads/native/threads.h b/src/threads/native/threads.h
index a4d1b9c844518595efda5166a4195e595b6c01c6..7bc12770eae7ffe7a3ea5e2a00cf794ab8472fb3 100644 (file)
--- a/src/threads/native/threads.h
+++ b/src/threads/native/threads.h
@@ -97,6 +97,7 @@ typedef struct {
 } threadcritnode;
 
 void thread_registercritical(threadcritnode *);
+u1 *thread_checkcritical(u1*);
 
 extern volatile int stopworldwhere;
 

diff --git a/threads/nativethread.c b/threads/nativethread.c
index 0e6b4123e6a67844aef55958f40c3c09ab184946..d9e769e535cdd175189ea458cad45b2e56f862b8 100644 (file)
--- a/threads/nativethread.c
+++ b/threads/nativethread.c
@@ -126,7 +126,7 @@ void thread_registercritical(threadcritnode *n)
        avl_insert(criticaltree, n);
 }
 
-static u1 *thread_checkcritical(u1 *mcodeptr)
+u1 *thread_checkcritical(u1 *mcodeptr)
 {
        const threadcritnode *n = findcritical(mcodeptr);
        return (n && mcodeptr < n->mcodeend && mcodeptr > n->mcodebegin) ? n->mcoderestart : NULL;
@@ -203,10 +203,7 @@ static void sigsuspend_handler(ucontext_t *ctx)
        sigset_t sigs;
        void *critical;
        
-#ifdef __I386__
-       if ((critical = thread_checkcritical((void*) ctx->uc_mcontext.gregs[REG_EIP])) != NULL)
-               ctx->uc_mcontext.gregs[REG_EIP] = (long) critical;
-#endif
+       thread_restartcriticalsection(ctx);
 
        sem_post(&suspend_ack);
 

diff --git a/threads/nativethread.h b/threads/nativethread.h
index a4d1b9c844518595efda5166a4195e595b6c01c6..7bc12770eae7ffe7a3ea5e2a00cf794ab8472fb3 100644 (file)
--- a/threads/nativethread.h
+++ b/threads/nativethread.h
@@ -97,6 +97,7 @@ typedef struct {
 } threadcritnode;
 
 void thread_registercritical(threadcritnode *);
+u1 *thread_checkcritical(u1*);
 
 extern volatile int stopworldwhere;