6 changes: 3 additions & 3 deletions llvm/test/MC/X86/I186-32.s
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ outsb %es:(%esi), %dx
outsl %es:(%esi), %dx

// CHECK: outsw %es:(%esi), %dx
// CHECK: encoding: [0x66,0x26,0x6f]
// CHECK: encoding: [0x26,0x66,0x6f]
outsw %es:(%esi), %dx

// CHECK: popal
Expand Down Expand Up @@ -269,7 +269,7 @@ repne outsb %es:(%esi), %dx
repne outsl %es:(%esi), %dx

// CHECK: repne outsw %es:(%esi), %dx
// CHECK: encoding: [0xf2,0x66,0x26,0x6f]
// CHECK: encoding: [0xf2,0x26,0x66,0x6f]
repne outsw %es:(%esi), %dx

// CHECK: rep outsb %es:(%esi), %dx
Expand All @@ -281,7 +281,7 @@ rep outsb %es:(%esi), %dx
rep outsl %es:(%esi), %dx

// CHECK: rep outsw %es:(%esi), %dx
// CHECK: encoding: [0xf3,0x66,0x26,0x6f]
// CHECK: encoding: [0xf3,0x26,0x66,0x6f]
rep outsw %es:(%esi), %dx

// CHECK: rolb $0, -485498096(%edx,%eax,4)
Expand Down
6 changes: 3 additions & 3 deletions llvm/test/MC/X86/I186-64.s
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ outsb %gs:(%rsi), %dx
outsl %gs:(%rsi), %dx

// CHECK: outsw %gs:(%rsi), %dx
// CHECK: encoding: [0x66,0x65,0x6f]
// CHECK: encoding: [0x65,0x66,0x6f]
outsw %gs:(%rsi), %dx

// CHECK: pushq $0
Expand Down Expand Up @@ -289,7 +289,7 @@ repne outsb %gs:(%rsi), %dx
repne outsl %gs:(%rsi), %dx

// CHECK: repne outsw %gs:(%rsi), %dx
// CHECK: encoding: [0xf2,0x66,0x65,0x6f]
// CHECK: encoding: [0xf2,0x65,0x66,0x6f]
repne outsw %gs:(%rsi), %dx

// CHECK: rep outsb %gs:(%rsi), %dx
Expand All @@ -301,7 +301,7 @@ rep outsb %gs:(%rsi), %dx
rep outsl %gs:(%rsi), %dx

// CHECK: rep outsw %gs:(%rsi), %dx
// CHECK: encoding: [0xf3,0x66,0x65,0x6f]
// CHECK: encoding: [0xf3,0x65,0x66,0x6f]
rep outsw %gs:(%rsi), %dx

// CHECK: rolb $0, 485498096
Expand Down
18 changes: 9 additions & 9 deletions llvm/test/MC/X86/I386-32.s
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ cmpsb %es:(%edi), %es:(%esi)
cmpsl %es:(%edi), %es:(%esi)

// CHECK: cmpsw %es:(%edi), %es:(%esi)
// CHECK: encoding: [0x66,0x26,0xa7]
// CHECK: encoding: [0x26,0x66,0xa7]
cmpsw %es:(%edi), %es:(%esi)

// CHECK: insb %dx, %es:(%edi)
Expand Down Expand Up @@ -193,7 +193,7 @@ movsb %es:(%esi), %es:(%edi)
movsl %es:(%esi), %es:(%edi)

// CHECK: movsw %es:(%esi), %es:(%edi)
// CHECK: encoding: [0x66,0x26,0xa5]
// CHECK: encoding: [0x26,0x66,0xa5]
movsw %es:(%esi), %es:(%edi)

// CHECK: outsb %es:(%esi), %dx
Expand All @@ -205,7 +205,7 @@ outsb %es:(%esi), %dx
outsl %es:(%esi), %dx

// CHECK: outsw %es:(%esi), %dx
// CHECK: encoding: [0x66,0x26,0x6f]
// CHECK: encoding: [0x26,0x66,0x6f]
outsw %es:(%esi), %dx

// CHECK: popal
Expand Down Expand Up @@ -249,7 +249,7 @@ rep cmpsb %es:(%edi), %es:(%esi)
rep cmpsl %es:(%edi), %es:(%esi)

