Changed some blockInts assertions to > 0.

diff --git a/src/threads/green/locks.c b/src/threads/green/locks.c
index 805690b48cdf9032f833d3c1a614036e95130c38..041113fde21f0188089202ae9141eec000bb14ee 100644 (file)
--- a/src/threads/green/locks.c
+++ b/src/threads/green/locks.c
@@ -421,7 +421,7 @@ broadcast_cond (iCv *cond)
 void
 internal_lock_mutex(iMux* mux)
 {
-       assert(blockInts == 1);
+       assert(blockInts > 0);
 
     if (mux->holder == 0)
     {
@@ -452,7 +452,7 @@ internal_unlock_mutex(iMux* mux)
 {
     thread* tid;
 
-       assert(blockInts == 1);
+       assert(blockInts > 0);
 
     assert(mux->holder == currentThread);
     
@@ -485,7 +485,7 @@ internal_wait_cond(iMux* mux, iCv* cv, s8 timeout)
                exceptionptr = native_new_and_init(class_java_lang_IllegalMonitorStateException);
     }
 
-       assert(blockInts == 1);
+       assert(blockInts > 0);
 
     count = mux->count;
     mux->holder = 0;
@@ -529,7 +529,7 @@ internal_signal_cond (iCv* cv)
                exceptionptr = native_new_and_init(class_java_lang_IllegalMonitorStateException);
     }
 
-       assert(blockInts == 1);
+       assert(blockInts > 0);
 
     /* Remove one thread from cv list */
     if (cv->cvWaiters != 0) {
@@ -561,7 +561,7 @@ internal_broadcast_cond (iCv* cv)
                exceptionptr = native_new_and_init(class_java_lang_IllegalMonitorStateException);
     }
 
-       assert(blockInts == 1);
+       assert(blockInts > 0);
 
     /* Find the end of the cv list */
     if (cv->cvWaiters) {

diff --git a/src/threads/green/threads.c b/src/threads/green/threads.c
index ffe7096a92c6514496e864e00dd02ab3733540a2..d1ccb60fbdaed774ac50296c238920362f7c1560 100644 (file)
--- a/src/threads/green/threads.c
+++ b/src/threads/green/threads.c
@@ -458,7 +458,7 @@ suspendOnQThread(thread* tid, thread** queue)
 
        DBG( printf("suspendOnQThread %p %p\n", tid, queue); );
 
-       assert(blockInts == 1);
+       assert(blockInts > 0);
 
        if (CONTEXT(tid).status != THREAD_SUSPENDED)
        {

diff --git a/threads/locks.c b/threads/locks.c
index 805690b48cdf9032f833d3c1a614036e95130c38..041113fde21f0188089202ae9141eec000bb14ee 100644 (file)
--- a/threads/locks.c
+++ b/threads/locks.c
@@ -421,7 +421,7 @@ broadcast_cond (iCv *cond)
 void
 internal_lock_mutex(iMux* mux)
 {
-       assert(blockInts == 1);
+       assert(blockInts > 0);
 
     if (mux->holder == 0)
     {
@@ -452,7 +452,7 @@ internal_unlock_mutex(iMux* mux)
 {
     thread* tid;
 
-       assert(blockInts == 1);
+       assert(blockInts > 0);
 
     assert(mux->holder == currentThread);
     
@@ -485,7 +485,7 @@ internal_wait_cond(iMux* mux, iCv* cv, s8 timeout)
                exceptionptr = native_new_and_init(class_java_lang_IllegalMonitorStateException);
     }
 
-       assert(blockInts == 1);
+       assert(blockInts > 0);
 
     count = mux->count;
     mux->holder = 0;
@@ -529,7 +529,7 @@ internal_signal_cond (iCv* cv)
                exceptionptr = native_new_and_init(class_java_lang_IllegalMonitorStateException);
     }
 
-       assert(blockInts == 1);
+       assert(blockInts > 0);
 
     /* Remove one thread from cv list */
     if (cv->cvWaiters != 0) {
@@ -561,7 +561,7 @@ internal_broadcast_cond (iCv* cv)
                exceptionptr = native_new_and_init(class_java_lang_IllegalMonitorStateException);
     }
 
-       assert(blockInts == 1);
+       assert(blockInts > 0);
 
     /* Find the end of the cv list */
     if (cv->cvWaiters) {

diff --git a/threads/thread.c b/threads/thread.c
index ffe7096a92c6514496e864e00dd02ab3733540a2..d1ccb60fbdaed774ac50296c238920362f7c1560 100644 (file)
--- a/threads/thread.c
+++ b/threads/thread.c
@@ -458,7 +458,7 @@ suspendOnQThread(thread* tid, thread** queue)
 
        DBG( printf("suspendOnQThread %p %p\n", tid, queue); );
 
-       assert(blockInts == 1);
+       assert(blockInts > 0);
 
        if (CONTEXT(tid).status != THREAD_SUSPENDED)
        {