//
// The LLVM Compiler Infrastructure
//
-// This file was developed by the LLVM research group and is distributed under
-// the University of Illinois Open Source License. See LICENSE.TXT for details.
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
#include "Interpreter.h"
#include "llvm/CodeGen/IntrinsicLowering.h"
-#include "llvm/DerivedTypes.h"
-#include "llvm/Module.h"
-#include "llvm/ModuleProvider.h"
+#include "llvm/IR/DerivedTypes.h"
+#include "llvm/IR/Module.h"
+#include <cstring>
using namespace llvm;
+namespace {
+
static struct RegisterInterp {
RegisterInterp() { Interpreter::Register(); }
} InterpRegistrator;
-namespace llvm {
- void LinkInInterpreter() {
- }
}
+extern "C" void LLVMLinkInInterpreter() { }
+
/// create - Create a new interpreter object. This can never fail.
///
-ExecutionEngine *Interpreter::create(ModuleProvider *MP) {
- Module *M;
- try {
- M = MP->materializeModule();
- } catch (...) {
- return 0; // error materializing the module.
- }
-
- bool isLittleEndian = false;
- switch (M->getEndianness()) {
- case Module::LittleEndian: isLittleEndian = true; break;
- case Module::BigEndian: isLittleEndian = false; break;
- case Module::AnyPointerSize:
- int Test = 0;
- *(char*)&Test = 1; // Return true if the host is little endian
- isLittleEndian = (Test == 1);
- break;
- }
+ExecutionEngine *Interpreter::create(Module *M, std::string* ErrStr) {
+ // Tell this Module to materialize everything and release the GVMaterializer.
+ if (M->MaterializeAllPermanently(ErrStr))
+ // We got an error, just return 0
+ return 0;
- bool isLongPointer = false;
- switch (M->getPointerSize()) {
- case Module::Pointer32: isLongPointer = false; break;
- case Module::Pointer64: isLongPointer = true; break;
- case Module::AnyPointerSize:
- isLongPointer = (sizeof(void*) == 8); // Follow host
- break;
- }
-
- return new Interpreter(M, isLittleEndian, isLongPointer);
+ return new Interpreter(M);
}
//===----------------------------------------------------------------------===//
// Interpreter ctor - Initialize stuff
//
-Interpreter::Interpreter(Module *M, bool isLittleEndian, bool isLongPointer)
- : ExecutionEngine(M),
- TD("lli", isLittleEndian, isLongPointer ? 8 : 4, isLongPointer ? 8 : 4,
- isLongPointer ? 8 : 4) {
-
- memset(&ExitValue, 0, sizeof(ExitValue));
- setTargetData(&TD);
+Interpreter::Interpreter(Module *M)
+ : ExecutionEngine(M), TD(M) {
+
+ memset(&ExitValue.Untyped, 0, sizeof(ExitValue.Untyped));
+ setDataLayout(&TD);
// Initialize the "backend"
initializeExecutionEngine();
initializeExternalFunctions();
emitGlobals();
- IL = new DefaultIntrinsicLowering();
+ IL = new IntrinsicLowering(TD);
}
Interpreter::~Interpreter() {
return ExitValue;
}
-