[vmkit-commits] [vmkit] r165398 - in /vmkit/trunk: include/j3/JavaLLVMCompiler.h include/vmkit/JIT.h lib/j3/Compiler/JavaAOTCompiler.cpp lib/j3/Compiler/JavaJITCompiler.cpp lib/j3/Compiler/JavaLLVMCompiler.cpp lib/j3/Compiler/LLVMInfo.cpp lib/vmkit/Compiler/InlineMalloc.cpp lib/vmkit/Compiler/JIT.cpp lib/vmkit/StaticGCPrinter/VmkitGCPrinter.cpp tools/vmjc/vmjc.cpp
Micah Villmow
villmow at gmail.com
Mon Oct 8 09:31:42 PDT 2012
Author: mvillmow
Date: Mon Oct 8 11:29:41 2012
New Revision: 165398
URL: http://llvm.org/viewvc/llvm-project?rev=165398&view=rev
Log:
Move TargetData to DataLayout.
Modified:
vmkit/trunk/include/j3/JavaLLVMCompiler.h
vmkit/trunk/include/vmkit/JIT.h
vmkit/trunk/lib/j3/Compiler/JavaAOTCompiler.cpp
vmkit/trunk/lib/j3/Compiler/JavaJITCompiler.cpp
vmkit/trunk/lib/j3/Compiler/JavaLLVMCompiler.cpp
vmkit/trunk/lib/j3/Compiler/LLVMInfo.cpp
vmkit/trunk/lib/vmkit/Compiler/InlineMalloc.cpp
vmkit/trunk/lib/vmkit/Compiler/JIT.cpp
vmkit/trunk/lib/vmkit/StaticGCPrinter/VmkitGCPrinter.cpp
vmkit/trunk/tools/vmjc/vmjc.cpp
Modified: vmkit/trunk/include/j3/JavaLLVMCompiler.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/include/j3/JavaLLVMCompiler.h?rev=165398&r1=165397&r2=165398&view=diff
==============================================================================
--- vmkit/trunk/include/j3/JavaLLVMCompiler.h (original)
+++ vmkit/trunk/include/j3/JavaLLVMCompiler.h Mon Oct 8 11:29:41 2012
@@ -51,7 +51,7 @@
llvm::Module* TheModule;
llvm::DIBuilder* DebugFactory;
J3Intrinsics JavaIntrinsics;
- const llvm::TargetData* TheTargetData;
+ const llvm::DataLayout* TheDataLayout;
private:
bool enabledException;
Modified: vmkit/trunk/include/vmkit/JIT.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/include/vmkit/JIT.h?rev=165398&r1=165397&r2=165398&view=diff
==============================================================================
--- vmkit/trunk/include/vmkit/JIT.h (original)
+++ vmkit/trunk/include/vmkit/JIT.h Mon Oct 8 11:29:41 2012
@@ -33,7 +33,7 @@
class JIT;
class Module;
class PointerType;
- class TargetData;
+ class DataLayout;
class TargetMachine;
class Type;
}
Modified: vmkit/trunk/lib/j3/Compiler/JavaAOTCompiler.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/Compiler/JavaAOTCompiler.cpp?rev=165398&r1=165397&r2=165398&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/Compiler/JavaAOTCompiler.cpp (original)
+++ vmkit/trunk/lib/j3/Compiler/JavaAOTCompiler.cpp Mon Oct 8 11:29:41 2012
@@ -15,7 +15,7 @@
#include "llvm/PassManager.h"
#include "llvm/Support/raw_ostream.h"
#include "llvm/Support/TargetRegistry.h"
-#include "llvm/Target/TargetData.h"
+#include "llvm/DataLayout.h"
#include "vmkit/UTF8.h"
#include "vmkit/Thread.h"
@@ -1808,8 +1808,8 @@
options.NoFramePointerElim = true;
TargetMachine* TM = TheTarget->createTargetMachine(
vmkit::VmkitModule::getHostTriple(), "", "", options);
- TheTargetData = TM->getTargetData();
- TheModule->setDataLayout(TheTargetData->getStringRepresentation());
+ TheDataLayout = TM->getDataLayout();
+ TheModule->setDataLayout(TheDataLayout->getStringRepresentation());
TheModule->setTargetTriple(TM->getTargetTriple());
JavaIntrinsics.init(TheModule);
initialiseAssessorInfo();
@@ -1896,7 +1896,7 @@
Module* Mod = getLLVMModule();
for (Module::const_global_iterator i = Mod->global_begin(),
e = Mod->global_end(); i != e; ++i) {
- size += TheTargetData->getTypeAllocSize(i->getType());
+ size += TheDataLayout->getTypeAllocSize(i->getType());
}
fprintf(stdout, "%lluB\n", (unsigned long long int)size);
}
Modified: vmkit/trunk/lib/j3/Compiler/JavaJITCompiler.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/Compiler/JavaJITCompiler.cpp?rev=165398&r1=165397&r2=165398&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/Compiler/JavaJITCompiler.cpp (original)
+++ vmkit/trunk/lib/j3/Compiler/JavaJITCompiler.cpp Mon Oct 8 11:29:41 2012
@@ -22,7 +22,7 @@
#include "llvm/Support/ManagedStatic.h"
#include "llvm/Support/Debug.h"
#include "llvm/Support/raw_ostream.h"
-#include "llvm/Target/TargetData.h"
+#include "llvm/DataLayout.h"
#include <../lib/ExecutionEngine/JIT/JIT.h>
#include "VmkitGC.h"
@@ -166,8 +166,8 @@
executionEngine = engine.create();
executionEngine->RegisterJITEventListener(&listener);
- TheTargetData = executionEngine->getTargetData();
- TheModule->setDataLayout(TheTargetData->getStringRepresentation());
+ TheDataLayout = executionEngine->getDataLayout();
+ TheModule->setDataLayout(TheDataLayout->getStringRepresentation());
TheModule->setTargetTriple(vmkit::VmkitModule::getHostTriple());
JavaIntrinsics.init(TheModule);
initialiseAssessorInfo();
Modified: vmkit/trunk/lib/j3/Compiler/JavaLLVMCompiler.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/Compiler/JavaLLVMCompiler.cpp?rev=165398&r1=165397&r2=165398&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/Compiler/JavaLLVMCompiler.cpp (original)
+++ vmkit/trunk/lib/j3/Compiler/JavaLLVMCompiler.cpp Mon Oct 8 11:29:41 2012
@@ -12,7 +12,7 @@
#include "llvm/PassManager.h"
#include "llvm/DIBuilder.h"
#include "llvm/Analysis/LoopPass.h"
-#include "llvm/Target/TargetData.h"
+#include "llvm/DataLayout.h"
#include "vmkit/JIT.h"
@@ -108,13 +108,13 @@
void JavaLLVMCompiler::addJavaPasses() {
JavaNativeFunctionPasses = new FunctionPassManager(TheModule);
- JavaNativeFunctionPasses->add(new TargetData(TheModule));
+ JavaNativeFunctionPasses->add(new DataLayout(TheModule));
J3FunctionPasses = new FunctionPassManager(TheModule);
J3FunctionPasses->add(createLowerConstantCallsPass(this));
JavaFunctionPasses = new FunctionPassManager(TheModule);
- JavaFunctionPasses->add(new TargetData(TheModule));
+ JavaFunctionPasses->add(new DataLayout(TheModule));
vmkit::VmkitModule::addCommandLinePasses(JavaFunctionPasses);
}
Modified: vmkit/trunk/lib/j3/Compiler/LLVMInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/Compiler/LLVMInfo.cpp?rev=165398&r1=165397&r2=165398&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/Compiler/LLVMInfo.cpp (original)
+++ vmkit/trunk/lib/j3/Compiler/LLVMInfo.cpp Mon Oct 8 11:29:41 2012
@@ -14,7 +14,7 @@
#include "llvm/Module.h"
#include "llvm/Support/CommandLine.h"
#include "llvm/Support/MutexGuard.h"
-#include "llvm/Target/TargetData.h"
+#include "llvm/DataLayout.h"
#include "vmkit/JIT.h"
@@ -38,7 +38,7 @@
Type* LLVMClassInfo::getVirtualType() {
if (!virtualType) {
std::vector<llvm::Type*> fields;
- const TargetData* targetData = Compiler->TheTargetData;
+ const DataLayout* targetData = Compiler->TheDataLayout;
const StructLayout* sl = 0;
StructType* structType = 0;
LLVMContext& context = Compiler->getLLVMModule()->getContext();
@@ -109,7 +109,7 @@
StructType* structType = StructType::get(context, fields, false);
staticType = PointerType::getUnqual(structType);
- const TargetData* targetData = Compiler->TheTargetData;
+ const DataLayout* targetData = Compiler->TheDataLayout;
const StructLayout* sl = targetData->getStructLayout(structType);
// TODO: put that elsewhere.
Modified: vmkit/trunk/lib/vmkit/Compiler/InlineMalloc.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/vmkit/Compiler/InlineMalloc.cpp?rev=165398&r1=165397&r2=165398&view=diff
==============================================================================
--- vmkit/trunk/lib/vmkit/Compiler/InlineMalloc.cpp (original)
+++ vmkit/trunk/lib/vmkit/Compiler/InlineMalloc.cpp Mon Oct 8 11:29:41 2012
@@ -16,7 +16,7 @@
#include "llvm/Support/CallSite.h"
#include "llvm/Support/Debug.h"
#include "llvm/Support/raw_ostream.h"
-#include "llvm/Target/TargetData.h"
+#include "llvm/DataLayout.h"
#include "llvm/Transforms/Utils/Cloning.h"
#include "vmkit/JIT.h"
@@ -45,7 +45,7 @@
Function* ArrayWriteBarrier = F.getParent()->getFunction("arrayWriteBarrier");
Function* NonHeapWriteBarrier = F.getParent()->getFunction("nonHeapWriteBarrier");
bool Changed = false;
- const TargetData *TD = getAnalysisIfAvailable<TargetData>();
+ const DataLayout *TD = getAnalysisIfAvailable<DataLayout>();
for (Function::iterator BI = F.begin(), BE = F.end(); BI != BE; BI++) {
BasicBlock *Cur = BI;
for (BasicBlock::iterator II = Cur->begin(), IE = Cur->end(); II != IE;) {
Modified: vmkit/trunk/lib/vmkit/Compiler/JIT.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/vmkit/Compiler/JIT.cpp?rev=165398&r1=165397&r2=165398&view=diff
==============================================================================
--- vmkit/trunk/lib/vmkit/Compiler/JIT.cpp (original)
+++ vmkit/trunk/lib/vmkit/Compiler/JIT.cpp Mon Oct 8 11:29:41 2012
@@ -31,7 +31,7 @@
#include <llvm/Support/PassNameParser.h>
#include <llvm/Support/SourceMgr.h>
#include <llvm/Support/TargetSelect.h>
-#include <llvm/Target/TargetData.h>
+#include <llvm/DataLayout.h>
#include <llvm/Target/TargetMachine.h>
#include <llvm/Target/TargetOptions.h>
#include <../lib/ExecutionEngine/JIT/JIT.h>
Modified: vmkit/trunk/lib/vmkit/StaticGCPrinter/VmkitGCPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/vmkit/StaticGCPrinter/VmkitGCPrinter.cpp?rev=165398&r1=165397&r2=165398&view=diff
==============================================================================
--- vmkit/trunk/lib/vmkit/StaticGCPrinter/VmkitGCPrinter.cpp (original)
+++ vmkit/trunk/lib/vmkit/StaticGCPrinter/VmkitGCPrinter.cpp Mon Oct 8 11:29:41 2012
@@ -23,7 +23,7 @@
#include "llvm/MC/MCSymbol.h"
#include "llvm/MC/MCStreamer.h"
#include "llvm/Target/Mangler.h"
-#include "llvm/Target/TargetData.h"
+#include "llvm/DataLayout.h"
#include "llvm/Target/TargetInstrInfo.h"
#include "llvm/Target/TargetLoweringObjectFile.h"
#include "llvm/Target/TargetMachine.h"
@@ -289,7 +289,7 @@
/// either condition is detected in a function which uses the GC.
///
void VmkitAOTGCMetadataPrinter::finishAssembly(AsmPrinter &AP) {
- unsigned IntPtrSize = AP.TM.getTargetData()->getPointerSize();
+ unsigned IntPtrSize = AP.TM.getDataLayout()->getPointerSize();
AP.OutStreamer.SwitchSection(AP.getObjFileLowering().getDataSection());
Modified: vmkit/trunk/tools/vmjc/vmjc.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/tools/vmjc/vmjc.cpp?rev=165398&r1=165397&r2=165398&view=diff
==============================================================================
--- vmkit/trunk/tools/vmjc/vmjc.cpp (original)
+++ vmkit/trunk/tools/vmjc/vmjc.cpp Mon Oct 8 11:29:41 2012
@@ -34,7 +34,7 @@
#include "llvm/Support/SystemUtils.h"
#include "llvm/Support/raw_ostream.h"
#include "llvm/Support/Signals.h"
-#include "llvm/Target/TargetData.h"
+#include "llvm/DataLayout.h"
#include "llvm/Target/TargetMachine.h"
More information about the vmkit-commits
mailing list