// CHECK: rep cmpsw %es:(%edi), %es:(%esi)
// CHECK: encoding: [0xf3,0x66,0x26,0xa7]
// CHECK: encoding: [0xf3,0x26,0x66,0xa7]
rep cmpsw %es:(%edi), %es:(%esi)

// CHECK: rep insb %dx, %es:(%edi)
Expand Down Expand Up @@ -277,7 +277,7 @@ rep movsb %es:(%esi), %es:(%edi)
rep movsl %es:(%esi), %es:(%edi)

// CHECK: rep movsw %es:(%esi), %es:(%edi)
// CHECK: encoding: [0xf3,0x66,0x26,0xa5]
// CHECK: encoding: [0xf3,0x26,0x66,0xa5]
rep movsw %es:(%esi), %es:(%edi)

// CHECK: repne cmpsb %es:(%edi), %es:(%esi)
Expand All @@ -289,7 +289,7 @@ repne cmpsb %es:(%edi), %es:(%esi)
repne cmpsl %es:(%edi), %es:(%esi)

// CHECK: repne cmpsw %es:(%edi), %es:(%esi)
// CHECK: encoding: [0xf2,0x66,0x26,0xa7]
// CHECK: encoding: [0xf2,0x26,0x66,0xa7]
repne cmpsw %es:(%edi), %es:(%esi)

// CHECK: repne insb %dx, %es:(%edi)
Expand Down Expand Up @@ -317,7 +317,7 @@ repne movsb %es:(%esi), %es:(%edi)
repne movsl %es:(%esi), %es:(%edi)

// CHECK: repne movsw %es:(%esi), %es:(%edi)
// CHECK: encoding: [0xf2,0x66,0x26,0xa5]
// CHECK: encoding: [0xf2,0x26,0x66,0xa5]
repne movsw %es:(%esi), %es:(%edi)

// CHECK: repne outsb %es:(%esi), %dx
Expand All @@ -329,7 +329,7 @@ repne outsb %es:(%esi), %dx
repne outsl %es:(%esi), %dx

// CHECK: repne outsw %es:(%esi), %dx
// CHECK: encoding: [0xf2,0x66,0x26,0x6f]
// CHECK: encoding: [0xf2,0x26,0x66,0x6f]
repne outsw %es:(%esi), %dx

// CHECK: repne scasl %es:(%edi), %eax
Expand All @@ -349,7 +349,7 @@ rep outsb %es:(%esi), %dx
rep outsl %es:(%esi), %dx

// CHECK: rep outsw %es:(%esi), %dx
// CHECK: encoding: [0xf3,0x66,0x26,0x6f]
// CHECK: encoding: [0xf3,0x26,0x66,0x6f]
rep outsw %es:(%esi), %dx

// CHECK: rep scasl %es:(%edi), %eax
Expand Down
30 changes: 15 additions & 15 deletions llvm/test/MC/X86/I386-64.s
Original file line number Diff line number Diff line change
Expand Up @@ -226,11 +226,11 @@ cmpsb %es:(%rdi), %gs:(%rsi)
cmpsl %es:(%rdi), %gs:(%rsi)

// CHECK: cmpsq %es:(%rdi), %gs:(%rsi)
// CHECK: encoding: [0x48,0x65,0xa7]
// CHECK: encoding: [0x65,0x48,0xa7]
cmpsq %es:(%rdi), %gs:(%rsi)

// CHECK: cmpsw %es:(%rdi), %gs:(%rsi)
// CHECK: encoding: [0x66,0x65,0xa7]
// CHECK: encoding: [0x65,0x66,0xa7]
cmpsw %es:(%rdi), %gs:(%rsi)

// CHECK: insb %dx, %es:(%rdi)
Expand Down Expand Up @@ -306,11 +306,11 @@ movsbl (%rdx), %r13d
movsl %gs:(%rsi), %es:(%rdi)

// CHECK: movsq %gs:(%rsi), %es:(%rdi)
// CHECK: encoding: [0x48,0x65,0xa5]
// CHECK: encoding: [0x65,0x48,0xa5]
movsq %gs:(%rsi), %es:(%rdi)

// CHECK: movsw %gs:(%rsi), %es:(%rdi)
// CHECK: encoding: [0x66,0x65,0xa5]
// CHECK: encoding: [0x65,0x66,0xa5]
movsw %gs:(%rsi), %es:(%rdi)

