Add BL (immediate) and BLX (register) to ARM assembler.

src/DartARM32/assembler_arm.h

 // 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.
 //
 // This is forked from Dart revision df52deea9f25690eb8b66c5995da92b70f7ac1fe
 // Please update the (git) revision if we merge changes from Dart.
 // https://code.google.com/p/dart/wiki/GettingTheSource
 
 #ifndef VM_ASSEMBLER_ARM_H_
 #define VM_ASSEMBLER_ARM_H_
@@ skipping 10 matching lines @@
 #include "vm/object.h"
 #include "vm/simulator.h"
 
 namespace dart {
 
 // Forward declarations.
 class RuntimeEntry;
 class StubEntry;
 
 #if 0
-// Moved to: ARM32::AssemblerARM32 as needed
+// Moved to ARM32::AssemblerARM32 as needed
 // Instruction encoding bits.
 enum {
   H   = 1 << 5,   // halfword (or byte)
   L   = 1 << 20,  // load (or store)
   S   = 1 << 20,  // set condition code (or leave unchanged)
   W   = 1 << 21,  // writeback base register (or leave unchanged)
   A   = 1 << 21,  // accumulate in multiply instruction (or not)
   B   = 1 << 22,  // unsigned byte (or word)
   D   = 1 << 22,  // high/lo bit of start of s/d register range
   N   = 1 << 22,  // long (or short)
@@ skipping 547 matching lines @@
 #endif
 
   void ldrex(Register rd, Register rn, Condition cond = AL);
   void strex(Register rd, Register rt, Register rn, Condition cond = AL);
 
   // Miscellaneous instructions.
   void clrex();
   void nop(Condition cond = AL);
 
 #if 0
-  // Moved to: ARM32::AssemblerARM32::bkpt()
+  // Moved to ARM32::AssemblerARM32::bkpt()
   // Note that gdb sets breakpoints using the undefined instruction 0xe7f001f0.
   void bkpt(uint16_t imm16);
 
   static int32_t BkptEncoding(uint16_t imm16) {
     // bkpt requires that the cond field is AL.
     return (AL << kConditionShift) | B24 | B21 |
            ((imm16 >> 4) << 8) | B6 | B5 | B4 | (imm16 & 0xf);
   }
 #endif
 
@@ skipping 107 matching lines @@
 
   // Each byte of dm is an index into the table of bytes formed by concatenating
   // a list of 'length' registers starting with dn. The result is placed in dd.
   void vtbl(DRegister dd, DRegister dn, int length, DRegister dm);
 
   // The words of qd and qm are interleaved with the low words of the result
   // in qd and the high words in qm.
   void vzipqw(QRegister qd, QRegister qm);
 
   // Branch instructions.
+#if 0
+  // Moved to ARM32::AssemblerARM32::b();
   void b(Label* label, Condition cond = AL);
+  // Moved to ARM32::AssemblerARM32::bl()
   void bl(Label* label, Condition cond = AL);
-#if 0
-  // Moved to: ARM32::AssemblerARM32::bx()
+  // Moved to ARM32::AssemblerARM32::bx()
   void bx(Register rm, Condition cond = AL);
+  // Moved to ARM32::AssemblerARM32::blx()
+  void blx(Register rm, Condition cond = AL);
 #endif
-  void blx(Register rm, Condition cond = AL);
 
   void Branch(const StubEntry& stub_entry,
               Patchability patchable = kNotPatchable,
               Register pp = PP,
               Condition cond = AL);
 
   void BranchLink(const StubEntry& stub_entry,
                   Patchability patchable = kNotPatchable);
   void BranchLink(const Code& code, Patchability patchable);
 
@@ skipping 513 matching lines @@
                  DRegister dd,
                  SRegister sm);
 
   void EmitSIMDqqq(int32_t opcode, OperandSize sz,
                    QRegister qd, QRegister qn, QRegister qm);
 
   void EmitSIMDddd(int32_t opcode, OperandSize sz,
                    DRegister dd, DRegister dn, DRegister dm);
 
   void EmitFarBranch(Condition cond, int32_t offset, bool link);
+#if 0
+  // Moved to ARM32::AssemblerARM32::emitBranch()
   void EmitBranch(Condition cond, Label* label, bool link);
-#if 0
   // Moved to ARM32::AssemblerARM32::encodeBranchoffset().
   int32_t EncodeBranchOffset(int32_t offset, int32_t inst);
   // Moved to ARM32::AssemberARM32::decodeBranchOffset().
   static int32_t DecodeBranchOffset(int32_t inst);
 #endif
   int32_t EncodeTstOffset(int32_t offset, int32_t inst);
   int32_t DecodeTstOffset(int32_t inst);
 
   void StoreIntoObjectFilter(Register object, Register value, Label* no_update);
 
@@ skipping 28 matching lines @@
   // ARM32::AssemblerARM::uxt() (uxtb and uxth).
 #endif
 
   DISALLOW_ALLOCATION();
   DISALLOW_COPY_AND_ASSIGN(Assembler);
 };
 
 }  // namespace dart
 
 #endif  // VM_ASSEMBLER_ARM_H_