Encode VFP conversion instructions.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@59074 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Target/ARM/ARMInstrInfo.h b/lib/Target/ARM/ARMInstrInfo.h
index 323e6e7..ccaeac5 100644
--- a/lib/Target/ARM/ARMInstrInfo.h
+++ b/lib/Target/ARM/ARMInstrInfo.h
@@ -70,7 +70,7 @@
     // Instruction encoding formats.
     //
     FormShift   = 10,
-    FormMask    = 0xf << FormShift,
+    FormMask    = 0x1f << FormShift,
 
     // Pseudo instructions
     Pseudo      = 1 << FormShift,
@@ -104,9 +104,11 @@
     VPFFrm       = 15 << FormShift,
     VFPUnaryFrm  = 16 << FormShift,
     VFPBinaryFrm = 17 << FormShift,
+    VFPConv1Frm  = 18 << FormShift,
+    VFPConv2Frm  = 19 << FormShift,
 
     // Thumb format
-    ThumbFrm     = 18 << FormShift,
+    ThumbFrm     = 20 << FormShift,
 
     //===------------------------------------------------------------------===//
     // Field shifts - such shifts are used to set field while generating
@@ -119,10 +121,8 @@
     ExtRotImmShift = 10,
     RegRdLoShift   = 12,
     RegRdShift     = 12,
-    RegFdShift     = 12,
     RegRdHiShift   = 16,
     RegRnShift     = 16,
-    RegFnShift     = 16,
     S_BitShift     = 20,
     W_BitShift     = 21,
     AM3_I_BitShift = 22,