// CHECK: movswl 485498096, %r13d
Expand Down Expand Up @@ -418,7 +418,7 @@ outsb %gs:(%rsi), %dx
outsl %gs:(%rsi), %dx

// CHECK: outsw %gs:(%rsi), %dx
// CHECK: encoding: [0x66,0x65,0x6f]
// CHECK: encoding: [0x65,0x66,0x6f]
outsw %gs:(%rsi), %dx

// CHECK: rep cmpsb %es:(%rdi), %gs:(%rsi)
Expand All @@ -430,11 +430,11 @@ rep cmpsb %es:(%rdi), %gs:(%rsi)
rep cmpsl %es:(%rdi), %gs:(%rsi)

// CHECK: rep cmpsq %es:(%rdi), %gs:(%rsi)
// CHECK: encoding: [0xf3,0x48,0x65,0xa7]
// CHECK: encoding: [0xf3,0x65,0x48,0xa7]
rep cmpsq %es:(%rdi), %gs:(%rsi)

// CHECK: rep cmpsw %es:(%rdi), %gs:(%rsi)
// CHECK: encoding: [0xf3,0x66,0x65,0xa7]
// CHECK: encoding: [0xf3,0x65,0x66,0xa7]
rep cmpsw %es:(%rdi), %gs:(%rsi)

// CHECK: rep insb %dx, %es:(%rdi)
Expand Down Expand Up @@ -462,11 +462,11 @@ rep movsb %gs:(%rsi), %es:(%rdi)
rep movsl %gs:(%rsi), %es:(%rdi)

// CHECK: rep movsq %gs:(%rsi), %es:(%rdi)
// CHECK: encoding: [0xf3,0x48,0x65,0xa5]
// CHECK: encoding: [0xf3,0x65,0x48,0xa5]
rep movsq %gs:(%rsi), %es:(%rdi)

// CHECK: rep movsw %gs:(%rsi), %es:(%rdi)
// CHECK: encoding: [0xf3,0x66,0x65,0xa5]
// CHECK: encoding: [0xf3,0x65,0x66,0xa5]
rep movsw %gs:(%rsi), %es:(%rdi)

// CHECK: repne cmpsb %es:(%rdi), %gs:(%rsi)
Expand All @@ -478,11 +478,11 @@ repne cmpsb %es:(%rdi), %gs:(%rsi)
repne cmpsl %es:(%rdi), %gs:(%rsi)

// CHECK: repne cmpsq %es:(%rdi), %gs:(%rsi)
// CHECK: encoding: [0xf2,0x48,0x65,0xa7]
// CHECK: encoding: [0xf2,0x65,0x48,0xa7]
repne cmpsq %es:(%rdi), %gs:(%rsi)

// CHECK: repne cmpsw %es:(%rdi), %gs:(%rsi)
// CHECK: encoding: [0xf2,0x66,0x65,0xa7]
// CHECK: encoding: [0xf2,0x65,0x66,0xa7]
repne cmpsw %es:(%rdi), %gs:(%rsi)

// CHECK: repne insb %dx, %es:(%rdi)
Expand Down Expand Up @@ -510,11 +510,11 @@ repne movsb %gs:(%rsi), %es:(%rdi)
repne movsl %gs:(%rsi), %es:(%rdi)

// CHECK: repne movsq %gs:(%rsi), %es:(%rdi)
// CHECK: encoding: [0xf2,0x48,0x65,0xa5]
// CHECK: encoding: [0xf2,0x65,0x48,0xa5]
repne movsq %gs:(%rsi), %es:(%rdi)

// CHECK: repne movsw %gs:(%rsi), %es:(%rdi)
// CHECK: encoding: [0xf2,0x66,0x65,0xa5]
// CHECK: encoding: [0xf2,0x65,0x66,0xa5]
repne movsw %gs:(%rsi), %es:(%rdi)

// CHECK: repne outsb %gs:(%rsi), %dx
Expand All @@ -526,7 +526,7 @@ repne outsb %gs:(%rsi), %dx
repne outsl %gs:(%rsi), %dx

// CHECK: repne outsw %gs:(%rsi), %dx
// CHECK: encoding: [0xf2,0x66,0x65,0x6f]
// CHECK: encoding: [0xf2,0x65,0x66,0x6f]
repne outsw %gs:(%rsi), %dx

