summaryrefslogtreecommitdiff
path: root/src/compiler_llvm/compiler_llvm.h
diff options
context:
space:
mode:
author Shih-wei Liao <sliao@google.com> 2012-08-23 13:20:00 -0700
committer Shih-wei Liao <sliao@google.com> 2012-09-15 04:51:24 -0700
commitbb33f2fa8e462937574a8cd1b744b86c2f762571 (patch)
tree45ac9bab7e86dc7533837e74bca37cdf0ab6141d /src/compiler_llvm/compiler_llvm.h
parentabc4c6bc6d5b54860810eb6e7205fd87cfa52636 (diff)
Integrating portable path with the Frontend.
(1) Connect the new interface oatCompileMethodToGBC and gbc_expander. (2) Need to fix Android.common.mk for fly2iceland: Portable path has frontend: USE_QUICK_COMPILER and backend: USE_LLVM_COMPILER. (3) Fix Android.libart-compiler-llvm.mk so we can call the new interface. Change-Id: I7216f378bdb5e42a35fd6fa10c1d5d161a912401
Diffstat (limited to 'src/compiler_llvm/compiler_llvm.h')
-rw-r--r--src/compiler_llvm/compiler_llvm.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/compiler_llvm/compiler_llvm.h b/src/compiler_llvm/compiler_llvm.h
index 4680648854..dabd7be45b 100644
--- a/src/compiler_llvm/compiler_llvm.h
+++ b/src/compiler_llvm/compiler_llvm.h
@@ -74,7 +74,12 @@ class CompilerLLVM {
bitcode_filename_ = filename;
}
- CompiledMethod* CompileDexMethod(OatCompilationUnit* oat_compilation_unit);
+ CompiledMethod* CompileDexMethod(OatCompilationUnit* oat_compilation_unit,
+ InvokeType invoke_type);
+
+#if defined(ART_USE_LLVM_COMPILER) && defined(ART_USE_QUICK_COMPILER)
+ CompiledMethod* CompileGBCMethod(OatCompilationUnit* oat_compilation_unit, std::string* func);
+#endif
CompiledMethod* CompileNativeMethod(OatCompilationUnit* oat_compilation_unit);