From 7b7e524c86a67f7357bbcfd0e7bde07ded50cca2 Mon Sep 17 00:00:00 2001 From: Andreas Gampe Date: Mon, 2 Feb 2015 19:17:11 -0800 Subject: ART: Fix assembler_thumb_test Fix the inconsistent calls. This was bad practice, requiring that shape meant arm32 and thumb were not interchangeable. Also fix an error in the assembler itself for tst and teq. Change-Id: I50242801002aa81cc17bfaa53eb8b7c1d9488fbc --- compiler/utils/assembler_thumb_test.cc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (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 e3a9580737..a171e59d98 100644 --- a/compiler/utils/assembler_thumb_test.cc +++ b/compiler/utils/assembler_thumb_test.cc @@ -309,13 +309,13 @@ TEST(Thumb2AssemblerTest, DataProcessingRegister) { // 16 bit variants. __ add(R0, R1, ShifterOperand()); __ sub(R0, R1, ShifterOperand()); - __ and_(R0, R1, ShifterOperand()); - __ orr(R0, R1, ShifterOperand()); - __ eor(R0, R1, ShifterOperand()); - __ bic(R0, R1, ShifterOperand()); - __ adc(R0, R1, ShifterOperand()); - __ sbc(R0, R1, ShifterOperand()); - __ rsb(R0, R1, ShifterOperand()); + __ and_(R0, R0, ShifterOperand(R1)); + __ orr(R0, R0, ShifterOperand(R1)); + __ eor(R0, R0, ShifterOperand(R1)); + __ bic(R0, R0, ShifterOperand(R1)); + __ adc(R0, R0, ShifterOperand(R1)); + __ sbc(R0, R0, ShifterOperand(R1)); + __ rsb(R0, R0, ShifterOperand(R1)); __ tst(R0, ShifterOperand(R1)); __ teq(R0, ShifterOperand(R1)); -- cgit v1.2.3-59-g8ed1b