// CHECK: repne scasl %es:(%rdi), %eax
Expand All @@ -546,7 +546,7 @@ rep outsb %gs:(%rsi), %dx
rep outsl %gs:(%rsi), %dx

// CHECK: rep outsw %gs:(%rsi), %dx
// CHECK: encoding: [0xf3,0x66,0x65,0x6f]
// CHECK: encoding: [0xf3,0x65,0x66,0x6f]
rep outsw %gs:(%rsi), %dx

// CHECK: rep scasl %es:(%rdi), %eax
Expand Down
18 changes: 9 additions & 9 deletions llvm/test/MC/X86/I86-32.s
Original file line number Diff line number Diff line change
Expand Up @@ -565,7 +565,7 @@ cmpsb %es:(%edi), %es:(%esi)
cmpsl %es:(%edi), %es:(%esi)

// CHECK: cmpsw %es:(%edi), %es:(%esi)
// CHECK: encoding: [0x66,0x26,0xa7]
// CHECK: encoding: [0x26,0x66,0xa7]
cmpsw %es:(%edi), %es:(%esi)

// CHECK: cmpw $0, -485498096(%edx,%eax,4)
Expand Down Expand Up @@ -1197,7 +1197,7 @@ lock xchgl %eax, (%edx)
lodsb %es:(%esi), %al

// CHECK: lodsw %es:(%esi), %ax
// CHECK: encoding: [0x66,0x26,0xad]
// CHECK: encoding: [0x26,0x66,0xad]
lodsw %es:(%esi), %ax

// CHECK: loop 64
Expand Down Expand Up @@ -1345,7 +1345,7 @@ movsb %es:(%esi), %es:(%edi)
movsl %es:(%esi), %es:(%edi)

// CHECK: movsw %es:(%esi), %es:(%edi)
// CHECK: encoding: [0x66,0x26,0xa5]
// CHECK: encoding: [0x26,0x66,0xa5]
movsw %es:(%esi), %es:(%edi)

// CHECK: movw $0, -485498096(%edx,%eax,4)
Expand Down Expand Up @@ -2221,15 +2221,15 @@ rep cmpsb %es:(%edi), %es:(%esi)
rep cmpsl %es:(%edi), %es:(%esi)

// CHECK: rep cmpsw %es:(%edi), %es:(%esi)
// CHECK: encoding: [0xf3,0x66,0x26,0xa7]
// CHECK: encoding: [0xf3,0x26,0x66,0xa7]
rep cmpsw %es:(%edi), %es:(%esi)

// CHECK: rep lodsb %es:(%esi), %al
// CHECK: encoding: [0xf3,0x26,0xac]
rep lodsb %es:(%esi), %al

// CHECK: rep lodsw %es:(%esi), %ax
// CHECK: encoding: [0xf3,0x66,0x26,0xad]
// CHECK: encoding: [0xf3,0x26,0x66,0xad]
rep lodsw %es:(%esi), %ax

// CHECK: rep movsb %es:(%esi), %es:(%edi)
Expand All @@ -2241,7 +2241,7 @@ rep movsb %es:(%esi), %es:(%edi)
rep movsl %es:(%esi), %es:(%edi)

// CHECK: rep movsw %es:(%esi), %es:(%edi)
// CHECK: encoding: [0xf3,0x66,0x26,0xa5]
// CHECK: encoding: [0xf3,0x26,0x66,0xa5]
rep movsw %es:(%esi), %es:(%edi)

// CHECK: repne cmpsb %es:(%edi), %es:(%esi)
Expand All @@ -2253,15 +2253,15 @@ repne cmpsb %es:(%edi), %es:(%esi)
repne cmpsl %es:(%edi), %es:(%esi)

// CHECK: repne cmpsw %es:(%edi), %es:(%esi)
// CHECK: encoding: [0xf2,0x66,0x26,0xa7]
// CHECK: encoding: [0xf2,0x26,0x66,0xa7]
repne cmpsw %es:(%edi), %es:(%esi)

// CHECK: repne lodsb %es:(%esi), %al
// CHECK: encoding: [0xf2,0x26,0xac]
repne lodsb %es:(%esi), %al

// CHECK: repne lodsw %es:(%esi), %ax
// CHECK: encoding: [0xf2,0x66,0x26,0xad]
// CHECK: encoding: [0xf2,0x26,0x66,0xad]
repne lodsw %es:(%esi), %ax

