[vmkit-commits] [vmkit] r120210 - in /vmkit/trunk: include/mvm/Threads/Thread.h lib/J3/Compiler/JavaJIT.cpp lib/J3/LLVMRuntime/runtime-default.ll lib/Mvm/Compiler/LoopSafePoints.cpp

[Nicolas Geoffray]

Author: geoffray
Date: Sat Nov 27 06:21:15 2010
New Revision: 120210

URL: http://llvm.org/viewvc/llvm-project?rev=120210&view=rev
Log:
Put back bool type in mvm::Thread, llvm and gcc are compatible with each other.


Modified:
    vmkit/trunk/include/mvm/Threads/Thread.h
    vmkit/trunk/lib/J3/Compiler/JavaJIT.cpp
    vmkit/trunk/lib/J3/LLVMRuntime/runtime-default.ll
    vmkit/trunk/lib/Mvm/Compiler/LoopSafePoints.cpp

Modified: vmkit/trunk/include/mvm/Threads/Thread.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/include/mvm/Threads/Thread.h?rev=120210&r1=120209&r2=120210&view=diff
==============================================================================
--- vmkit/trunk/include/mvm/Threads/Thread.h (original)
+++ vmkit/trunk/include/mvm/Threads/Thread.h Sat Nov 27 06:21:15 2010
@@ -192,19 +192,15 @@
  
   /// doYield - Flag to tell the thread to yield for GC reasons.
   ///
-  char doYield;
-
-  /// vmData - vm specific data
-  ///
-	//  void* vmData;
+  bool doYield;
 
   /// inRV - Flag to tell that the thread is being part of a rendezvous.
   ///
-  char inRV;
+  bool inRV;
 
   /// joinedRV - Flag to tell that the thread has joined a rendezvous.
   ///
-  char joinedRV;
+  bool joinedRV;
 
   /// get - Get the thread specific data of the current thread.
   ///

Modified: vmkit/trunk/lib/J3/Compiler/JavaJIT.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Compiler/JavaJIT.cpp?rev=120210&r1=120209&r2=120210&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/Compiler/JavaJIT.cpp (original)
+++ vmkit/trunk/lib/J3/Compiler/JavaJIT.cpp Sat Nov 27 06:21:15 2010
@@ -1181,7 +1181,6 @@
     Value* YieldPtr = getDoYieldPtr(getMutatorThreadPtr());
 
     Value* Yield = new LoadInst(YieldPtr, "", currentBlock);
-		Yield =        new ICmpInst(*currentBlock, ICmpInst::ICMP_NE, Yield, intrinsics->constantInt8Zero, "");
 
     BasicBlock* continueBlock = createBasicBlock("After safe point");
     BasicBlock* yieldBlock = createBasicBlock("In safe point");

Modified: vmkit/trunk/lib/J3/LLVMRuntime/runtime-default.ll
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/LLVMRuntime/runtime-default.ll?rev=120210&r1=120209&r2=120210&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/LLVMRuntime/runtime-default.ll (original)
+++ vmkit/trunk/lib/J3/LLVMRuntime/runtime-default.ll Sat Nov 27 06:21:15 2010
@@ -33,15 +33,15 @@
 ;;; Field 1:  size_t IsolateID
 ;;; Field 2:  void*  MyVM
 ;;; Field 3:  void*  baseSP
-;;; Field 4:  char   doYield
-;;; Field 5:  char   inRV
-;;; Field 6:  char   joinedRV
+;;; Field 4:  bool   doYield
+;;; Field 5:  bool   inRV
+;;; Field 6:  bool   joinedRV
 ;;; Field 7:  void*  lastSP
 ;;; Field 8:  void*  internalThreadID
 ;;; field 9:  void*  routine
 ;;; field 10: void*  lastKnownFrame
 ;;; field 11: void*  lastExceptionBuffer
-%Thread = type { %CircularBase, i8*, i8*, i8*, i8, i8, i8, i8*, i8*, i8*, i8*, i8* }
+%Thread = type { %CircularBase, i8*, i8*, i8*, i1, i1, i1, i8*, i8*, i8*, i8*, i8* }
 
 %JavaThread = type { %MutatorThread, i8*, %JavaObject* }
 

Modified: vmkit/trunk/lib/Mvm/Compiler/LoopSafePoints.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/Mvm/Compiler/LoopSafePoints.cpp?rev=120210&r1=120209&r2=120210&view=diff
==============================================================================
--- vmkit/trunk/lib/Mvm/Compiler/LoopSafePoints.cpp (original)
+++ vmkit/trunk/lib/Mvm/Compiler/LoopSafePoints.cpp Sat Nov 27 06:21:15 2010
@@ -60,7 +60,6 @@
   BranchInst::Create(SU, yield);
 
   L->addBasicBlockToLoop(yield, LI->getBase());
-
 }