X86 (16, 32): Fix for bug 27653 (swapped arguments in BOUND instruction)

[maya.madhavan]

Summary

The bound instruction does not have reversed operands.

"All intel opcodes have reversed operands except for "bound" and "enter". " - from GAS, tc-i386.c

[craig.topper]

LGTM

[maya.madhavan]

I do not have permission to commit the change. Could someone please commit the change for me?

[craig.topper]

I'll commit this.

llvm/trunk/lib/Target/X86/X86InstrInfo.td

 // Decimal Adjust AL after Subtraction
 let Uses = [AL,EFLAGS], Defs = [AL,EFLAGS], hasSideEffects = 0 in
 def DAS : I<0x2F, RawFrm, (outs), (ins), "das", [], IIC_DAS>,
             Requires<[Not64BitMode]>;
 } // SchedRW
 
 let SchedRW = [WriteSystem] in {
 // Check Array Index Against Bounds
+// Note: "bound" does not have reversed operands in at&t syntax.
 def BOUNDS16rm : I<0x62, MRMSrcMem, (outs GR16:$dst), (ins i16mem:$src),
-                   "bound\t{$src, $dst|$dst, $src}", [], IIC_BOUND>, OpSize16,
+                   "bound\t$dst, $src", [], IIC_BOUND>, OpSize16,
                    Requires<[Not64BitMode]>;
 def BOUNDS32rm : I<0x62, MRMSrcMem, (outs GR32:$dst), (ins i32mem:$src),
-                   "bound\t{$src, $dst|$dst, $src}", [], IIC_BOUND>, OpSize32,
+                   "bound\t$dst, $src", [], IIC_BOUND>, OpSize32,
                    Requires<[Not64BitMode]>;
 
 // Adjust RPL Field of Segment Selector
 def ARPL16rr : I<0x63, MRMDestReg, (outs GR16:$dst), (ins GR16:$src),
                  "arpl\t{$src, $dst|$dst, $src}", [], IIC_ARPL_REG>,
                  Requires<[Not64BitMode]>;
 let mayStore = 1 in
 def ARPL16mr : I<0x63, MRMDestMem, (outs), (ins i16mem:$dst, GR16:$src),

llvm/trunk/test/CodeGen/X86/schedule-x86_32.ll

 ; GENERIC-NEXT:    pushl %esi
 ; GENERIC-NEXT:    .cfi_def_cfa_offset 8
 ; GENERIC-NEXT:    .cfi_offset %esi, -8
 ; GENERIC-NEXT:    movzwl {{[0-9]+}}(%esp), %eax
 ; GENERIC-NEXT:    movl {{[0-9]+}}(%esp), %ecx
 ; GENERIC-NEXT:    movl {{[0-9]+}}(%esp), %edx
 ; GENERIC-NEXT:    movl {{[0-9]+}}(%esp), %esi
 ; GENERIC-NEXT:    #APP
-; GENERIC-NEXT:    bound (%esi), %ax
-; GENERIC-NEXT:    bound (%edx), %ecx
+; GENERIC-NEXT:    bound %ax, (%esi)
+; GENERIC-NEXT:    bound %ecx, (%edx)
 ; GENERIC-NEXT:    #NO_APP
 ; GENERIC-NEXT:    popl %esi
 ; GENERIC-NEXT:    retl
 ;
 ; ATOM-LABEL: test_bound:
 ; ATOM:       # %bb.0:
 ; ATOM-NEXT:    pushl %esi # sched: [1:1.00]
 ; ATOM-NEXT:    .cfi_def_cfa_offset 8
 ; ATOM-NEXT:    .cfi_offset %esi, -8
 ; ATOM-NEXT:    movzwl {{[0-9]+}}(%esp), %eax # sched: [1:1.00]
 ; ATOM-NEXT:    movl {{[0-9]+}}(%esp), %ecx # sched: [1:1.00]
 ; ATOM-NEXT:    movl {{[0-9]+}}(%esp), %edx # sched: [1:1.00]
 ; ATOM-NEXT:    movl {{[0-9]+}}(%esp), %esi # sched: [1:1.00]
 ; ATOM-NEXT:    #APP
-; ATOM-NEXT:    bound (%esi), %ax # sched: [11:5.50]
-; ATOM-NEXT:    bound (%edx), %ecx # sched: [11:5.50]
+; ATOM-NEXT:    bound %ax, (%esi) # sched: [11:5.50]
+; ATOM-NEXT:    bound %ecx, (%edx) # sched: [11:5.50]
 ; ATOM-NEXT:    #NO_APP
 ; ATOM-NEXT:    popl %esi # sched: [1:1.00]
 ; ATOM-NEXT:    retl # sched: [79:39.50]
 ;
 ; SLM-LABEL: test_bound:
 ; SLM:       # %bb.0:
 ; SLM-NEXT:    pushl %esi # sched: [1:1.00]
 ; SLM-NEXT:    .cfi_def_cfa_offset 8
 ; SLM-NEXT:    .cfi_offset %esi, -8
 ; SLM-NEXT:    movzwl {{[0-9]+}}(%esp), %eax # sched: [4:1.00]
 ; SLM-NEXT:    movl {{[0-9]+}}(%esp), %ecx # sched: [3:1.00]
 ; SLM-NEXT:    movl {{[0-9]+}}(%esp), %edx # sched: [3:1.00]
 ; SLM-NEXT:    movl {{[0-9]+}}(%esp), %esi # sched: [3:1.00]
 ; SLM-NEXT:    #APP
-; SLM-NEXT:    bound (%esi), %ax # sched: [100:1.00]
-; SLM-NEXT:    bound (%edx), %ecx # sched: [100:1.00]
+; SLM-NEXT:    bound %ax, (%esi) # sched: [100:1.00]
+; SLM-NEXT:    bound %ecx, (%edx) # sched: [100:1.00]
 ; SLM-NEXT:    #NO_APP
 ; SLM-NEXT:    popl %esi # sched: [3:1.00]
 ; SLM-NEXT:    retl # sched: [4:1.00]
 ;
 ; SANDY-LABEL: test_bound:
 ; SANDY:       # %bb.0:
 ; SANDY-NEXT:    pushl %esi # sched: [5:1.00]
 ; SANDY-NEXT:    .cfi_def_cfa_offset 8
 ; SANDY-NEXT:    .cfi_offset %esi, -8
 ; SANDY-NEXT:    movzwl {{[0-9]+}}(%esp), %eax # sched: [5:0.50]
 ; SANDY-NEXT:    movl {{[0-9]+}}(%esp), %ecx # sched: [5:0.50]
 ; SANDY-NEXT:    movl {{[0-9]+}}(%esp), %edx # sched: [5:0.50]
 ; SANDY-NEXT:    movl {{[0-9]+}}(%esp), %esi # sched: [5:0.50]
 ; SANDY-NEXT:    #APP
-; SANDY-NEXT:    bound (%esi), %ax # sched: [100:0.33]
-; SANDY-NEXT:    bound (%edx), %ecx # sched: [100:0.33]
+; SANDY-NEXT:    bound %ax, (%esi) # sched: [100:0.33]
+; SANDY-NEXT:    bound %ecx, (%edx) # sched: [100:0.33]
 ; SANDY-NEXT:    #NO_APP
 ; SANDY-NEXT:    popl %esi # sched: [6:0.50]
 ; SANDY-NEXT:    retl # sched: [5:1.00]
 ;
 ; HASWELL-LABEL: test_bound:
 ; HASWELL:       # %bb.0:
 ; HASWELL-NEXT:    pushl %esi # sched: [2:1.00]
 ; HASWELL-NEXT:    .cfi_def_cfa_offset 8
 ; HASWELL-NEXT:    .cfi_offset %esi, -8
 ; HASWELL-NEXT:    movzwl {{[0-9]+}}(%esp), %eax # sched: [5:0.50]
 ; HASWELL-NEXT:    movl {{[0-9]+}}(%esp), %ecx # sched: [5:0.50]
 ; HASWELL-NEXT:    movl {{[0-9]+}}(%esp), %edx # sched: [5:0.50]
 ; HASWELL-NEXT:    movl {{[0-9]+}}(%esp), %esi # sched: [5:0.50]
 ; HASWELL-NEXT:    #APP
-; HASWELL-NEXT:    bound (%esi), %ax # sched: [1:?]
-; HASWELL-NEXT:    bound (%edx), %ecx # sched: [1:?]
+; HASWELL-NEXT:    bound %ax, (%esi) # sched: [1:?]
+; HASWELL-NEXT:    bound %ecx, (%edx) # sched: [1:?]
 ; HASWELL-NEXT:    #NO_APP
 ; HASWELL-NEXT:    popl %esi # sched: [6:0.50]
 ; HASWELL-NEXT:    retl # sched: [7:1.00]
 ;
 ; BROADWELL-LABEL: test_bound:
 ; BROADWELL:       # %bb.0:
 ; BROADWELL-NEXT:    pushl %esi # sched: [2:1.00]
 ; BROADWELL-NEXT:    .cfi_def_cfa_offset 8
 ; BROADWELL-NEXT:    .cfi_offset %esi, -8
 ; BROADWELL-NEXT:    movzwl {{[0-9]+}}(%esp), %eax # sched: [5:0.50]
 ; BROADWELL-NEXT:    movl {{[0-9]+}}(%esp), %ecx # sched: [5:0.50]
 ; BROADWELL-NEXT:    movl {{[0-9]+}}(%esp), %edx # sched: [5:0.50]
 ; BROADWELL-NEXT:    movl {{[0-9]+}}(%esp), %esi # sched: [5:0.50]
 ; BROADWELL-NEXT:    #APP
-; BROADWELL-NEXT:    bound (%esi), %ax # sched: [100:0.25]
-; BROADWELL-NEXT:    bound (%edx), %ecx # sched: [100:0.25]
+; BROADWELL-NEXT:    bound %ax, (%esi) # sched: [100:0.25]
+; BROADWELL-NEXT:    bound %ecx, (%edx) # sched: [100:0.25]
 ; BROADWELL-NEXT:    #NO_APP
 ; BROADWELL-NEXT:    popl %esi # sched: [6:0.50]
 ; BROADWELL-NEXT:    retl # sched: [6:0.50]
 ;
 ; SKYLAKE-LABEL: test_bound:
 ; SKYLAKE:       # %bb.0:
 ; SKYLAKE-NEXT:    pushl %esi # sched: [2:1.00]
 ; SKYLAKE-NEXT:    .cfi_def_cfa_offset 8
 ; SKYLAKE-NEXT:    .cfi_offset %esi, -8
 ; SKYLAKE-NEXT:    movzwl {{[0-9]+}}(%esp), %eax # sched: [5:0.50]
 ; SKYLAKE-NEXT:    movl {{[0-9]+}}(%esp), %ecx # sched: [5:0.50]
 ; SKYLAKE-NEXT:    movl {{[0-9]+}}(%esp), %edx # sched: [5:0.50]
 ; SKYLAKE-NEXT:    movl {{[0-9]+}}(%esp), %esi # sched: [5:0.50]
 ; SKYLAKE-NEXT:    #APP
-; SKYLAKE-NEXT:    bound (%esi), %ax # sched: [100:0.25]
-; SKYLAKE-NEXT:    bound (%edx), %ecx # sched: [100:0.25]
+; SKYLAKE-NEXT:    bound %ax, (%esi) # sched: [100:0.25]
+; SKYLAKE-NEXT:    bound %ecx, (%edx) # sched: [100:0.25]
 ; SKYLAKE-NEXT:    #NO_APP
 ; SKYLAKE-NEXT:    popl %esi # sched: [6:0.50]
 ; SKYLAKE-NEXT:    retl # sched: [6:0.50]
 ;
 ; SKX-LABEL: test_bound:
 ; SKX:       # %bb.0:
 ; SKX-NEXT:    pushl %esi # sched: [2:1.00]
 ; SKX-NEXT:    .cfi_def_cfa_offset 8
 ; SKX-NEXT:    .cfi_offset %esi, -8
 ; SKX-NEXT:    movzwl {{[0-9]+}}(%esp), %eax # sched: [5:0.50]
 ; SKX-NEXT:    movl {{[0-9]+}}(%esp), %ecx # sched: [5:0.50]
 ; SKX-NEXT:    movl {{[0-9]+}}(%esp), %edx # sched: [5:0.50]
 ; SKX-NEXT:    movl {{[0-9]+}}(%esp), %esi # sched: [5:0.50]
 ; SKX-NEXT:    #APP
-; SKX-NEXT:    bound (%esi), %ax # sched: [100:0.25]
-; SKX-NEXT:    bound (%edx), %ecx # sched: [100:0.25]
+; SKX-NEXT:    bound %ax, (%esi) # sched: [100:0.25]
+; SKX-NEXT:    bound %ecx, (%edx) # sched: [100:0.25]
 ; SKX-NEXT:    #NO_APP
 ; SKX-NEXT:    popl %esi # sched: [6:0.50]
 ; SKX-NEXT:    retl # sched: [6:0.50]
 ;
 ; BTVER2-LABEL: test_bound:
 ; BTVER2:       # %bb.0:
 ; BTVER2-NEXT:    pushl %esi # sched: [1:1.00]
 ; BTVER2-NEXT:    .cfi_def_cfa_offset 8
 ; BTVER2-NEXT:    .cfi_offset %esi, -8
 ; BTVER2-NEXT:    movzwl {{[0-9]+}}(%esp), %eax # sched: [4:1.00]
 ; BTVER2-NEXT:    movl {{[0-9]+}}(%esp), %ecx # sched: [5:1.00]
 ; BTVER2-NEXT:    movl {{[0-9]+}}(%esp), %edx # sched: [5:1.00]
 ; BTVER2-NEXT:    movl {{[0-9]+}}(%esp), %esi # sched: [5:1.00]
 ; BTVER2-NEXT:    #APP
-; BTVER2-NEXT:    bound (%esi), %ax # sched: [100:0.17]
-; BTVER2-NEXT:    bound (%edx), %ecx # sched: [100:0.17]
+; BTVER2-NEXT:    bound %ax, (%esi) # sched: [100:0.17]
+; BTVER2-NEXT:    bound %ecx, (%edx) # sched: [100:0.17]
 ; BTVER2-NEXT:    #NO_APP
 ; BTVER2-NEXT:    popl %esi # sched: [5:1.00]
 ; BTVER2-NEXT:    retl # sched: [4:1.00]
 ;
 ; ZNVER1-LABEL: test_bound:
 ; ZNVER1:       # %bb.0:
 ; ZNVER1-NEXT:    pushl %esi # sched: [1:0.50]
 ; ZNVER1-NEXT:    .cfi_def_cfa_offset 8
 ; ZNVER1-NEXT:    .cfi_offset %esi, -8
 ; ZNVER1-NEXT:    movl {{[0-9]+}}(%esp), %ecx # sched: [8:0.50]
 ; ZNVER1-NEXT:    movl {{[0-9]+}}(%esp), %edx # sched: [8:0.50]
 ; ZNVER1-NEXT:    movl {{[0-9]+}}(%esp), %esi # sched: [8:0.50]
 ; ZNVER1-NEXT:    movzwl {{[0-9]+}}(%esp), %eax # sched: [8:0.50]
 ; ZNVER1-NEXT:    #APP
-; ZNVER1-NEXT:    bound (%esi), %ax # sched: [100:?]
-; ZNVER1-NEXT:    bound (%edx), %ecx # sched: [100:?]
+; ZNVER1-NEXT:    bound %ax, (%esi) # sched: [100:?]
+; ZNVER1-NEXT:    bound %ecx, (%edx) # sched: [100:?]
 ; ZNVER1-NEXT:    #NO_APP
 ; ZNVER1-NEXT:    popl %esi # sched: [8:0.50]
 ; ZNVER1-NEXT:    retl # sched: [1:0.50]
-  call void asm sideeffect "bound $1, $0 \0A\09 bound $3, $2", "r,*m,r,*m"(i16 %a0, i16 *%a1, i32 %a2, i32 *%a3)
+  call void asm sideeffect "bound $0, $1 \0A\09 bound $2, $3", "r,*m,r,*m"(i16 %a0, i16 *%a1, i32 %a2, i32 *%a3)
   ret void
 }
 
 define i8 @test_daa(i8 %a0) optsize {
 ; GENERIC-LABEL: test_daa:
 ; GENERIC:       # %bb.0:
 ; GENERIC-NEXT:    movb {{[0-9]+}}(%esp), %al
 ; GENERIC-NEXT:    #APP

llvm/trunk/test/MC/Disassembler/X86/x86-16.txt

 0xca 0xce 0x7a
 
 # CHECK: retl $31438
 0x66 0xc2 0xce 0x7a
 
 # CHECK: lretl $31438
 0x66 0xca 0xce 0x7a
 
-# CHECK: bound 2(%eax), %bx
+# CHECK: bound %bx, 2(%eax)
 0x67 0x62 0x58 0x02
 
-# CHECK: bound 4(%ebx), %ecx
+# CHECK: bound %ecx, 4(%ebx)
 0x67 0x66 0x62 0x4b 0x04
 
 # CHECK: arpl %bx, %bx
 0x63 0xdb
 
 # CHECK: arpl %bx, 6(%ecx)
 0x67 0x63 0x59 0x06
 

llvm/trunk/test/MC/X86/I186-32.s

 // RUN: llvm-mc -triple i386-unknown-unknown --show-encoding %s | FileCheck %s
 
-// CHECK: bound 3809469200(%edx,%eax,4), %eax 
+// CHECK: bound %eax, 3809469200(%edx,%eax,4)
 // CHECK: encoding: [0x62,0x84,0x82,0x10,0xe3,0x0f,0xe3]        
-bound 3809469200(%edx,%eax,4), %eax 
+bound %eax, 3809469200(%edx,%eax,4)
 
-// CHECK: bound 485498096, %eax 
+// CHECK: bound %eax, 485498096
 // CHECK: encoding: [0x62,0x05,0xf0,0x1c,0xf0,0x1c]        
-bound 485498096, %eax 
+bound %eax, 485498096
 
-// CHECK: bound 485498096(%edx,%eax,4), %eax 
+// CHECK: bound %eax, 485498096(%edx,%eax,4)
 // CHECK: encoding: [0x62,0x84,0x82,0xf0,0x1c,0xf0,0x1c]        
-bound 485498096(%edx,%eax,4), %eax 
+bound %eax, 485498096(%edx,%eax,4)
 
-// CHECK: bound 485498096(%edx), %eax 
+// CHECK: bound %eax, 485498096(%edx)
 // CHECK: encoding: [0x62,0x82,0xf0,0x1c,0xf0,0x1c]        
-bound 485498096(%edx), %eax 
+bound %eax, 485498096(%edx)
 
-// CHECK: bound 64(%edx,%eax), %eax 
+// CHECK: bound %eax, 64(%edx,%eax)
 // CHECK: encoding: [0x62,0x44,0x02,0x40]        
-bound 64(%edx,%eax), %eax 
+bound %eax, 64(%edx,%eax)
 
-// CHECK: bound (%edx), %eax 
+// CHECK: bound %eax, (%edx)
 // CHECK: encoding: [0x62,0x02]        
-bound (%edx), %eax 
+bound %eax, (%edx)
 
 // CHECK: enter $0, $0 
 // CHECK: encoding: [0xc8,0x00,0x00,0x00]        
 enter $0, $0 
 
 // CHECK: imull $0, %eax, %eax 
 // CHECK: encoding: [0x6b,0xc0,0x00]       
 imull $0, %eax, %eax 

llvm/trunk/test/MC/X86/x86-16.s

 // CHECK: retl  $31438
 // CHECK:  encoding: [0x66,0xc2,0xce,0x7a]
           retl  $0x7ace
 
 // CHECK: lretl $31438
 // CHECK:  encoding: [0x66,0xca,0xce,0x7a]
           lretl $0x7ace
 
-// CHECK: bound 2(%eax), %bx
+// CHECK: bound %bx, 2(%eax)
 // CHECK:  encoding: [0x67,0x62,0x58,0x02]
-          bound 2(%eax),%bx
+          bound  %bx,2(%eax)
 
-// CHECK: bound 4(%ebx), %ecx
+// CHECK: bound %ecx, 4(%ebx)
 // CHECK:  encoding: [0x67,0x66,0x62,0x4b,0x04]
-          bound 4(%ebx),%ecx
+          bound  %ecx,4(%ebx)
 
 // CHECK: arpl  %bx, %bx
 // CHECK:  encoding: [0x63,0xdb]
           arpl  %bx,%bx
 
 // CHECK: arpl  %bx, 6(%ecx)
 // CHECK:  encoding: [0x67,0x63,0x59,0x06]
           arpl  %bx,6(%ecx)

llvm/trunk/test/MC/X86/x86-32.s

 // CHECK: retw  $31438
 // CHECK:  encoding: [0x66,0xc2,0xce,0x7a]
           retw  $0x7ace
 
 // CHECK: lretw $31438
 // CHECK:  encoding: [0x66,0xca,0xce,0x7a]
           lretw $0x7ace
 
-// CHECK: bound 2(%eax), %bx
+// CHECK: bound %bx, 2(%eax)
 // CHECK:  encoding: [0x66,0x62,0x58,0x02]
-          bound 2(%eax),%bx
+          bound  %bx,2(%eax)
 
-// CHECK: bound 4(%ebx), %ecx
+// CHECK: bound %ecx, 4(%ebx)
 // CHECK:  encoding: [0x62,0x4b,0x04]
-          bound 4(%ebx),%ecx
+          bound  %ecx,4(%ebx)
 
 // CHECK: arpl  %bx, %bx
 // CHECK:  encoding: [0x63,0xdb]
           arpl  %bx,%bx
 
 // CHECK: arpl  %bx, 6(%ecx)
 // CHECK:  encoding: [0x63,0x59,0x06]
           arpl  %bx,6(%ecx)