[vmkit-commits] [vmkit] r54674 - in /vmkit/trunk/lib/N3/VMCore: CLIJit.cpp LowerArrayLength.cpp N3.cpp VMCache.cpp

[Nicolas Geoffray]

Author: geoffray
Date: Tue Aug 12 02:56:01 2008
New Revision: 54674

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


Modified:
    vmkit/trunk/lib/N3/VMCore/CLIJit.cpp
    vmkit/trunk/lib/N3/VMCore/LowerArrayLength.cpp
    vmkit/trunk/lib/N3/VMCore/N3.cpp
    vmkit/trunk/lib/N3/VMCore/VMCache.cpp

Modified: vmkit/trunk/lib/N3/VMCore/CLIJit.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/N3/VMCore/CLIJit.cpp?rev=54674&r1=54673&r2=54674&view=diff

==============================================================================
--- vmkit/trunk/lib/N3/VMCore/CLIJit.cpp (original)
+++ vmkit/trunk/lib/N3/VMCore/CLIJit.cpp Tue Aug 12 02:56:01 2008
@@ -1526,12 +1526,12 @@
   return cl->staticInstance;
 }
 
-extern "C" void classCastException() {
+extern "C" void n3ClassCastException() {
   fflush(stdout);
   assert(0 && "implement class cast exception");
 }
 
-extern "C" void nullPointerException() {
+extern "C" void n3NullPointerException() {
   fflush(stdout);
   assert(0 && "implement null pointer exception");
 }
@@ -1755,7 +1755,7 @@
     FunctionType::get(CacheNode::llvmType, args, false);
 
   virtualLookupLLVM = Function::Create(type, GlobalValue::ExternalLinkage,
-                                   "virtualLookup", module);
+                                   "n3VirtualLookup", module);
 
 /*
   virtualLookupLLVM = Function::Create(type, GlobalValue::ExternalLinkage,
@@ -1847,7 +1847,7 @@
   const FunctionType* type = FunctionType::get(Type::VoidTy, args, false);
 
   nullPointerExceptionLLVM = Function::Create(type, GlobalValue::ExternalLinkage,
-                     "nullPointerException",
+                     "n3NullPointerException",
                      module);
   }
   
@@ -1857,7 +1857,7 @@
   const FunctionType* type = FunctionType::get(Type::VoidTy, args, false);
 
   classCastExceptionLLVM = Function::Create(type, GlobalValue::ExternalLinkage,
-                     "classCastException",
+                     "n3ClassCastException",
                      module);
   }
   

Modified: vmkit/trunk/lib/N3/VMCore/LowerArrayLength.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/N3/VMCore/LowerArrayLength.cpp?rev=54674&r1=54673&r2=54674&view=diff

==============================================================================
--- vmkit/trunk/lib/N3/VMCore/LowerArrayLength.cpp (original)
+++ vmkit/trunk/lib/N3/VMCore/LowerArrayLength.cpp Tue Aug 12 02:56:01 2008
@@ -31,7 +31,7 @@
   private:
   };
   char LowerArrayLength::ID = 0;
-  RegisterPass<LowerArrayLength> X("LowerArrayLength", "Lower Array length");
+  static RegisterPass<LowerArrayLength> X("LowerArrayLength", "Lower Array length");
 
 bool LowerArrayLength::runOnFunction(Function& F) {
   bool Changed = false;

Modified: vmkit/trunk/lib/N3/VMCore/N3.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/N3/VMCore/N3.cpp?rev=54674&r1=54673&r2=54674&view=diff

==============================================================================
--- vmkit/trunk/lib/N3/VMCore/N3.cpp (original)
+++ vmkit/trunk/lib/N3/VMCore/N3.cpp Tue Aug 12 02:56:01 2008
@@ -153,6 +153,7 @@
   return res;
 }
 
+namespace n3 {
 
 class ClArgumentsInfo {
 public:
@@ -166,6 +167,8 @@
   void printVersion();
 };
 
+}
+
 void ClArgumentsInfo::nyi() {
   fprintf(stdout, "Not yet implemented\n");
 }
@@ -251,8 +254,6 @@
   info.readArgs(argc, argv, this);
   if (info.assembly) {
     int pos = info.appArgumentsPos;
-    llvm::cl::ParseCommandLineOptions(pos, argv,
-                                      "N3 CLI virtual machine\n");
     argv = argv + info.appArgumentsPos - 1;
     argc = argc - info.appArgumentsPos + 1;
     

Modified: vmkit/trunk/lib/N3/VMCore/VMCache.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/N3/VMCore/VMCache.cpp?rev=54674&r1=54673&r2=54674&view=diff

==============================================================================
--- vmkit/trunk/lib/N3/VMCore/VMCache.cpp (original)
+++ vmkit/trunk/lib/N3/VMCore/VMCache.cpp Tue Aug 12 02:56:01 2008
@@ -158,7 +158,7 @@
   }
 }
 
-extern "C" CacheNode* virtualLookup(CacheNode* cache, VMObject *obj) {
+extern "C" CacheNode* n3VirtualLookup(CacheNode* cache, VMObject *obj) {
   Enveloppe* enveloppe = cache->enveloppe;
   VMCommonClass* ocl = obj->classOf;
   VMMethod* orig = enveloppe->originalMethod;