commit 9954e3b2fe94bf46100183e39478bc57b3a212a1
author Andreas Gampe <agampe@google.com> Fri Aug 05 20:34:39 2016 -0700
committer Andreas Gampe <agampe@google.com> Mon Aug 08 11:43:16 2016 -0700
tree 97b4b7a3fb16ee0aa7fe1f1e0e5d7680540063c1
parent 95a976a3d1842384ed71bcc6e6449de95ec69961

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

diff --git a/compiler/utils/jni_macro_assembler.cc b/compiler/utils/jni_macro_assembler.cc
index 6c14888..6fdf09b 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 @@
 #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;