Fix emission of move immediate for ARM integrated assembler.

src/IceAssemblerARM32.cpp

 //===- subzero/src/IceAssemblerARM32.cpp - Assembler for ARM32 --*- C++ -*-===//
 //
 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 //
 // Modified by the Subzero authors.
 //
 //===----------------------------------------------------------------------===//
 //
@@ skipping 38 matching lines @@
   while (label->isLinked()) {
     intptr_t position = label->getLinkPosition();
     intptr_t next = Buffer.load<int32_t>(position);
     Buffer.store<int32_t>(position, bound - (position + 4));
     label->setPosition(next);
   }
   // TODO(kschimpf) Decide if we have near jumps.
   label->bindTo(bound);
 }
 
+void ARM32::AssemblerARM32::emitType01(CondARM32::Cond Cond, uint32_t Type,
+                                       uint32_t Opcode, bool SetCc, uint32_t Rn,
+                                       uint32_t Rd, uint32_t Imm12) {
+  assert(isGPRRegisterDefined(Rd));
+  assert(Cond != CondARM32::kNone);
+  uint32_t Encoding = encodeCondition(Cond) << kConditionShift |
+                      (Type << kTypeShift) | (Opcode << kOpcodeShift) |
+                      (encodeBool(SetCc) << kSShift) | (Rn << kRnShift) |
+                      (Rd << kRdShift) | Imm12;
+  emitInt32(Encoding);
+}
+
 void ARM32::AssemblerARM32::bkpt(uint16_t imm16) {
   AssemblerBuffer::EnsureCapacity ensured(&Buffer);
   emitInt32(BkptEncoding(imm16));
 }
 
-void ARM32::AssemblerARM32::bx(RegARM32::GPRRegister rm, CondARM32::Cond cond) {
+void ARM32::AssemblerARM32::bx(RegARM32::GPRRegister Rm, CondARM32::Cond Cond) {
   // cccc000100101111111111110001mmmm where mmmm=rm and cccc=Cond.
-  assert(rm != RegARM32::Encoded_Not_GPR);
-  assert(cond != CondARM32::kNone);
+  // (ARM cection A8.8.27, encoding A1).
+  assert(isGPRRegisterDefined(Rm));
+  assert(isConditionDefined(Cond));
   AssemblerBuffer::EnsureCapacity ensured(&Buffer);
-  int32_t encoding = (static_cast<int32_t>(cond) << kConditionShift) | B24 |
-                     B21 | (0xfff << 8) | B4 |
-                     (static_cast<int32_t>(rm) << kRmShift);
-  emitInt32(encoding);
+  uint32_t Encoding = (encodeCondition(Cond) << kConditionShift) | B24 | B21 |
+                      (0xfff << 8) | B4 | (encodeGPRRegister(Rm) << kRmShift);
+  emitInt32(Encoding);
+}
+
+void ARM32::AssemblerARM32::mov(RegARM32::GPRRegister Rd,
+                                const OperandARM32FlexImm &FlexImm,
+                                CondARM32::Cond Cond) {
+  // cccc0011101s0000ddddiiiiiiiiiiii (ARM section A8.8.102, encoding A1)
+  assert(isConditionDefined(Cond));
+  AssemblerBuffer::EnsureCapacity ensured(&Buffer);
+  bool SetCc = false;  // Note: We don't use movs in this assembler.
+  uint32_t Rn = 0;
+  uint32_t Mov = B3 | B2 | B0; // 1101.
+  emitType01(Cond, kInstTypeImmediate, Mov, SetCc, Rn, encodeGPRRegister(Rd),
+             encodeImm12FromFlexImm(FlexImm));
 }
 
 } // end of namespace Ice