[vmkit-commits] [vmkit] r62218 - in /vmkit/trunk: include/mvm/JIT.h lib/JnJVM/VMCore/JnjvmClassLoader.cpp lib/JnJVM/VMCore/JnjvmModule.cpp lib/JnJVM/VMCore/JnjvmModuleProvider.cpp lib/JnJVM/VMCore/LowerConstantCalls.cpp lib/Mvm/Runtime/JIT.cpp lib/N3/Mono/MonoString.cpp lib/N3/PNetLib/PNetString.cpp lib/N3/VMCore/CLIRuntimeJIT.cpp tools/vmjc/vmjc.cpp tools/vmkit/Launcher.cpp
Nicolas Geoffray
nicolas.geoffray at lip6.fr
Wed Jan 14 03:19:44 PST 2009
Author: geoffray
Date: Wed Jan 14 05:19:27 2009
New Revision: 62218
URL: http://llvm.org/viewvc/llvm-project?rev=62218&view=rev
Log:
Fix includes.
Modified:
vmkit/trunk/include/mvm/JIT.h
vmkit/trunk/lib/JnJVM/VMCore/JnjvmClassLoader.cpp
vmkit/trunk/lib/JnJVM/VMCore/JnjvmModule.cpp
vmkit/trunk/lib/JnJVM/VMCore/JnjvmModuleProvider.cpp
vmkit/trunk/lib/JnJVM/VMCore/LowerConstantCalls.cpp
vmkit/trunk/lib/Mvm/Runtime/JIT.cpp
vmkit/trunk/lib/N3/Mono/MonoString.cpp
vmkit/trunk/lib/N3/PNetLib/PNetString.cpp
vmkit/trunk/lib/N3/VMCore/CLIRuntimeJIT.cpp
vmkit/trunk/tools/vmjc/vmjc.cpp
vmkit/trunk/tools/vmkit/Launcher.cpp
Modified: vmkit/trunk/include/mvm/JIT.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/include/mvm/JIT.h?rev=62218&r1=62217&r2=62218&view=diff
==============================================================================
--- vmkit/trunk/include/mvm/JIT.h (original)
+++ vmkit/trunk/include/mvm/JIT.h Wed Jan 14 05:19:27 2009
@@ -11,19 +11,24 @@
#define MVM_JIT_H
#include <cfloat>
+#include <cmath>
-#include "llvm/Constants.h"
-#include "llvm/DerivedTypes.h"
-#include "llvm/Function.h"
#include "llvm/Module.h"
-#include "llvm/ModuleProvider.h"
-#include "llvm/PassManager.h"
-#include "llvm/Type.h"
-#include "llvm/ExecutionEngine/ExecutionEngine.h"
-#include "llvm/Target/TargetData.h"
#include "types.h"
+namespace llvm {
+ class Constant;
+ class ConstantFP;
+ class ConstantInt;
+ class ExecutionEngine;
+ class ExistingModuleProvider;
+ class Function;
+ class FunctionPassManager;
+ class PointerType;
+ class Type;
+}
+
namespace mvm {
class LockNormal;
@@ -104,7 +109,6 @@
static mvm::LockNormal protectEngine;
static uint64 getTypeSize(const llvm::Type* type);
- static void AddStandardCompilePasses(llvm::FunctionPassManager*);
static void runPasses(llvm::Function* func, llvm::FunctionPassManager*);
static void initialise(bool Fast = false);
Modified: vmkit/trunk/lib/JnJVM/VMCore/JnjvmClassLoader.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/JnjvmClassLoader.cpp?rev=62218&r1=62217&r2=62218&view=diff
==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JnjvmClassLoader.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JnjvmClassLoader.cpp Wed Jan 14 05:19:27 2009
@@ -33,6 +33,9 @@
#include "debug.h"
+// TODO: get rid of that
+#include "llvm/PassManager.h"
+
#include "mvm/Allocator.h"
#include "Classpath.h"
@@ -68,7 +71,6 @@
TheModule = new JnjvmModule("Bootstrap JnJVM", staticCompilation);
TheModuleProvider = new JnjvmModuleProvider(getModule());
FunctionPasses = new FunctionPassManager(TheModuleProvider);
- FunctionPasses->add(new TargetData(TheModule));
hashUTF8 = new(allocator) UTF8Map(allocator, 0);
classes = new(allocator) ClassMap();
Modified: vmkit/trunk/lib/JnJVM/VMCore/JnjvmModule.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/JnjvmModule.cpp?rev=62218&r1=62217&r2=62218&view=diff
==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JnjvmModule.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JnjvmModule.cpp Wed Jan 14 05:19:27 2009
@@ -10,8 +10,10 @@
#include "llvm/BasicBlock.h"
#include "llvm/CallingConv.h"
#include "llvm/Constants.h"
+#include "llvm/ExecutionEngine/ExecutionEngine.h"
#include "llvm/Instructions.h"
#include "llvm/Support/MutexGuard.h"
+#include "llvm/Target/TargetData.h"
#include "mvm/JIT.h"
Modified: vmkit/trunk/lib/JnJVM/VMCore/JnjvmModuleProvider.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/JnjvmModuleProvider.cpp?rev=62218&r1=62217&r2=62218&view=diff
==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JnjvmModuleProvider.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JnjvmModuleProvider.cpp Wed Jan 14 05:19:27 2009
@@ -8,7 +8,10 @@
//===----------------------------------------------------------------------===//
#include "llvm/LinkAllPasses.h"
+#include "llvm/PassManager.h"
+#include "llvm/ExecutionEngine/ExecutionEngine.h"
#include "llvm/Support/MutexGuard.h"
+#include "llvm/Target/TargetData.h"
#include "mvm/JIT.h"
Modified: vmkit/trunk/lib/JnJVM/VMCore/LowerConstantCalls.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/LowerConstantCalls.cpp?rev=62218&r1=62217&r2=62218&view=diff
==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/LowerConstantCalls.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/LowerConstantCalls.cpp Wed Jan 14 05:19:27 2009
@@ -7,7 +7,7 @@
//
//===----------------------------------------------------------------------===//
-
+#include "llvm/Constants.h"
#include "llvm/Pass.h"
#include "llvm/Function.h"
#include "llvm/Instructions.h"
Modified: vmkit/trunk/lib/Mvm/Runtime/JIT.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/Mvm/Runtime/JIT.cpp?rev=62218&r1=62217&r2=62218&view=diff
==============================================================================
--- vmkit/trunk/lib/Mvm/Runtime/JIT.cpp (original)
+++ vmkit/trunk/lib/Mvm/Runtime/JIT.cpp Wed Jan 14 05:19:27 2009
@@ -7,16 +7,19 @@
//
//===----------------------------------------------------------------------===//
-#include "llvm/CallingConv.h"
+#include <llvm/CallingConv.h>
#include <llvm/Constants.h>
#include <llvm/DerivedTypes.h>
#include <llvm/Instructions.h>
-#include "llvm/LinkAllPasses.h"
+#include <llvm/LinkAllPasses.h>
+#include <llvm/ModuleProvider.h>
#include <llvm/Type.h>
-#include "llvm/Analysis/LoopPass.h"
-#include "llvm/Analysis/Verifier.h"
-#include "llvm/Support/MutexGuard.h"
-#include "llvm/Target/TargetOptions.h"
+#include <llvm/Analysis/LoopPass.h>
+#include <llvm/Analysis/Verifier.h>
+#include <llvm/ExecutionEngine/ExecutionEngine.h>
+#include <llvm/Support/MutexGuard.h>
+#include <llvm/Target/TargetData.h>
+#include <llvm/Target/TargetOptions.h>
#include "mvm/CompilationUnit.h"
@@ -263,6 +266,8 @@
//PM->add(llvm::createVerifierPass()); // Verify that input is correct
FunctionPassManager* PM = FunctionPasses;
+ FunctionPasses->add(new TargetData(TheModule));
+
addPass(PM, createCFGSimplificationPass()); // Clean up disgusting code
addPass(PM, createPromoteMemoryToRegisterPass());// Kill useless allocas
Modified: vmkit/trunk/lib/N3/Mono/MonoString.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/N3/Mono/MonoString.cpp?rev=62218&r1=62217&r2=62218&view=diff
==============================================================================
--- vmkit/trunk/lib/N3/Mono/MonoString.cpp (original)
+++ vmkit/trunk/lib/N3/Mono/MonoString.cpp Wed Jan 14 05:19:27 2009
@@ -7,6 +7,7 @@
//
//===----------------------------------------------------------------------===//
+#include "llvm/DerivedTypes.h"
#include "llvm/GlobalVariable.h"
#include "mvm/JIT.h"
Modified: vmkit/trunk/lib/N3/PNetLib/PNetString.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/N3/PNetLib/PNetString.cpp?rev=62218&r1=62217&r2=62218&view=diff
==============================================================================
--- vmkit/trunk/lib/N3/PNetLib/PNetString.cpp (original)
+++ vmkit/trunk/lib/N3/PNetLib/PNetString.cpp Wed Jan 14 05:19:27 2009
@@ -7,6 +7,7 @@
//
//===----------------------------------------------------------------------===//
+#include "llvm/DerivedTypes.h"
#include "llvm/GlobalVariable.h"
#include "mvm/JIT.h"
Modified: vmkit/trunk/lib/N3/VMCore/CLIRuntimeJIT.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/N3/VMCore/CLIRuntimeJIT.cpp?rev=62218&r1=62217&r2=62218&view=diff
==============================================================================
--- vmkit/trunk/lib/N3/VMCore/CLIRuntimeJIT.cpp (original)
+++ vmkit/trunk/lib/N3/VMCore/CLIRuntimeJIT.cpp Wed Jan 14 05:19:27 2009
@@ -8,10 +8,11 @@
//===----------------------------------------------------------------------===//
-#include <stdio.h>
+#include <cstdio>
#include "llvm/DerivedTypes.h"
#include "llvm/Instructions.h"
+#include "llvm/ExecutionEngine/ExecutionEngine.h"
#include "mvm/JIT.h"
#include "mvm/Object.h"
Modified: vmkit/trunk/tools/vmjc/vmjc.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/tools/vmjc/vmjc.cpp?rev=62218&r1=62217&r2=62218&view=diff
==============================================================================
--- vmkit/trunk/tools/vmjc/vmjc.cpp (original)
+++ vmkit/trunk/tools/vmjc/vmjc.cpp Wed Jan 14 05:19:27 2009
@@ -38,6 +38,7 @@
#include <iostream>
#include <fstream>
#include <memory>
+#include <string>
using namespace llvm;
Modified: vmkit/trunk/tools/vmkit/Launcher.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/tools/vmkit/Launcher.cpp?rev=62218&r1=62217&r2=62218&view=diff
==============================================================================
--- vmkit/trunk/tools/vmkit/Launcher.cpp (original)
+++ vmkit/trunk/tools/vmkit/Launcher.cpp Wed Jan 14 05:19:27 2009
@@ -9,6 +9,7 @@
#include "llvm/LinkAllPasses.h"
#include "llvm/LinkAllVMCore.h"
+#include "llvm/PassManager.h"
#include "llvm/CodeGen/LinkAllCodegenComponents.h"
#include "llvm/Support/CommandLine.h"
#include "llvm/Support/ManagedStatic.h"
More information about the vmkit-commits
mailing list