Revert "For the ARM integrated assembler add checking of the alignments on vld/vst...

[oota-llvm.git] / lib / Target / ARM / ARMInstrInfo.td

diff --git a/lib/Target/ARM/ARMInstrInfo.td b/lib/Target/ARM/ARMInstrInfo.td
index c27ffeed890f06e097c97b23d2a04d24ad324bcf..ee824699e76fc14c2ec2abce515f8201f6c48dea 100644 (file)
--- a/lib/Target/ARM/ARMInstrInfo.td
+++ b/lib/Target/ARM/ARMInstrInfo.td
@@ -991,81 +991,6 @@ def addrmode6oneL32 : Operand<i32>,
   let EncoderMethod = "getAddrMode6OneLane32AddressOpValue";
 }
 
-// Base class for addrmode6 with specific alignment restrictions.
-class AddrMode6Align : Operand<i32>,
-                ComplexPattern<i32, 2, "SelectAddrMode6", [], [SDNPWantParent]>{
-  let PrintMethod = "printAddrMode6Operand";
-  let MIOperandInfo = (ops GPR:$addr, i32imm:$align);
-  let EncoderMethod = "getAddrMode6AddressOpValue";
-  let DecoderMethod = "DecodeAddrMode6Operand";
-}
-
-// Special version of addrmode6 to handle no allowed alignment encoding for
-// VLD/VST instructions and checking the alignment is not specified.
-def AddrMode6AlignNoneAsmOperand : AsmOperandClass {
-  let Name = "AlignedMemoryNone";
-  let DiagnosticType = "AlignedMemoryRequiresNone";
-}
-def addrmode6alignNone : AddrMode6Align {
-  // The alignment specifier can only be omitted.
-  let ParserMatchClass = AddrMode6AlignNoneAsmOperand;
-}
-
-// Special version of addrmode6 to handle 16-bit alignment encoding for
-// VLD/VST instructions and checking the alignment value.
-def AddrMode6Align16AsmOperand : AsmOperandClass {
-  let Name = "AlignedMemory16";
-  let DiagnosticType = "AlignedMemoryRequires16";
-}
-def addrmode6align16 : AddrMode6Align {
-  // The alignment specifier can only be 16 or omitted.
-  let ParserMatchClass = AddrMode6Align16AsmOperand;
-}
-
-// Special version of addrmode6 to handle 32-bit alignment encoding for
-// VLD/VST instructions and checking the alignment value.
-def AddrMode6Align32AsmOperand : AsmOperandClass {
-  let Name = "AlignedMemory32";
-  let DiagnosticType = "AlignedMemoryRequires32";
-}
-def addrmode6align32 : AddrMode6Align {
-  // The alignment specifier can only be 32 or omitted.
-  let ParserMatchClass = AddrMode6Align32AsmOperand;
-}
-
-// Special version of addrmode6 to handle 64-bit alignment encoding for
-// VLD/VST instructions and checking the alignment value.
-def AddrMode6Align64AsmOperand : AsmOperandClass {
-  let Name = "AlignedMemory64";
-  let DiagnosticType = "AlignedMemoryRequires64";
-}
-def addrmode6align64 : AddrMode6Align {
-  // The alignment specifier can only be 64 or omitted.
-  let ParserMatchClass = AddrMode6Align64AsmOperand;
-}
-
-// Special version of addrmode6 to handle 64-bit or 128-bit alignment encoding
-// for VLD/VST instructions and checking the alignment value.
-def AddrMode6Align64or128AsmOperand : AsmOperandClass {
-  let Name = "AlignedMemory64or128";
-  let DiagnosticType = "AlignedMemoryRequires64or128";
-}
-def addrmode6align64or128 : AddrMode6Align {
-  // The alignment specifier can only be 64, 128 or omitted.
-  let ParserMatchClass = AddrMode6Align64or128AsmOperand;
-}
-
-// Special version of addrmode6 to handle 64-bit, 128-bit or 256-bit alignment
-// encoding for VLD/VST instructions and checking the alignment value.
-def AddrMode6Align64or128or256AsmOperand : AsmOperandClass {
-  let Name = "AlignedMemory64or128or256";
-  let DiagnosticType = "AlignedMemoryRequires64or128or256";
-}
-def addrmode6align64or128or256 : AddrMode6Align {
-  // The alignment specifier can only be 64, 128, 256 or omitted.
-  let ParserMatchClass = AddrMode6Align64or128or256AsmOperand;
-}
-
 // Special version of addrmode6 to handle alignment encoding for VLD-dup
 // instructions, specifically VLD4-dup.
 def addrmode6dup : Operand<i32>,
