From 9954e3b2fe94bf46100183e39478bc57b3a212a1 Mon Sep 17 00:00:00 2001 From: Andreas Gampe Date: Fri, 5 Aug 2016 20:34:39 -0700 Subject: ART: Extract JNI macro assembler for x86 Extract the JNI assembler parts from the regular assembler. Change-Id: I0b47af03ca12798f58dafec716a529eb0edf9649 Test: m test-art-host --- 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..6fdf09baa3 100644 --- a/compiler/utils/jni_macro_assembler.cc +++ b/compiler/utils/jni_macro_assembler.cc @@ -33,7 +33,7 @@ #include "mips64/assembler_mips64.h" #endif #ifdef ART_ENABLE_CODEGEN_x86 -#include "x86/assembler_x86.h" +#include "x86/jni_macro_assembler_x86.h" #endif #ifdef ART_ENABLE_CODEGEN_x86_64 #include "x86_64/assembler_x86_64.h" @@ -72,7 +72,7 @@ MacroAsm32UniquePtr JNIMacroAssembler::Create( #endif #ifdef ART_ENABLE_CODEGEN_x86 case kX86: - return MacroAsm32UniquePtr(new (arena) x86::X86Assembler(arena)); + return MacroAsm32UniquePtr(new (arena) x86::X86JNIMacroAssembler(arena)); #endif default: LOG(FATAL) << "Unknown/unsupported 4B InstructionSet: " << instruction_set; -- cgit v1.2.3-59-g8ed1b