[vmkit-commits] [vmkit] r142838 - in /vmkit/trunk: include/mvm/Threads/Thread.h lib/Mvm/CommonThread/ctthread.cpp

[Will Dietz]

Author: wdietz2
Date: Mon Oct 24 14:37:51 2011
New Revision: 142838

URL: http://llvm.org/viewvc/llvm-project?rev=142838&view=rev
Log:
Change enterUncooperativeCode prototype to fix build on 32bit.

Modified:
    vmkit/trunk/include/mvm/Threads/Thread.h
    vmkit/trunk/lib/Mvm/CommonThread/ctthread.cpp

Modified: vmkit/trunk/include/mvm/Threads/Thread.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/include/mvm/Threads/Thread.h?rev=142838&r1=142837&r2=142838&view=diff
==============================================================================
--- vmkit/trunk/include/mvm/Threads/Thread.h (original)
+++ vmkit/trunk/include/mvm/Threads/Thread.h Mon Oct 24 14:37:51 2011
@@ -208,7 +208,7 @@
   void joinRVBeforeEnter();
   void joinRVAfterLeave(word_t savedSP);
 
-  void enterUncooperativeCode(unsigned level = 0) __attribute__ ((noinline));
+  void enterUncooperativeCode(uint16_t level = 0) __attribute__ ((noinline));
   void enterUncooperativeCode(word_t SP);
   void leaveUncooperativeCode();
   word_t waitOnSP();

Modified: vmkit/trunk/lib/Mvm/CommonThread/ctthread.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/Mvm/CommonThread/ctthread.cpp?rev=142838&r1=142837&r2=142838&view=diff
==============================================================================
--- vmkit/trunk/lib/Mvm/CommonThread/ctthread.cpp (original)
+++ vmkit/trunk/lib/Mvm/CommonThread/ctthread.cpp Mon Oct 24 14:37:51 2011
@@ -179,7 +179,7 @@
   }
 }
 
-void Thread::enterUncooperativeCode(unsigned level) {
+void Thread::enterUncooperativeCode(uint16_t level) {
   if (isMvmThread()) {
     if (!inRV) {
       assert(!lastSP && "SP already set when entering uncooperative code");