From 68f3e09c88a30e4b337b1929126a602b42406916 Mon Sep 17 00:00:00 2001 From: Andreas Gampe Date: Wed, 16 Apr 2014 11:23:27 -0700 Subject: [PATCH] Fix typo in ISA centralization X86 needs sign-extension. Change-Id: I1253fbc9aa0e732e37b976a0723ec89155e7e2e7 --- compiler/jni/quick/jni_compiler.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compiler/jni/quick/jni_compiler.cc b/compiler/jni/quick/jni_compiler.cc index e03aefb13..93b1b5a15 100644 --- a/compiler/jni/quick/jni_compiler.cc +++ b/compiler/jni/quick/jni_compiler.cc @@ -314,7 +314,7 @@ CompiledMethod* ArtJniCompileMethodInternal(CompilerDriver& compiler, mr_conv->InterproceduralScratchRegister()); // 10. Fix differences in result widths. - if (is_64_bit_target) { + if (instruction_set == kX86 || instruction_set == kX86_64) { if (main_jni_conv->GetReturnType() == Primitive::kPrimByte || main_jni_conv->GetReturnType() == Primitive::kPrimShort) { __ SignExtend(main_jni_conv->ReturnRegister(), -- 2.11.0