Fix ARM emit() methods to count instructions generated.

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 342 matching lines @@
     IOffsetT Position = L->getLinkPosition();
     IOffsetT Dest = BoundPc - Position;
     IValueT Inst = Buffer.load<IValueT>(Position);
     Buffer.store<IValueT>(Position, encodeBranchOffset(Dest, Inst));
     L->setPosition(decodeBranchOffset(Inst));
   }
   L->bindTo(BoundPc);
 }
 
 void AssemblerARM32::emitTextInst(const std::string &Text, SizeT InstSize) {
-  AssemblerBuffer::EnsureCapacity ensured(&Buffer);
   AssemblerFixup *F = createTextFixup(Text, InstSize);
   emitFixup(F);
-  for (SizeT I = 0; I < InstSize; ++I)
-    Buffer.emit<char>(0);
+  if (InstSize) {

[Jim Stichnoth, 2015/11/04 23:45:26]

Remove this?  It's redundant with the loop condition.

[Karl, 2015/11/05 16:18:40]

Done.

+    for (SizeT I = 0; I < InstSize; ++I) {
+      AssemblerBuffer::EnsureCapacity ensured(&Buffer);
+      Buffer.emit<char>(0);
+    }
+  }
 }
 
 void AssemblerARM32::emitType01(CondARM32::Cond Cond, IValueT Type,
                                 IValueT Opcode, bool SetCc, IValueT Rn,
                                 IValueT Rd, IValueT Imm12) {
   if (!isGPRRegisterDefined(Rd) || !isConditionDefined(Cond))
     return setNeedsTextFixup();
   AssemblerBuffer::EnsureCapacity ensured(&Buffer);
   const IValueT Encoding = (encodeCondition(Cond) << kConditionShift) |
                            (Type << kTypeShift) | (Opcode << kOpcodeShift) |
@@ skipping 604 matching lines @@
   //    sub{s}<c> sp, <Rn>, #<RotatedImm8>
   //
   // cccc0010010snnnnddddiiiiiiiiiiii where cccc=Cond, dddd=Rd, nnnn=Rn,
   // s=SetFlags and iiiiiiiiiiii=Src1Value defining RotatedImm8
   constexpr IValueT Sub = B1; // 0010
   emitType01(Sub, OpRd, OpRn, OpSrc1, SetFlags, Cond);
 }
 
 } // end of namespace ARM32
 } // end of namespace Ice