commit abc4c6bc6d5b54860810eb6e7205fd87cfa52636
author buzbee <buzbee@google.com> Thu Aug 23 08:17:15 2012 -0700
committer Shih-wei Liao <sliao@google.com> Sat Sep 15 04:51:24 2012 -0700
tree 8da8e71a034c444b56dff3417889074e40b01b0f
parent 890ea89879ba555a08433146058d516575646c59

Portable path example interface

Here's an example of a simple interface to the common front-end for
use by the portable path.  Untested.

Change-Id: Id444aaa1bc8e2e26b6b449e78be32dd053faa4df

src/compiler/Frontend.cc

diff --git a/src/compiler/Frontend.cc b/src/compiler/Frontend.cc
index 50630ae..ab940af 100644
--- a/src/compiler/Frontend.cc
+++ b/src/compiler/Frontend.cc
@@ -773,12 +773,19 @@
   }
 }
 
-CompiledMethod* oatCompileMethod(Compiler& compiler,
-                                 const DexFile::CodeItem* code_item,
-                                 uint32_t access_flags, InvokeType invoke_type,
-                                 uint32_t method_idx,
-                                 jobject class_loader,
-                                 const DexFile& dex_file)
+CompiledMethod* compileMethod(Compiler& compiler,
+                              const DexFile::CodeItem* code_item,
+                              uint32_t access_flags, InvokeType invoke_type,
+                              uint32_t method_idx, jobject class_loader,
+                              const DexFile& dex_file
+#if defined(ART_USE_QUICK_COMPILER)
+                              , llvm::Module* module,
+                              llvm::LLVMContext* context,
+                              greenland::IntrinsicHelper* intrinsic_helper,
+                              greenland::IRBuilder* irb,
+                              bool gbcOnly
+#endif
+                             )
 {
   VLOG(compiler) << "Compiling " << PrettyMethod(method_idx, dex_file) << "...";
 
@@ -810,6 +817,10 @@
   DCHECK((cUnit->instructionSet == kThumb2) ||
          (cUnit->instructionSet == kX86) ||
          (cUnit->instructionSet == kMips));
+  cUnit->module = module;
+  cUnit->context = context;
+  cUnit->intrinsic_helper = intrinsic_helper;
+  cUnit->irb = irb;
   if (cUnit->instructionSet == kThumb2) {
     // TODO: remove this once x86 is tested
     cUnit->genBitcode = true;
@@ -1130,6 +1141,11 @@
   if (cUnit->genBitcode) {
     // MIR->Bitcode
     oatMethodMIR2Bitcode(cUnit.get());
+    if (cUnit->gbcOnly) {
+      // all done
+      oatArenaReset(cUnit.get());
+      return NULL;
+    }
     // Bitcode->LIR
     oatMethodBitcode2LIR(cUnit.get());
   } else {
@@ -1220,6 +1236,46 @@
   return result;
 }
 
+#if defined(ART_USE_QUICK_COMPILER)
+CompiledMethod* oatCompileMethod(Compiler& compiler,
+                                 const DexFile::CodeItem* code_item,
+                                 uint32_t access_flags, InvokeType invoke_type,
+                                 uint32_t method_idx, jobject class_loader,
+                                 const DexFile& dex_file)
+{
+  return compileMethod(compiler, code_item, access_flags, invoke_type, method_idx, class_loader,
+                       dex_file, NULL, NULL, NULL, NULL, false);
+}
+
+/*
+ * Given existing llvm module, context, intrinsic_helper and IRBuilder,
+ * add the bitcode for the method described by code_item to the module.
+ */
+void oatCompileMethodToGBC(Compiler& compiler,
+                           const DexFile::CodeItem* code_item,
+                           uint32_t access_flags, InvokeType invoke_type,
+                           uint32_t method_idx, jobject class_loader,
+                           const DexFile& dex_file,
+                           llvm::Module* module,
+                           llvm::LLVMContext* context,
+                           greenland::IntrinsicHelper* intrinsic_helper,
+                           greenland::IRBuilder* irb)
+{
+  compileMethod(compiler, code_item, access_flags, invoke_type, method_idx, class_loader,
+                dex_file, module, context, intrinsic_helper, irb, true);
+}
+#else
+CompiledMethod* oatCompileMethod(Compiler& compiler,
+                                 const DexFile::CodeItem* code_item,
+                                 uint32_t access_flags, InvokeType invoke_type,
+                                 uint32_t method_idx, jobject class_loader,
+                                 const DexFile& dex_file)
+{
+  return compileMethod(compiler, code_item, access_flags, invoke_type, method_idx, class_loader,
+                       dex_file);
+}
+#endif
+
 }  // namespace art
 
 extern "C" art::CompiledMethod*