- Improve naming consistency: Branch -> BrFrm, BranchMisc -> BrMiscFrm.
- Consolidate instruction formats.
- Other clean up.

llvm-svn: 58808
diff --git a/llvm/lib/Target/ARM/ARMInstrInfo.h b/llvm/lib/Target/ARM/ARMInstrInfo.h
index 4dcbb6a..c2eb54c 100644
--- a/llvm/lib/Target/ARM/ARMInstrInfo.h
+++ b/llvm/lib/Target/ARM/ARMInstrInfo.h
@@ -79,8 +79,8 @@
     MulFrm      = 2 << FormShift,
 
     // Branch instructions
-    Branch      = 3 << FormShift,
-    BranchMisc  = 4 << FormShift,
+    BrFrm       = 3 << FormShift,
+    BrMiscFrm   = 4 << FormShift,
 
     // Data Processing instructions
     DPFrm       = 5 << FormShift,