diff options
| author | Stuart Monteith <stuart.monteith@arm.com> | 2014-03-12 13:32:32 +0000 |
|---|---|---|
| committer | Andreas Gampe <agampe@google.com> | 2014-03-19 17:17:55 -0700 |
| commit | b95a5345ae4217b70ca36f0cced92f68dda7caf5 (patch) | |
| tree | d9c76db71eb8dd3a668643781eefe6152888fd1d /compiler/compiled_method.cc | |
| parent | 66e4c3e96dccdec7423d673ad6bbf7821a776651 (diff) | |
| download | art-b95a5345ae4217b70ca36f0cced92f68dda7caf5.tar.gz art-b95a5345ae4217b70ca36f0cced92f68dda7caf5.tar.bz2 art-b95a5345ae4217b70ca36f0cced92f68dda7caf5.zip | |
AArch64: Add arm64 runtime support.
Adds support for arm64 to ART. Assembler stubs are sufficient for
down calls into interpreter. JNI compiler and generics are not finished.
Basic Generic JNI functionality.
Change-Id: I4a07c79d1e037b9f5746673480e32cf456867b82
Diffstat (limited to 'compiler/compiled_method.cc')
| -rw-r--r-- | compiler/compiled_method.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/compiler/compiled_method.cc b/compiler/compiled_method.cc index 17c2e94652..344f3ef745 100644 --- a/compiler/compiled_method.cc +++ b/compiler/compiled_method.cc @@ -86,6 +86,8 @@ uint32_t CompiledCode::AlignCode(uint32_t offset, InstructionSet instruction_set case kArm: case kThumb2: return RoundUp(offset, kArmAlignment); + case kArm64: + return RoundUp(offset, kArm64Alignment); case kMips: return RoundUp(offset, kMipsAlignment); case kX86: // Fall-through. @@ -100,6 +102,7 @@ uint32_t CompiledCode::AlignCode(uint32_t offset, InstructionSet instruction_set size_t CompiledCode::CodeDelta() const { switch (instruction_set_) { case kArm: + case kArm64: case kMips: case kX86: return 0; @@ -117,6 +120,7 @@ const void* CompiledCode::CodePointer(const void* code_pointer, InstructionSet instruction_set) { switch (instruction_set) { case kArm: + case kArm64: case kMips: case kX86: return code_pointer; |