// CHECK: repne movsb %es:(%esi), %es:(%edi)
Expand All @@ -2273,7 +2273,7 @@ repne movsb %es:(%esi), %es:(%edi)
repne movsl %es:(%esi), %es:(%edi)

// CHECK: repne movsw %es:(%esi), %es:(%edi)
// CHECK: encoding: [0xf2,0x66,0x26,0xa5]
// CHECK: encoding: [0xf2,0x26,0x66,0xa5]
repne movsw %es:(%esi), %es:(%edi)

// CHECK: repne scasb %es:(%edi), %al
Expand Down
30 changes: 15 additions & 15 deletions llvm/test/MC/X86/I86-64.s
Original file line number Diff line number Diff line change
Expand Up @@ -873,11 +873,11 @@ cmpsb %es:(%rdi), %gs:(%rsi)
cmpsl %es:(%rdi), %gs:(%rsi)

// CHECK: cmpsq %es:(%rdi), %gs:(%rsi)
// CHECK: encoding: [0x48,0x65,0xa7]
// CHECK: encoding: [0x65,0x48,0xa7]
cmpsq %es:(%rdi), %gs:(%rsi)

// CHECK: cmpsw %es:(%rdi), %gs:(%rsi)
// CHECK: encoding: [0x66,0x65,0xa7]
// CHECK: encoding: [0x65,0x66,0xa7]
cmpsw %es:(%rdi), %gs:(%rsi)

// CHECK: cmpw $0, 485498096
Expand Down Expand Up @@ -1645,7 +1645,7 @@ leal (%rdx), %r13d
lodsb %gs:(%rsi), %al

// CHECK: lodsw %gs:(%rsi), %ax
// CHECK: encoding: [0x66,0x65,0xad]
// CHECK: encoding: [0x65,0x66,0xad]
lodsw %gs:(%rsi), %ax

// CHECK: loop 64
Expand Down Expand Up @@ -1821,11 +1821,11 @@ movsb %gs:(%rsi), %es:(%rdi)
movsl %gs:(%rsi), %es:(%rdi)

// CHECK: movsq %gs:(%rsi), %es:(%rdi)
// CHECK: encoding: [0x48,0x65,0xa5]
// CHECK: encoding: [0x65,0x48,0xa5]
movsq %gs:(%rsi), %es:(%rdi)

// CHECK: movsw %gs:(%rsi), %es:(%rdi)
// CHECK: encoding: [0x66,0x65,0xa5]
// CHECK: encoding: [0x65,0x66,0xa5]
movsw %gs:(%rsi), %es:(%rdi)

// CHECK: movw $0, 485498096
Expand Down Expand Up @@ -2985,19 +2985,19 @@ rep cmpsb %es:(%rdi), %gs:(%rsi)
rep cmpsl %es:(%rdi), %gs:(%rsi)

// CHECK: rep cmpsq %es:(%rdi), %gs:(%rsi)
// CHECK: encoding: [0xf3,0x48,0x65,0xa7]
// CHECK: encoding: [0xf3,0x65,0x48,0xa7]
rep cmpsq %es:(%rdi), %gs:(%rsi)

// CHECK: rep cmpsw %es:(%rdi), %gs:(%rsi)
// CHECK: encoding: [0xf3,0x66,0x65,0xa7]
// CHECK: encoding: [0xf3,0x65,0x66,0xa7]
rep cmpsw %es:(%rdi), %gs:(%rsi)

// CHECK: rep lodsb %gs:(%rsi), %al
// CHECK: encoding: [0xf3,0x65,0xac]
rep lodsb %gs:(%rsi), %al

// CHECK: rep lodsw %gs:(%rsi), %ax
// CHECK: encoding: [0xf3,0x66,0x65,0xad]
// CHECK: encoding: [0xf3,0x65,0x66,0xad]
rep lodsw %gs:(%rsi), %ax

// CHECK: rep movsb %gs:(%rsi), %es:(%rdi)
Expand All @@ -3009,11 +3009,11 @@ rep movsb %gs:(%rsi), %es:(%rdi)
rep movsl %gs:(%rsi), %es:(%rdi)

// CHECK: rep movsq %gs:(%rsi), %es:(%rdi)
// CHECK: encoding: [0xf3,0x48,0x65,0xa5]
// CHECK: encoding: [0xf3,0x65,0x48,0xa5]
rep movsq %gs:(%rsi), %es:(%rdi)

