[vmkit-commits] [vmkit] r54672 - in /vmkit/trunk/lib/JnJVM/VMCore: JavaIsolate.cpp JavaRuntimeJIT.cpp JnjvmModule.cpp LowerConstantCalls.cpp

[Nicolas Geoffray]

Author: geoffray
Date: Tue Aug 12 02:50:17 2008
New Revision: 54672

URL: http://llvm.org/viewvc/llvm-project?rev=54672&view=rev
Log:
Internalize stuff, so that when linking with other libraries, there
are less name conflicts.


Modified:
    vmkit/trunk/lib/JnJVM/VMCore/JavaIsolate.cpp
    vmkit/trunk/lib/JnJVM/VMCore/JavaRuntimeJIT.cpp
    vmkit/trunk/lib/JnJVM/VMCore/JnjvmModule.cpp
    vmkit/trunk/lib/JnJVM/VMCore/LowerConstantCalls.cpp

Modified: vmkit/trunk/lib/JnJVM/VMCore/JavaIsolate.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/JavaIsolate.cpp?rev=54672&r1=54671&r2=54672&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaIsolate.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaIsolate.cpp Tue Aug 12 02:50:17 2008
@@ -45,6 +45,7 @@
 extern "C" struct JNINativeInterface JNI_JNIEnvTable;
 extern "C" const struct JNIInvokeInterface JNI_JavaVMTable;
 
+namespace jnjvm {
 
 class ClArgumentsInfo {
 public:
@@ -61,6 +62,8 @@
   void printVersion();
 };
 
+}
+
 void ClArgumentsInfo::javaAgent(char* cur) {
   assert(0 && "implement me");
 }

Modified: vmkit/trunk/lib/JnJVM/VMCore/JavaRuntimeJIT.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/JavaRuntimeJIT.cpp?rev=54672&r1=54671&r2=54672&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaRuntimeJIT.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaRuntimeJIT.cpp Tue Aug 12 02:50:17 2008
@@ -36,7 +36,7 @@
   return vm->UTF8ToStr(val);
 }
 
-extern "C" void* virtualLookup(CacheNode* cache, JavaObject *obj) {
+extern "C" void* jnjvmVirtualLookup(CacheNode* cache, JavaObject *obj) {
   Enveloppe* enveloppe = cache->enveloppe;
   JavaCtpInfo* ctpInfo = enveloppe->ctpInfo;
   CommonClass* ocl = obj->classOf;
@@ -156,7 +156,7 @@
   return (void*)buf;
 }
 
-extern "C" void nullPointerException() {
+extern "C" void jnjvmNullPointerException() {
   JavaThread::get()->isolate->nullPointerException("null");
 }
 
@@ -168,7 +168,7 @@
   JavaThread::get()->isolate->outOfMemoryError(val);
 }
 
-extern "C" void classCastException(JavaObject* obj, CommonClass* cl) {
+extern "C" void jnjvmClassCastException(JavaObject* obj, CommonClass* cl) {
   JavaThread::get()->isolate->classCastException("");
 }
 

Modified: vmkit/trunk/lib/JnJVM/VMCore/JnjvmModule.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/JnjvmModule.cpp?rev=54672&r1=54671&r2=54672&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JnjvmModule.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JnjvmModule.cpp Tue Aug 12 02:50:17 2008
@@ -1010,7 +1010,7 @@
   EnveloppeType =
     PointerType::getUnqual(module->getTypeByName("Enveloppe"));
 
-  InterfaceLookupFunction = module->getFunction("virtualLookup");
+  InterfaceLookupFunction = module->getFunction("jnjvmVirtualLookup");
   MultiCallNewFunction = module->getFunction("multiCallNew");
   InitialisationCheckFunction = module->getFunction("initialisationCheck");
   ForceInitialisationCheckFunction = 
@@ -1044,8 +1044,8 @@
     module->getFunction("jniProceedPendingException");
   GetSJLJBufferFunction = module->getFunction("getSJLJBuffer");
   
-  NullPointerExceptionFunction = module->getFunction("nullPointerException");
-  ClassCastExceptionFunction = module->getFunction("classCastException");
+  NullPointerExceptionFunction = module->getFunction("jnjvmNullPointerException");
+  ClassCastExceptionFunction = module->getFunction("jnjvmClassCastException");
   IndexOutOfBoundsExceptionFunction = 
     module->getFunction("indexOutOfBoundsException");
   NegativeArraySizeExceptionFunction = 

Modified: vmkit/trunk/lib/JnJVM/VMCore/LowerConstantCalls.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/LowerConstantCalls.cpp?rev=54672&r1=54671&r2=54672&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/LowerConstantCalls.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/LowerConstantCalls.cpp Tue Aug 12 02:50:17 2008
@@ -32,8 +32,8 @@
   private:
   };
   char LowerConstantCalls::ID = 0;
-  RegisterPass<LowerConstantCalls> X("LowerConstantCalls",
-                                     "Lower Constant calls");
+  static RegisterPass<LowerConstantCalls> X("LowerConstantCalls",
+                                            "Lower Constant calls");
 
 bool LowerConstantCalls::runOnFunction(Function& F) {
   bool Changed = false;