Enable jitting with a known memory size.

[oota-llvm.git] / lib / ExecutionEngine / JIT / TargetSelect.cpp

diff --git a/lib/ExecutionEngine/JIT/TargetSelect.cpp b/lib/ExecutionEngine/JIT/TargetSelect.cpp
index ef9c8f549e687668bf2a0509fc4ca3cfe6340be1..0fb0b41999e489155e2d751b0b502702f98ebc9a 100644 (file)
--- a/lib/ExecutionEngine/JIT/TargetSelect.cpp
+++ b/lib/ExecutionEngine/JIT/TargetSelect.cpp
@@ -2,8 +2,8 @@
 //
 //                     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.
 //
 //===----------------------------------------------------------------------===//
 //
@@ -18,10 +18,10 @@
 #include "llvm/Target/SubtargetFeature.h"
 #include "llvm/Target/TargetMachine.h"
 #include "llvm/Target/TargetMachineRegistry.h"
-#include <iostream>
 using namespace llvm;
 
-static cl::opt<const TargetMachineRegistry::Entry*, false, TargetNameParser>
+static cl::opt<const TargetMachineRegistry::entry*, false,
+               TargetMachineRegistry::Parser>
 MArch("march", cl::desc("Architecture to generate assembly for:"));
 
 static cl::opt<std::string>
@@ -36,18 +36,24 @@ MAttrs("mattr",
   cl::desc("Target specific attributes (-mattr=help for details)"),
   cl::value_desc("a1,+a2,-a3,..."));
 
-/// create - Create an return a new JIT compiler if there is one available
-/// for the current target.  Otherwise, return null.
+/// createInternal - Create an return a new JIT compiler if there is one
+/// available for the current target.  Otherwise, return null.
 ///
-ExecutionEngine *JIT::create(ModuleProvider *MP) {
-  if (MArch == 0) {
+ExecutionEngine *JIT::createJIT(ModuleProvider *MP, std::string *ErrorStr,
+                                JITMemoryManager *JMM) {
+  const TargetMachineRegistry::entry *TheArch = MArch;
+  if (TheArch == 0) {
     std::string Error;
-    MArch = TargetMachineRegistry::getClosestTargetForJIT(Error);
-    if (MArch == 0) return 0;
-  } else if (MArch->JITMatchQualityFn() == 0) {
-    std::cerr << "WARNING: This target JIT is not designed for the host you are"
-              << " running.  If bad things happen, please choose a different "
-              << "-march switch.\n";
+    TheArch = TargetMachineRegistry::getClosestTargetForJIT(Error);
+    if (TheArch == 0) {
+      if (ErrorStr)
+        *ErrorStr = Error;
+      return 0;
+    }
+  } else if (TheArch->JITMatchQualityFn() == 0) {
+    cerr << "WARNING: This target JIT is not designed for the host you are"
+         << " running.  If bad things happen, please choose a different "
+         << "-march switch.\n";
   }
 
   // Package up features to be passed to target/subtarget
@@ -61,11 +67,14 @@ ExecutionEngine *JIT::create(ModuleProvider *MP) {
   }
 
   // Allocate a target...
-  TargetMachine *Target = MArch->CtorFn(*MP->getModule(), FeaturesStr);
+  TargetMachine *Target = TheArch->CtorFn(*MP->getModule(), FeaturesStr);
   assert(Target && "Could not allocate target machine!");
 
   // If the target supports JIT code generation, return a new JIT now.
   if (TargetJITInfo *TJ = Target->getJITInfo())
-    return new JIT(MP, *Target, *TJ);
+    return new JIT(MP, *Target, *TJ, JMM);
+
+  if (ErrorStr)
+    *ErrorStr = "target does not support JIT code generation";
   return 0;
 }