// CHECK: rep movsw %gs:(%rsi), %es:(%rdi)
// CHECK: encoding: [0xf3,0x66,0x65,0xa5]
// CHECK: encoding: [0xf3,0x65,0x66,0xa5]
rep movsw %gs:(%rsi), %es:(%rdi)

// CHECK: repne cmpsb %es:(%rdi), %gs:(%rsi)
Expand All @@ -3025,19 +3025,19 @@ repne cmpsb %es:(%rdi), %gs:(%rsi)
repne cmpsl %es:(%rdi), %gs:(%rsi)

// CHECK: repne cmpsq %es:(%rdi), %gs:(%rsi)
// CHECK: encoding: [0xf2,0x48,0x65,0xa7]
// CHECK: encoding: [0xf2,0x65,0x48,0xa7]
repne cmpsq %es:(%rdi), %gs:(%rsi)

// CHECK: repne cmpsw %es:(%rdi), %gs:(%rsi)
// CHECK: encoding: [0xf2,0x66,0x65,0xa7]
// CHECK: encoding: [0xf2,0x65,0x66,0xa7]
repne cmpsw %es:(%rdi), %gs:(%rsi)

// CHECK: repne lodsb %gs:(%rsi), %al
// CHECK: encoding: [0xf2,0x65,0xac]
repne lodsb %gs:(%rsi), %al

// CHECK: repne lodsw %gs:(%rsi), %ax
// CHECK: encoding: [0xf2,0x66,0x65,0xad]
// CHECK: encoding: [0xf2,0x65,0x66,0xad]
repne lodsw %gs:(%rsi), %ax

// CHECK: repne movsb %gs:(%rsi), %es:(%rdi)
Expand All @@ -3049,11 +3049,11 @@ repne movsb %gs:(%rsi), %es:(%rdi)
repne movsl %gs:(%rsi), %es:(%rdi)

// CHECK: repne movsq %gs:(%rsi), %es:(%rdi)
// CHECK: encoding: [0xf2,0x48,0x65,0xa5]
// CHECK: encoding: [0xf2,0x65,0x48,0xa5]
repne movsq %gs:(%rsi), %es:(%rdi)

// CHECK: repne movsw %gs:(%rsi), %es:(%rdi)
// CHECK: encoding: [0xf2,0x66,0x65,0xa5]
// CHECK: encoding: [0xf2,0x65,0x66,0xa5]
repne movsw %gs:(%rsi), %es:(%rdi)

// CHECK: repne scasb %es:(%rdi), %al
Expand Down
10 changes: 5 additions & 5 deletions llvm/test/MC/X86/code16gcc.s
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@
lodsb (%esi), %al
//CHECK: lodsb (%esi), %al # encoding: [0x67,0xac]
lodsl %gs:(%esi)
//CHECK: lodsl %gs:(%esi), %eax # encoding: [0x66,0x65,0x67,0xad]
//CHECK: lodsl %gs:(%esi), %eax # encoding: [0x67,0x65,0x66,0xad]
lods (%esi), %ax
//CHECK: lodsw (%esi), %ax # encoding: [0x67,0xad]
stosw
//CHECK: stosw %ax, %es:(%edi) # encoding: [0x67,0xab]
stos %eax, (%edi)
//CHECK: stosl %eax, %es:(%edi) # encoding: [0x66,0x67,0xab]
//CHECK: stosl %eax, %es:(%edi) # encoding: [0x67,0x66,0xab]
stosb %al, %es:(%edi)
//CHECK: stosb %al, %es:(%edi) # encoding: [0x67,0xaa]
scas %es:(%edi), %al
Expand All @@ -29,15 +29,15 @@
cmpsw (%edi), (%esi)
//CHECK: cmpsw %es:(%edi), (%esi) # encoding: [0x67,0xa7]
cmpsl %es:(%edi), %ss:(%esi)
//CHECK: cmpsl %es:(%edi), %ss:(%esi) # encoding: [0x66,0x36,0x67,0xa7]
//CHECK: cmpsl %es:(%edi), %ss:(%esi) # encoding: [0x67,0x36,0x66,0xa7]
movsb (%esi), (%edi)
//CHECK: movsb (%esi), %es:(%edi) # encoding: [0x67,0xa4]
movsl %gs:(%esi), (%edi)
//CHECK: movsl %gs:(%esi), %es:(%edi) # encoding: [0x66,0x65,0x67,0xa5]
//CHECK: movsl %gs:(%esi), %es:(%edi) # encoding: [0x67,0x65,0x66,0xa5]
outsb
//CHECK: outsb (%esi), %dx # encoding: [0x67,0x6e]
outsw %fs:(%esi), %dx
//CHECK: outsw %fs:(%esi), %dx # encoding: [0x64,0x67,0x6f]
//CHECK: outsw %fs:(%esi), %dx # encoding: [0x67,0x64,0x6f]
insw %dx, (%di)
//CHECK: insw %dx, %es:(%di) # encoding: [0x6d]
call $0x7ace,$0x7ace
Expand Down
36 changes: 18 additions & 18 deletions llvm/test/MC/X86/index-operations.s
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ lodsb (%si), %al
// 16: lodsb (%si), %al # encoding: [0xac]

