From b77051ea5718fe017f2fa884b9ca4c8186c95190 Mon Sep 17 00:00:00 2001 From: Scott Wakeling Date: Mon, 21 Nov 2016 19:46:00 +0000 Subject: ARM: VIXL32: Fix breaking changes from recent VIXL update. Test: m test-art-host Test: m test-art-target Change-Id: I02a608bf51b889a2bfff43272a3619582bf9cf20 --- compiler/utils/assembler_thumb_test.cc | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'compiler/utils/assembler_thumb_test.cc') diff --git a/compiler/utils/assembler_thumb_test.cc b/compiler/utils/assembler_thumb_test.cc index 10bed13dad..50a1d9fd98 100644 --- a/compiler/utils/assembler_thumb_test.cc +++ b/compiler/utils/assembler_thumb_test.cc @@ -1753,7 +1753,10 @@ TEST_F(ArmVIXLAssemblerTest, VixlLoadFromOffset) { __ LoadFromOffset(kLoadWordPair, R2, R4, 0x40400); __ LoadFromOffset(kLoadWordPair, R4, R4, 0x40400); + vixl::aarch32::UseScratchRegisterScope temps(assembler.asm_.GetVIXLAssembler()); + temps.Exclude(R12); __ LoadFromOffset(kLoadWord, R0, R12, 12); // 32-bit because of R12. + temps.Include(R12); __ LoadFromOffset(kLoadWord, R2, R4, 0xa4 - 0x100000); __ LoadFromOffset(kLoadSignedByte, R2, R4, 12); @@ -1783,7 +1786,10 @@ TEST_F(ArmVIXLAssemblerTest, VixlStoreToOffset) { __ StoreToOffset(kStoreWordPair, R2, R4, 0x40400); __ StoreToOffset(kStoreWordPair, R4, R4, 0x40400); + vixl::aarch32::UseScratchRegisterScope temps(assembler.asm_.GetVIXLAssembler()); + temps.Exclude(R12); __ StoreToOffset(kStoreWord, R0, R12, 12); // 32-bit because of R12. + temps.Include(R12); __ StoreToOffset(kStoreWord, R2, R4, 0xa4 - 0x100000); __ StoreToOffset(kStoreByte, R2, R4, 12); -- cgit v1.2.3-59-g8ed1b