diff options
| author | Dave Allison <dallison@google.com> | 2014-04-28 13:45:27 -0700 |
|---|---|---|
| committer | Dave Allison <dallison@google.com> | 2014-06-05 12:45:20 -0700 |
| commit | 65fcc2cf3c5cd97b84330c094908f3a6a7a8d4e7 (patch) | |
| tree | fc0ce77d446477be37f0ec8c86d67df4941cac9b /compiler/jni | |
| parent | e3b5cb502371aff7e7b7291facfc27b092e7803e (diff) | |
| download | android_art-65fcc2cf3c5cd97b84330c094908f3a6a7a8d4e7.tar.gz android_art-65fcc2cf3c5cd97b84330c094908f3a6a7a8d4e7.tar.bz2 android_art-65fcc2cf3c5cd97b84330c094908f3a6a7a8d4e7.zip | |
Thumb2 assembler for JNI compiler and optimizing compiler
This provides a programmatic assembler for the thumb2 instruction set for
ARM. The interface is the same as the ARM assembler and the ARM assembler has
been moved into Arm32Assembler. The assembler handles most 16 and 32 bit instructions
and also allows relocations due to branch expansion. It will also rewrite cbz/cbnz
instructions if they go out of range.
It also changes the JNI compiler to use the thumb2 assembler as opposed
to forcing it to use ARM32. The trampoline compiler still uses ARM due to the
way it returns the address of its generated code. A trampoline in thumb2 is the
same size as that in ARM anyway (8 bytes).
Provides gtest for testing the thumb2 instruction output. This gtest only runs
on the host as it uses arm-eabi-objdump to disassemble the generated code. On the
target the output is not checked but the assembler will still be run to perform
all its checks.
Change-Id: Icd9742b6f13541bec5b23097896727392e3a6fb6
Diffstat (limited to 'compiler/jni')
| -rw-r--r-- | compiler/jni/quick/jni_compiler.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/compiler/jni/quick/jni_compiler.cc b/compiler/jni/quick/jni_compiler.cc index 7664a7f635..3bbb723bcf 100644 --- a/compiler/jni/quick/jni_compiler.cc +++ b/compiler/jni/quick/jni_compiler.cc @@ -17,6 +17,7 @@ #include <algorithm> #include <memory> #include <vector> +#include <fstream> #include "base/logging.h" #include "base/macros.h" @@ -61,9 +62,6 @@ CompiledMethod* ArtJniCompileMethodInternal(CompilerDriver* driver, const bool is_synchronized = (access_flags & kAccSynchronized) != 0; const char* shorty = dex_file.GetMethodShorty(dex_file.GetMethodId(method_idx)); InstructionSet instruction_set = driver->GetInstructionSet(); - if (instruction_set == kThumb2) { - instruction_set = kArm; - } const bool is_64_bit_target = Is64BitInstructionSet(instruction_set); // Calling conventions used to iterate over parameters to method std::unique_ptr<JniCallingConvention> main_jni_conv( |