lodsl %gs:(%esi)
// 64: lodsl %gs:(%esi), %eax # encoding: [0x65,0x67,0xad]
// 64: lodsl %gs:(%esi), %eax # encoding: [0x67,0x65,0xad]
// 32: lodsl %gs:(%esi), %eax # encoding: [0x65,0xad]
// 16: lodsl %gs:(%esi), %eax # encoding: [0x66,0x65,0x67,0xad]
// 16: lodsl %gs:(%esi), %eax # encoding: [0x67,0x65,0x66,0xad]

lodsl (%edi), %eax
// ERR64: invalid operand
Expand All @@ -41,7 +41,7 @@ lodsl 44(%edi), %eax
// ERR16: invalid operand

lods (%esi), %ax
// 64: lodsw (%esi), %ax # encoding: [0x66,0x67,0xad]
// 64: lodsw (%esi), %ax # encoding: [0x67,0x66,0xad]
// 32: lodsw (%esi), %ax # encoding: [0x66,0xad]
// 16: lodsw (%esi), %ax # encoding: [0x67,0xad]

Expand All @@ -53,7 +53,7 @@ stosw
stos %eax, (%edi)
// 64: stosl %eax, %es:(%edi) # encoding: [0x67,0xab]
// 32: stosl %eax, %es:(%edi) # encoding: [0xab]
// 16: stosl %eax, %es:(%edi) # encoding: [0x66,0x67,0xab]
// 16: stosl %eax, %es:(%edi) # encoding: [0x67,0x66,0xab]

stosb %al, %fs:(%edi)
// ERR64: invalid operand for instruction
Expand All @@ -71,7 +71,7 @@ stosq
// ERR16: 64-bit

stos %rax, (%edi)
// 64: stosq %rax, %es:(%edi) # encoding: [0x48,0x67,0xab]
// 64: stosq %rax, %es:(%edi) # encoding: [0x67,0x48,0xab]
// ERR32: only available in 64-bit mode
// ERR16: only available in 64-bit mode

Expand All @@ -81,7 +81,7 @@ scas %es:(%edi), %al
// 16: scasb %es:(%edi), %al # encoding: [0x67,0xae]

scasq %es:(%edi)
// 64: scasq %es:(%edi), %rax # encoding: [0x48,0x67,0xaf]
// 64: scasq %es:(%edi), %rax # encoding: [0x67,0x48,0xaf]
// ERR32: 64-bit
// ERR16: 64-bit

Expand All @@ -93,15 +93,15 @@ scasl %es:(%edi), %al
scas %es:(%di), %ax
// ERR64: invalid 16-bit base register
// 16: scasw %es:(%di), %ax # encoding: [0xaf]
// 32: scasw %es:(%di), %ax # encoding: [0x66,0x67,0xaf]
// 32: scasw %es:(%di), %ax # encoding: [0x67,0x66,0xaf]

cmpsb
// 64: cmpsb %es:(%rdi), (%rsi) # encoding: [0xa6]
// 32: cmpsb %es:(%edi), (%esi) # encoding: [0xa6]
// 16: cmpsb %es:(%di), (%si) # encoding: [0xa6]

cmpsw (%edi), (%esi)
// 64: cmpsw %es:(%edi), (%esi) # encoding: [0x66,0x67,0xa7]
// 64: cmpsw %es:(%edi), (%esi) # encoding: [0x67,0x66,0xa7]
// 32: cmpsw %es:(%edi), (%esi) # encoding: [0x66,0xa7]
// 16: cmpsw %es:(%edi), (%esi) # encoding: [0x67,0xa7]

