Skip to content

[X86] Fix an assembler bug of CMPCCXADD. #66748

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 20, 2023
Merged

[X86] Fix an assembler bug of CMPCCXADD. #66748

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
12b5cdf
[X86] Fix an assembler bug of CMPCCXADD.
FreddyLeaf Sep 19, 2023
1e66d6c
Address comments.
FreddyLeaf Sep 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions llvm/lib/Target/X86/MCTargetDesc/X86MCCodeEmitter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -947,11 +947,11 @@ X86MCCodeEmitter::emitVEXOpcodePrefix(int MemOperand, const MCInst &MI,
default:
llvm_unreachable("Unexpected form in emitVEXOpcodePrefix!");
case X86II::MRMDestMem4VOp3CC: {
// MemAddr, src1(ModR/M), src2(VEX_4V)
// src1(ModR/M), MemAddr, src2(VEX_4V)
Prefix.setR(MI, CurOp++);
Prefix.setB(MI, MemOperand + X86::AddrBaseReg);
Prefix.setX(MI, MemOperand + X86::AddrIndexReg);
CurOp += X86::AddrNumOperands;
Prefix.setR(MI, ++CurOp);
Prefix.set4V(MI, CurOp++);
break;
}
Expand Down
4 changes: 4 additions & 0 deletions llvm/test/MC/Disassembler/X86/cmpccxadd-64.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -769,3 +769,7 @@
# INTEL: cmpzxadd qword ptr [rdx - 1024], r9, r10
0xc4,0x62,0xa9,0xe4,0x8a,0x00,0xfc,0xff,0xff

# ATT: cmpbexadd %ecx, %r8d, (%rip)
# INTEL: cmpbexadd dword ptr [rip], r8d, ecx
0xc4,0x62,0x71,0xe6,0x05,0x00,0x00,0x00,0x00

3 changes: 3 additions & 0 deletions llvm/test/MC/X86/cmpccxadd-att-64.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -768,3 +768,6 @@
// CHECK: encoding: [0xc4,0x62,0xa9,0xe4,0x8a,0x00,0xfc,0xff,0xff]
cmpzxadd %r10, %r9, -1024(%rdx)

// CHECK: cmpbexadd %ecx, %r8d, (%rip)
// CHECK: encoding: [0xc4,0x62,0x71,0xe6,0x05,0x00,0x00,0x00,0x00]
cmpbexadd %ecx, %r8d, (%rip)
3 changes: 3 additions & 0 deletions llvm/test/MC/X86/cmpccxadd-intel-64.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -768,3 +768,6 @@
// CHECK: encoding: [0xc4,0x62,0xa9,0xe4,0x8a,0x00,0xfc,0xff,0xff]
cmpzxadd qword ptr [rdx - 1024], r9, r10

// CHECK: cmpbexadd dword ptr [rip], r8d, ecx
// CHECK: encoding: [0xc4,0x62,0x71,0xe6,0x05,0x00,0x00,0x00,0x00]
cmpbexadd dword ptr [rip], r8d, ecx