From 1ace16bfe8727430809f1e83745e13c52f9610cd Mon Sep 17 00:00:00 2001 From: Andreas Gampe Date: Fri, 5 Aug 2016 09:01:50 -0700 Subject: ART: Extract JNI macro assembler for x86-64 Extract the JNI assembler parts from the regular assembler. Test: m test-art-host Change-Id: I291fb76ad9232123b4c1992488ee81fec3c1db47 --- 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 6c14888293..0b1aa08a17 100644 --- a/compiler/utils/jni_macro_assembler.cc +++ b/compiler/utils/jni_macro_assembler.cc @@ -36,7 +36,7 @@ #include "x86/assembler_x86.h" #endif #ifdef ART_ENABLE_CODEGEN_x86_64 -#include "x86_64/assembler_x86_64.h" +#include "x86_64/jni_macro_assembler_x86_64.h" #endif #include "base/casts.h" #include "globals.h" @@ -98,7 +98,7 @@ MacroAsm64UniquePtr JNIMacroAssembler::Create( #endif #ifdef ART_ENABLE_CODEGEN_x86_64 case kX86_64: - return MacroAsm64UniquePtr(new (arena) x86_64::X86_64Assembler(arena)); + return MacroAsm64UniquePtr(new (arena) x86_64::X86_64JNIMacroAssembler(arena)); #endif default: LOG(FATAL) << "Unknown/unsupported 8B InstructionSet: " << instruction_set; -- cgit v1.2.3-59-g8ed1b