[vmkit-commits] [vmkit] r68609 - in /vmkit/trunk/lib/JnJVM: Compiler/JavaJITCompiler.cpp VMCore/Jnjvm.cpp

[Nicolas Geoffray]

Author: geoffray
Date: Wed Apr  8 09:49:59 2009
New Revision: 68609

URL: http://llvm.org/viewvc/llvm-project?rev=68609&view=rev
Log:
Fix command line when generating a Java executable.


Modified:
    vmkit/trunk/lib/JnJVM/Compiler/JavaJITCompiler.cpp
    vmkit/trunk/lib/JnJVM/VMCore/Jnjvm.cpp

Modified: vmkit/trunk/lib/JnJVM/Compiler/JavaJITCompiler.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/Compiler/JavaJITCompiler.cpp?rev=68609&r1=68608&r2=68609&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/Compiler/JavaJITCompiler.cpp (original)
+++ vmkit/trunk/lib/JnJVM/Compiler/JavaJITCompiler.cpp Wed Apr  8 09:49:59 2009
@@ -224,8 +224,9 @@
   Collector::initialise(0);
  
   char** newArgv = new char*[argc + 1];
-  memcpy(newArgv, argv, argc * sizeof(void*));
-  newArgv[argc] = mainClass;
+  memcpy(newArgv + 1, argv, argc * sizeof(void*));
+  newArgv[0] = newArgv[1];
+  newArgv[1] = mainClass;
 
   JavaJITCompiler* Comp = new JavaJITCompiler("JITModule");
   mvm::MvmModule::AddStandardCompilePasses();

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

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/Jnjvm.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/Jnjvm.cpp Wed Apr  8 09:49:59 2009
@@ -1136,8 +1136,9 @@
   Collector::initialise(0);
   
   char** newArgv = new char*[argc + 1];
-  memcpy(newArgv, argv, argc * sizeof(char*));
-  newArgv[argc] = mainClass;
+  memcpy(newArgv + 1, argv, argc * sizeof(char*));
+  newArgv[0] = newArgv[1];
+  newArgv[1] = mainClass;
  
   JavaCompiler* Comp = new JavaCompiler();
   JnjvmClassLoader* JCL = mvm::VirtualMachine::initialiseJVM(Comp);