diff options
| author | Andreas Gampe <agampe@google.com> | 2014-02-27 12:26:20 -0800 |
|---|---|---|
| committer | Andreas Gampe <agampe@google.com> | 2014-03-03 23:27:12 +0000 |
| commit | 2da882315a61072664f7ce3c212307342e907207 (patch) | |
| tree | 67d777be044f5b60e2f13ab7968b63c581904ea9 /compiler/common_compiler_test.h | |
| parent | 762d4e5b9e777ae64c4ba581af9c84b78a5e96a6 (diff) | |
| download | android_art-2da882315a61072664f7ce3c212307342e907207.tar.gz android_art-2da882315a61072664f7ce3c212307342e907207.tar.bz2 android_art-2da882315a61072664f7ce3c212307342e907207.zip | |
Initial changes towards Generic JNI option
Some initial changes that lead to an UNIMPLEMENTED. Works
by not compiling for JNI right now and tracking native methods
which have neither quick nor portable code. Uses new trampoline.
Change-Id: I5448654044eb2717752fd7359f4ef8bd5c17be6e
Diffstat (limited to 'compiler/common_compiler_test.h')
| -rw-r--r-- | compiler/common_compiler_test.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/compiler/common_compiler_test.h b/compiler/common_compiler_test.h index d034b7922e..3bdc95ea54 100644 --- a/compiler/common_compiler_test.h +++ b/compiler/common_compiler_test.h @@ -203,8 +203,11 @@ class CommonCompilerTest : public CommonRuntimeTest { method->SetEntryPointFromInterpreter(artInterpreterToCompiledCodeBridge); } else { // No code? You must mean to go into the interpreter. - const void* method_code = kUsePortableCompiler ? GetPortableToInterpreterBridge() - : GetQuickToInterpreterBridge(); + // Or the generic JNI... + const void* method_code = method->IsNative() ? GetQuickGenericJniTrampoline() + : (kUsePortableCompiler + ? GetPortableToInterpreterBridge() + : GetQuickToInterpreterBridge()); OatFile::OatMethod oat_method = CreateOatMethod(method_code, kStackAlignment, 0, |