From b95a5345ae4217b70ca36f0cced92f68dda7caf5 Mon Sep 17 00:00:00 2001 From: Stuart Monteith Date: Wed, 12 Mar 2014 13:32:32 +0000 Subject: 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 --- compiler/compiled_method.cc | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'compiler/compiled_method.cc') 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; -- cgit v1.2.3-59-g8ed1b