From 011355944bc914b556d43ca4e3b422049791de08 Mon Sep 17 00:00:00 2001 From: Bob Wilson Date: Tue, 23 Mar 2010 17:23:59 +0000 Subject: [PATCH] Fix bad indentation, 80-column violations, and trailing whitespace. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@99295 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Target/ARM/ARMInstrFormats.td | 112 ++++++++++++++++-------------- 1 file changed, 60 insertions(+), 52 deletions(-) diff --git a/lib/Target/ARM/ARMInstrFormats.td b/lib/Target/ARM/ARMInstrFormats.td index f69bb39062e..43dcf32a7df 100644 --- a/lib/Target/ARM/ARMInstrFormats.td +++ b/lib/Target/ARM/ARMInstrFormats.td @@ -1,10 +1,10 @@ //===- ARMInstrFormats.td - ARM Instruction Formats --*- tablegen -*---------=// -// +// // The LLVM Compiler Infrastructure // // This file is distributed under the University of Illinois Open Source // License. See LICENSE.TXT for details. -// +// //===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===// @@ -178,13 +178,13 @@ class InstTemplate AddrModeBits = AM.Value; - + SizeFlagVal SZ = sz; bits<3> SizeFlag = SZ.Value; IndexMode IM = im; bits<2> IndexModeBits = IM.Value; - + Format F = f; bits<6> Form = F.Value; @@ -196,7 +196,7 @@ class InstTemplate : InstTemplate; -class PseudoInst pattern> - : InstARM { let OutOperandList = oops; let InOperandList = iops; @@ -227,7 +227,7 @@ class PseudoInst pattern> : InstARM { @@ -239,9 +239,9 @@ class I pattern> + IndexMode im, Format f, InstrItinClass itin, + string opc, string asm, string cstr, + list pattern> : InstARM { let OutOperandList = oops; let InOperandList = iops; @@ -291,9 +291,9 @@ class AXI; class AInoP pattern> + string opc, string asm, list pattern> : InoP; + opc, asm, "", pattern>; // Ctrl flow instructions class ABI opcod, dag oops, dag iops, InstrItinClass itin, @@ -363,7 +363,7 @@ class AXI1 opcod, dag oops, dag iops, Format f, InstrItinClass itin, let Inst{24-21} = opcod; let Inst{27-26} = {0,0}; } -class AI1x2 pattern> : I; @@ -388,7 +388,7 @@ class AI2ldw pattern> : XI { @@ -408,7 +408,7 @@ class AI2ldb pattern> : XI { @@ -550,7 +550,7 @@ class AI2stbpo pattern> : I; @@ -854,7 +854,6 @@ class AI3stdpo pattern> @@ -962,20 +961,25 @@ class TI pattern> : ThumbI; // Two-address instructions -class TIt pattern> - : ThumbI; +class TIt pattern> + : ThumbI; // tBL, tBX 32-bit instructions class TIx2 opcod1, bits<2> opcod2, bit opcod3, - dag oops, dag iops, InstrItinClass itin, string asm, list pattern> - : ThumbI, Encoding { + dag oops, dag iops, InstrItinClass itin, string asm, + list pattern> + : ThumbI, + Encoding { let Inst{31-27} = opcod1; let Inst{15-14} = opcod2; let Inst{12} = opcod3; } // BR_JT instructions -class TJTI pattern> +class TJTI pattern> : ThumbI; // Thumb1 only @@ -1002,7 +1006,7 @@ class T1JTI pattern> - : Thumb1I; // Thumb1 instruction that can either be predicated or set CPSR. @@ -1025,7 +1029,7 @@ class T1sI pattern> : Thumb1sI; + "$lhs = $dst", pattern>; // Thumb1 instruction that can be predicated. class Thumb1pI pattern> : Thumb1pI; + "$lhs = $dst", pattern>; class T1pI1 pattern> @@ -1058,7 +1062,7 @@ class T1pI2 pattern> : Thumb1pI; -class T1pIs pattern> : Thumb1pI; @@ -1147,8 +1151,8 @@ class Thumb2XI pattern> + InstrItinClass itin, + string asm, string cstr, list pattern> : InstARM { let OutOperandList = oops; let InOperandList = iops; @@ -1162,7 +1166,7 @@ class T2I; class T2Ii12 pattern> - : Thumb2I; + : Thumb2I; class T2Ii8 pattern> : Thumb2I; @@ -1197,7 +1201,7 @@ class T2JTI; class T2Ix2 pattern> + string opc, string asm, list pattern> : Thumb2I; // Two-address instructions @@ -1296,7 +1300,7 @@ class ADI5 opcod1, bits<2> opcod2, dag oops, dag iops, InstrItinClass itin, string opc, string asm, list pattern> : VFPI { + VFPLdStFrm, itin, opc, asm, "", pattern> { // TODO: Mark the instructions with the appropriate subtarget info. let Inst{27-24} = opcod1; let Inst{21-20} = opcod2; @@ -1310,7 +1314,7 @@ class ASI5 opcod1, bits<2> opcod2, dag oops, dag iops, InstrItinClass itin, string opc, string asm, list pattern> : VFPI { + VFPLdStFrm, itin, opc, asm, "", pattern> { // TODO: Mark the instructions with the appropriate subtarget info. let Inst{27-24} = opcod1; let Inst{21-20} = opcod2; @@ -1321,7 +1325,7 @@ class ASI5 opcod1, bits<2> opcod2, dag oops, dag iops, class AXDI5 pattern> : VFPXI { + VFPLdStMulFrm, itin, asm, cstr, pattern> { // TODO: Mark the instructions with the appropriate subtarget info. let Inst{27-25} = 0b110; let Inst{11-8} = 0b1011; @@ -1333,7 +1337,7 @@ class AXDI5 pattern> : VFPXI { + VFPLdStMulFrm, itin, asm, cstr, pattern> { // TODO: Mark the instructions with the appropriate subtarget info. let Inst{27-25} = 0b110; let Inst{11-8} = 0b1010; @@ -1354,7 +1358,8 @@ class ADuI opcod1, bits<2> opcod2, bits<4> opcod3, bits<2> opcod4, // Double precision, binary class ADbI opcod1, bits<2> opcod2, bit op6, bit op4, dag oops, - dag iops, InstrItinClass itin, string opc, string asm, list pattern> + dag iops, InstrItinClass itin, string opc, string asm, + list pattern> : VFPAI { let Inst{27-23} = opcod1; let Inst{21-20} = opcod2; @@ -1400,7 +1405,8 @@ class ASbI opcod1, bits<2> opcod2, bit op6, bit op4, dag oops, dag iops, // Single precision binary, if no NEON // Same as ASbI except not available if NEON is enabled class ASbIn opcod1, bits<2> opcod2, bit op6, bit op4, dag oops, - dag iops, InstrItinClass itin, string opc, string asm, list pattern> + dag iops, InstrItinClass itin, string opc, string asm, + list pattern> : ASbI { list Predicates = [HasVFP2,DontUseNEONForFP]; } @@ -1420,8 +1426,8 @@ class AVConv1I opcod1, bits<2> opcod2, bits<4> opcod3, bits<4> opcod4, // VFP conversion between floating-point and fixed-point class AVConv1XI op1, bits<2> op2, bits<4> op3, bits<4> op4, bit op5, - dag oops, dag iops, InstrItinClass itin, string opc, string asm, - list pattern> + dag oops, dag iops, InstrItinClass itin, string opc, string asm, + list pattern> : AVConv1I { // size (fixed-point number): sx == 0 ? 16 : 32 let Inst{7} = op5; // sx @@ -1449,7 +1455,7 @@ class AVConv2I opcod1, bits<4> opcod2, dag oops, dag iops, InstrItinClass itin, string opc, string asm, list pattern> : AVConvXI; -class AVConv3I opcod1, bits<4> opcod2, dag oops, dag iops, +class AVConv3I opcod1, bits<4> opcod2, dag oops, dag iops, InstrItinClass itin, string opc, string asm, list pattern> : AVConvXI; @@ -1482,7 +1488,7 @@ class NeonI pattern> + string opc, string asm, string cstr, list pattern> : InstARM { let OutOperandList = oops; let InOperandList = !con(iops, (ins pred:$p)); @@ -1494,7 +1500,7 @@ class NeonXI pattern> : NeonXI { + pattern> { } class NI4 pattern> + string opc, string asm, string cstr, list pattern> : NeonXI { + cstr, pattern> { let Inst{31-25} = 0b1111001; } @@ -1533,7 +1539,8 @@ class NDataXI op21_19, bits<4> op11_8, bit op7, bit op6, bit op5, bit op4, dag oops, dag iops, InstrItinClass itin, - string opc, string dt, string asm, string cstr, list pattern> + string opc, string dt, string asm, string cstr, + list pattern> : NDataI { let Inst{23} = op23; let Inst{21-19} = op21_19; @@ -1561,9 +1568,9 @@ class N2V op24_23, bits<2> op21_20, bits<2> op19_18, bits<2> op17_16, // Same as N2V except it doesn't have a datatype suffix. class N2VX op24_23, bits<2> op21_20, bits<2> op19_18, bits<2> op17_16, - bits<5> op11_7, bit op6, bit op4, - dag oops, dag iops, InstrItinClass itin, - string opc, string asm, string cstr, list pattern> + bits<5> op11_7, bit op6, bit op4, + dag oops, dag iops, InstrItinClass itin, + string opc, string asm, string cstr, list pattern> : NDataXI { let Inst{24-23} = op24_23; let Inst{21-20} = op21_20; @@ -1601,9 +1608,10 @@ class N3V op21_20, bits<4> op11_8, bit op6, bit op4, } // Same as N3VX except it doesn't have a data type suffix. -class N3VX op21_20, bits<4> op11_8, bit op6, bit op4, - dag oops, dag iops, InstrItinClass itin, - string opc, string asm, string cstr, list pattern> +class N3VX op21_20, bits<4> op11_8, bit op6, + bit op4, + dag oops, dag iops, InstrItinClass itin, + string opc, string asm, string cstr, list pattern> : NDataXI { let Inst{24} = op24; let Inst{23} = op23; @@ -1618,7 +1626,7 @@ class NVLaneOp opcod1, bits<4> opcod2, bits<2> opcod3, dag oops, dag iops, Format f, InstrItinClass itin, string opc, string dt, string asm, list pattern> : InstARM { + "", itin> { let Inst{27-20} = opcod1; let Inst{11-8} = opcod2; let Inst{6-5} = opcod3;