commit f5c09c3ed5bca4c34d8476dd9ed2714106fafbcf
author Vladimir Marko <vmarko@google.com> Thu Dec 17 12:08:08 2015 +0000
committer Vladimir Marko <vmarko@google.com> Thu Dec 17 15:13:39 2015 +0000
tree 6521df348c2fd8d692bb751ed8dffdf70c8f6051
parent 7f3b38cc23b638ab84ac01a94e90f0456da3b688

Optimizing/ARM: Fix AddConstant() to adhere to set_cc.

And improve it to use shorter code sequences.

Bug: 26121945

Change-Id: Ia4f1688652c195a7ca19af36d919388a550e2841

compiler/utils/arm/assembler_arm.h

diff --git a/compiler/utils/arm/assembler_arm.h b/compiler/utils/arm/assembler_arm.h
index 98a1a8f..b79c2f0 100644
--- a/compiler/utils/arm/assembler_arm.h
+++ b/compiler/utils/arm/assembler_arm.h
@@ -878,7 +878,15 @@
                                      Register rn,
                                      Opcode opcode,
                                      uint32_t immediate,
+                                     SetCc set_cc,
                                      ShifterOperand* shifter_op) = 0;
+  bool ShifterOperandCanHold(Register rd,
+                             Register rn,
+                             Opcode opcode,
+                             uint32_t immediate,
+                             ShifterOperand* shifter_op) {
+    return ShifterOperandCanHold(rd, rn, opcode, immediate, kCcDontCare, shifter_op);
+  }
 
   virtual bool ShifterOperandCanAlwaysHold(uint32_t immediate) = 0;