Expand All @@ -111,9 +111,9 @@ cmpsb (%di), (%esi)
// ERR16: mismatching source and destination

cmpsl %es:(%edi), %ss:(%esi)
// 64: cmpsl %es:(%edi), %ss:(%esi) # encoding: [0x36,0x67,0xa7]
// 64: cmpsl %es:(%edi), %ss:(%esi) # encoding: [0x67,0x36,0xa7]
// 32: cmpsl %es:(%edi), %ss:(%esi) # encoding: [0x36,0xa7]
// 16: cmpsl %es:(%edi), %ss:(%esi) # encoding: [0x66,0x36,0x67,0xa7]
// 16: cmpsl %es:(%edi), %ss:(%esi) # encoding: [0x67,0x36,0x66,0xa7]

cmpsq (%rdi), (%rsi)
// 64: cmpsq %es:(%rdi), (%rsi) # encoding: [0x48,0xa7]
Expand All @@ -126,32 +126,32 @@ movsb (%esi), (%edi)
// 16: movsb (%esi), %es:(%edi) # encoding: [0x67,0xa4]

movsl %gs:(%esi), (%edi)
// 64: movsl %gs:(%esi), %es:(%edi) # encoding: [0x65,0x67,0xa5]
// 64: movsl %gs:(%esi), %es:(%edi) # encoding: [0x67,0x65,0xa5]
// 32: movsl %gs:(%esi), %es:(%edi) # encoding: [0x65,0xa5]
// 16: movsl %gs:(%esi), %es:(%edi) # encoding: [0x66,0x65,0x67,0xa5]
// 16: movsl %gs:(%esi), %es:(%edi) # encoding: [0x67,0x65,0x66,0xa5]

outsb
// 64: outsb (%rsi), %dx # encoding: [0x6e]
// 32: outsb (%esi), %dx # encoding: [0x6e]
// 16: outsb (%si), %dx # encoding: [0x6e]

outsw %fs:(%esi), %dx
// 64: outsw %fs:(%esi), %dx # encoding: [0x66,0x64,0x67,0x6f]
// 32: outsw %fs:(%esi), %dx # encoding: [0x66,0x64,0x6f]
// 16: outsw %fs:(%esi), %dx # encoding: [0x64,0x67,0x6f]
// 64: outsw %fs:(%esi), %dx # encoding: [0x67,0x64,0x66,0x6f]
// 32: outsw %fs:(%esi), %dx # encoding: [0x64,0x66,0x6f]
// 16: outsw %fs:(%esi), %dx # encoding: [0x67,0x64,0x6f]

insw %dx, (%edi)
// 64: insw %dx, %es:(%edi) # encoding: [0x66,0x67,0x6d]
// 64: insw %dx, %es:(%edi) # encoding: [0x67,0x66,0x6d]
// 32: insw %dx, %es:(%edi) # encoding: [0x66,0x6d]
// 16: insw %dx, %es:(%edi) # encoding: [0x67,0x6d]

insw %dx, (%bx)
// ERR64: invalid 16-bit base register
// 32: insw %dx, %es:(%di) # encoding: [0x66,0x67,0x6d]
// 32: insw %dx, %es:(%di) # encoding: [0x67,0x66,0x6d]
// 16: insw %dx, %es:(%di) # encoding: [0x6d]

insw %dx, (%ebx)
// 64: insw %dx, %es:(%edi) # encoding: [0x66,0x67,0x6d]
// 64: insw %dx, %es:(%edi) # encoding: [0x67,0x66,0x6d]
// 32: insw %dx, %es:(%edi) # encoding: [0x66,0x6d]
// 16: insw %dx, %es:(%edi) # encoding: [0x67,0x6d]

Expand Down
2 changes: 1 addition & 1 deletion llvm/test/MC/X86/x86-16.s
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,7 @@ cmovnae %bx,%bx
// CHECK: encoding: [0x9b]
fwait

// CHECK: [0x66,0x65,0xa1,0x7c,0x00]
// CHECK: [0x65,0x66,0xa1,0x7c,0x00]
movl %gs:124, %eax

// CHECK: pusha
Expand Down