Refactor PUSH/POP in ARM assemblers.

src/IceAssemblerARM32.h

Index: src/IceAssemblerARM32.h
diff --git a/src/IceAssemblerARM32.h b/src/IceAssemblerARM32.h
index 874d8ec926c53c476eb452082763290cf67ee727..8e56ad1d57a17ea5f5e15dc24a02485990068a09 100644
--- a/src/IceAssemblerARM32.h
+++ b/src/IceAssemblerARM32.h
@@ -38,12 +38,6 @@
 namespace Ice {
 namespace ARM32 {
 
-/// Encoding of an ARM 32-bit instruction.
-using IValueT = uint32_t;
-
-/// An Offset value (+/-) used in an ARM 32-bit instruction.
-using IOffsetT = int32_t;
-
 /// Handles encoding of bottom/top 16 bits of an address using movw/movt.
 class MoveRelocatableFixup final : public AssemblerFixup {
   MoveRelocatableFixup &operator=(const MoveRelocatableFixup &) = delete;
@@ -111,6 +105,10 @@ public:
 
   BlRelocatableFixup *createBlFixup(const ConstantRelocatable *BlTarget);
 
+  static IValueT getEncodedGPRegNum(const Variable *Var);

[John, 2016/01/06 16:10:21]

can these be moved to anonymous namespaces within the .cc file?

[Karl, 2016/01/06 23:21:58]

Moving back to anonymous namespace.

+
+  static IValueT getEncodedSRegNum(const Variable *Var);
+
   void alignFunction() override {
     const SizeT Align = 1 << getBundleAlignLog2Bytes();
     SizeT BytesNeeded = Utils::OffsetToAlignment(Buffer.getPosition(), Align);
@@ -255,7 +253,7 @@ public:
   void orr(const Operand *OpRd, const Operand *OpRn, const Operand *OpSrc1,
            bool SetFlags, CondARM32::Cond Cond);
 
-  void pop(const Operand *OpRt, CondARM32::Cond Cond);
+  void pop(const Variable *OpRt, CondARM32::Cond Cond);
 
   // Note: Registers is a bitset, where bit n corresponds to register Rn.
   void popList(const IValueT Registers, CondARM32::Cond Cond);