From dcf3014718d9542927a4c8dc93701ce892484c84 Mon Sep 17 00:00:00 2001 From: Andreas Gampe Date: Mon, 8 Aug 2016 16:06:34 -0700 Subject: ART: Extract JNI macro assembler for arm64 Extract the JNI assembler parts from the regular assembler. Change-Id: I0b0ad32e18f585b75e9da0237afe082c25a1d291 Test: m test-art-target (N9) --- compiler/utils/jni_macro_assembler.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'compiler/utils/jni_macro_assembler.cc') diff --git a/compiler/utils/jni_macro_assembler.cc b/compiler/utils/jni_macro_assembler.cc index 1acc90ca6f..4fca4e1090 100644 --- a/compiler/utils/jni_macro_assembler.cc +++ b/compiler/utils/jni_macro_assembler.cc @@ -24,7 +24,7 @@ #include "arm/assembler_thumb2.h" #endif #ifdef ART_ENABLE_CODEGEN_arm64 -#include "arm64/assembler_arm64.h" +#include "arm64/jni_macro_assembler_arm64.h" #endif #ifdef ART_ENABLE_CODEGEN_mips #include "mips/assembler_mips.h" @@ -90,7 +90,7 @@ MacroAsm64UniquePtr JNIMacroAssembler::Create( switch (instruction_set) { #ifdef ART_ENABLE_CODEGEN_arm64 case kArm64: - return MacroAsm64UniquePtr(new (arena) arm64::Arm64Assembler(arena)); + return MacroAsm64UniquePtr(new (arena) arm64::Arm64JNIMacroAssembler(arena)); #endif #ifdef ART_ENABLE_CODEGEN_mips64 case kMips64: -- cgit v1.2.3-59-g8ed1b