[vmkit-commits] [vmkit] r137020 - in /vmkit/trunk: include/j3/J3Intrinsics.h lib/J3/Compiler/J3Intrinsics.cpp lib/J3/Compiler/JavaJIT.cpp lib/J3/Compiler/JavaJIT.h

[Nicolas Geoffray]

Author: geoffray
Date: Sat Aug  6 10:10:24 2011
New Revision: 137020

URL: http://llvm.org/viewvc/llvm-project?rev=137020&view=rev
Log:
Continue removing dead code.


Modified:
    vmkit/trunk/include/j3/J3Intrinsics.h
    vmkit/trunk/lib/J3/Compiler/J3Intrinsics.cpp
    vmkit/trunk/lib/J3/Compiler/JavaJIT.cpp
    vmkit/trunk/lib/J3/Compiler/JavaJIT.h

Modified: vmkit/trunk/include/j3/J3Intrinsics.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/include/j3/J3Intrinsics.h?rev=137020&r1=137019&r2=137020&view=diff
==============================================================================
--- vmkit/trunk/include/j3/J3Intrinsics.h (original)
+++ vmkit/trunk/include/j3/J3Intrinsics.h Sat Aug  6 10:10:24 2011
@@ -121,7 +121,6 @@
   llvm::Constant* OffsetDoYieldInThreadConstant;
   llvm::Constant* OffsetIsolateIDInThreadConstant;
   llvm::Constant* OffsetVMInThreadConstant;
-  llvm::Constant* OffsetCXXExceptionInThreadConstant;
 	llvm::Constant* OffsetThreadInMutatorThreadConstant;
   llvm::Constant* OffsetJNIInJavaThreadConstant;
   llvm::Constant* OffsetJavaExceptionInJavaThreadConstant;

Modified: vmkit/trunk/lib/J3/Compiler/J3Intrinsics.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Compiler/J3Intrinsics.cpp?rev=137020&r1=137019&r2=137020&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/Compiler/J3Intrinsics.cpp (original)
+++ vmkit/trunk/lib/J3/Compiler/J3Intrinsics.cpp Sat Aug  6 10:10:24 2011
@@ -151,7 +151,6 @@
   OffsetIsolateIDInThreadConstant =         ConstantInt::get(Type::getInt32Ty(Context), 1);
   OffsetVMInThreadConstant =                ConstantInt::get(Type::getInt32Ty(Context), 2);
   OffsetDoYieldInThreadConstant =           ConstantInt::get(Type::getInt32Ty(Context), 4);
-  OffsetCXXExceptionInThreadConstant =      ConstantInt::get(Type::getInt32Ty(Context), 11);
 	OffsetThreadInMutatorThreadConstant =     ConstantInt::get(Type::getInt32Ty(Context), 0);
   OffsetJNIInJavaThreadConstant =           ConstantInt::get(Type::getInt32Ty(Context), 1);
   OffsetJavaExceptionInJavaThreadConstant = ConstantInt::get(Type::getInt32Ty(Context), 2);

Modified: vmkit/trunk/lib/J3/Compiler/JavaJIT.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Compiler/JavaJIT.cpp?rev=137020&r1=137019&r2=137020&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/Compiler/JavaJIT.cpp (original)
+++ vmkit/trunk/lib/J3/Compiler/JavaJIT.cpp Sat Aug  6 10:10:24 2011
@@ -243,14 +243,6 @@
 	return GetElementPtrInst::Create(mutatorThreadPtr, GEP, "", currentBlock);
 }
 
-llvm::Value* JavaJIT::getCXXExceptionPtr(llvm::Value* mutatorThreadPtr) { 
-	Value* GEP[3] = { intrinsics->constantZero,
-										intrinsics->OffsetThreadInMutatorThreadConstant,
-										intrinsics->OffsetCXXExceptionInThreadConstant };
-    
-	return GetElementPtrInst::Create(mutatorThreadPtr, GEP, "", currentBlock);
-}
-
 llvm::Value* JavaJIT::getJNIEnvPtr(llvm::Value* javaThreadPtr) { 
 	Value* GEP[2] = { intrinsics->constantZero,
 										intrinsics->OffsetJNIInJavaThreadConstant };
@@ -266,8 +258,6 @@
 }
 
 
-extern "C" void j3ThrowExceptionFromJIT();
-
 llvm::Function* JavaJIT::nativeCompile(intptr_t natPtr) {
   
   PRINT_DEBUG(JNJVM_COMPILE, 1, COLOR_NORMAL, "native compile %s.%s\n",

Modified: vmkit/trunk/lib/J3/Compiler/JavaJIT.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Compiler/JavaJIT.h?rev=137020&r1=137019&r2=137020&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/Compiler/JavaJIT.h (original)
+++ vmkit/trunk/lib/J3/Compiler/JavaJIT.h Sat Aug  6 10:10:24 2011
@@ -149,9 +149,6 @@
   /// getDoYieldPtr - Emit code to get a pointer to doYield.
 	llvm::Value* getDoYieldPtr(llvm::Value* mutatorThreadPtr);
 
-  /// getCXXExceptionPtr - Emit code to get a pointer to internalPendingException.
-	llvm::Value* getCXXExceptionPtr(llvm::Value* mutatorThreadPtr);
-
   /// getJavaThreadPtr - Emit code to get a pointer to the current JavaThread.
 	llvm::Value* getJavaThreadPtr(llvm::Value* mutatorThreadPtr);