From: Stephen Kyle Date: Wed, 22 Oct 2014 14:23:46 +0000 (+0100) Subject: Fix arm64 bug introduced by refactoring. X-Git-Tag: android-x86-7.1-r1~889^2~2818^2 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=0ff20d50fcf120b798cabf8cebd77d54850e6cd5;p=android-x86%2Fart.git Fix arm64 bug introduced by refactoring. - Commit 1d8cdbc5202378 made changes to the parameters for artSet64InstanceFromCode, but did not change THREE_ARG_DOWNCALL to THREE_ARG_REF_DOWNCALL for arm64. Change-Id: If256b0bd32dbd1c95f61e0afcb35975bb09a8b97 Signed-off-by: Stephen Kyle --- diff --git a/runtime/arch/arm64/quick_entrypoints_arm64.S b/runtime/arch/arm64/quick_entrypoints_arm64.S index 0fb96d7a9..147d4348b 100644 --- a/runtime/arch/arm64/quick_entrypoints_arm64.S +++ b/runtime/arch/arm64/quick_entrypoints_arm64.S @@ -1285,7 +1285,7 @@ TWO_ARG_REF_DOWNCALL art_quick_set_obj_static, artSetObjStaticFromCode, RETURN_I THREE_ARG_REF_DOWNCALL art_quick_set8_instance, artSet8InstanceFromCode, RETURN_IF_W0_IS_ZERO_OR_DELIVER THREE_ARG_REF_DOWNCALL art_quick_set16_instance, artSet16InstanceFromCode, RETURN_IF_W0_IS_ZERO_OR_DELIVER THREE_ARG_REF_DOWNCALL art_quick_set32_instance, artSet32InstanceFromCode, RETURN_IF_W0_IS_ZERO_OR_DELIVER -THREE_ARG_DOWNCALL art_quick_set64_instance, artSet64InstanceFromCode, RETURN_IF_W0_IS_ZERO_OR_DELIVER +THREE_ARG_REF_DOWNCALL art_quick_set64_instance, artSet64InstanceFromCode, RETURN_IF_W0_IS_ZERO_OR_DELIVER THREE_ARG_REF_DOWNCALL art_quick_set_obj_instance, artSetObjInstanceFromCode, RETURN_IF_W0_IS_ZERO_OR_DELIVER // This is separated out as the argument order is different.