@@ -1078,69 +1003,6 @@ def addrmode6dup : Operand<i32>,
   let ParserMatchClass = AddrMode6AsmOperand;
 }
 
-// Base class for addrmode6dup with specific alignment restrictions.
-class AddrMode6DupAlign : Operand<i32>,
-                ComplexPattern<i32, 2, "SelectAddrMode6", [], [SDNPWantParent]>{
-  let PrintMethod = "printAddrMode6Operand";
-  let MIOperandInfo = (ops GPR:$addr, i32imm);
-  let EncoderMethod = "getAddrMode6DupAddressOpValue";
-}
-
-// Special version of addrmode6 to handle no allowed alignment encoding for
-// VLD-dup instruction and checking the alignment is not specified.
-def AddrMode6dupAlignNoneAsmOperand : AsmOperandClass {
-  let Name = "DupAlignedMemoryNone";
-  let DiagnosticType = "DupAlignedMemoryRequiresNone";
-}
-def addrmode6dupalignNone : AddrMode6DupAlign {
-  // The alignment specifier can only be omitted.
-  let ParserMatchClass = AddrMode6dupAlignNoneAsmOperand;
-}
-
-// Special version of addrmode6 to handle 16-bit alignment encoding for VLD-dup
-// instruction and checking the alignment value.
-def AddrMode6dupAlign16AsmOperand : AsmOperandClass {
-  let Name = "DupAlignedMemory16";
-  let DiagnosticType = "DupAlignedMemoryRequires16";
-}
-def addrmode6dupalign16 : AddrMode6DupAlign {
-  // The alignment specifier can only be 16 or omitted.
-  let ParserMatchClass = AddrMode6dupAlign16AsmOperand;
-}
-
-// Special version of addrmode6 to handle 32-bit alignment encoding for VLD-dup
-// instruction and checking the alignment value.
-def AddrMode6dupAlign32AsmOperand : AsmOperandClass {
-  let Name = "DupAlignedMemory32";
-  let DiagnosticType = "DupAlignedMemoryRequires32";
-}
-def addrmode6dupalign32 : AddrMode6DupAlign {
-  // The alignment specifier can only be 32 or omitted.
-  let ParserMatchClass = AddrMode6dupAlign32AsmOperand;
-}
-
-// Special version of addrmode6 to handle 64-bit alignment encoding for VLD
-// instructions and checking the alignment value.
-def AddrMode6dupAlign64AsmOperand : AsmOperandClass {
-  let Name = "DupAlignedMemory64";
-  let DiagnosticType = "DupAlignedMemoryRequires64";
-}
-def addrmode6dupalign64 : AddrMode6DupAlign {
-  // The alignment specifier can only be 64 or omitted.
-  let ParserMatchClass = AddrMode6dupAlign64AsmOperand;
-}
-
-// Special version of addrmode6 to handle 64-bit or 128-bit alignment encoding
-// for VLD instructions and checking the alignment value.
-def AddrMode6dupAlign64or128AsmOperand : AsmOperandClass {
-  let Name = "DupAlignedMemory64or128";
-  let DiagnosticType = "DupAlignedMemoryRequires64or128";
-}
-def addrmode6dupalign64or128 : AddrMode6DupAlign {
-  // The alignment specifier can only be 64, 128 or omitted.
-  let ParserMatchClass = AddrMode6dupAlign64or128AsmOperand;
-}
-
 // addrmodepc := pc + reg
 //
 def addrmodepc : Operand<i32>,