Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion llvm/lib/Target/X86/MCTargetDesc/X86AsmBackend.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1391,7 +1391,7 @@ class DarwinX86AsmBackend : public X86AsmBackend {
return CU::UNWIND_MODE_DWARF;

MCRegister Reg = *MRI.getLLVMRegNum(Inst.getRegister(), true);
SavedRegs[SavedRegIdx++] = Reg;
SavedRegs[SavedRegIdx++] = Reg.id();
StackAdjust += OffsetSize;
MinAbsOffset = std::min(MinAbsOffset, std::abs(Inst.getOffset()));
InstrOffset += PushInstrSize(Reg);
Expand Down
2 changes: 1 addition & 1 deletion llvm/lib/Target/X86/MCTargetDesc/X86InstPrinterCommon.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -451,7 +451,7 @@ void X86InstPrinterCommon::printVKPair(const MCInst *MI, unsigned OpNo,
// the assembly would look something like:
// "vp2intersect %zmm5, %zmm7, {%k2, %k3}"
// but this can work too.
switch (MI->getOperand(OpNo).getReg()) {
switch (MI->getOperand(OpNo).getReg().id()) {
case X86::K0_K1:
printRegName(OS, X86::K0);
return;
Expand Down
2 changes: 1 addition & 1 deletion llvm/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -535,7 +535,7 @@ bool X86MCInstrAnalysis::clearsSuperRegisters(const MCRegisterInfo &MRI,
const MCRegisterClass &VR128XRC = MRI.getRegClass(X86::VR128XRegClassID);
const MCRegisterClass &VR256XRC = MRI.getRegClass(X86::VR256XRegClassID);

auto ClearsSuperReg = [=](unsigned RegID) {
auto ClearsSuperReg = [=](MCRegister RegID) {
// On X86-64, a general purpose integer register is viewed as a 64-bit
// register internal to the processor.
// An update to the lower 32 bits of a 64 bit integer register is
Expand Down
5 changes: 3 additions & 2 deletions llvm/lib/Target/X86/MCTargetDesc/X86WinCOFFTargetStreamer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ struct FPOInstruction {
StackAlign,
SetFrame,
} Op;
// FIXME: This should be a union of MCRegister and unsigned.
unsigned RegOrOffset;
};

Expand Down Expand Up @@ -215,7 +216,7 @@ bool X86WinCOFFTargetStreamer::emitFPOSetFrame(MCRegister Reg, SMLoc L) {
FPOInstruction Inst;
Inst.Label = emitFPOLabel();
Inst.Op = FPOInstruction::SetFrame;
Inst.RegOrOffset = Reg;
Inst.RegOrOffset = Reg.id();
CurFPOData->Instructions.push_back(Inst);
return false;
}
Expand All @@ -226,7 +227,7 @@ bool X86WinCOFFTargetStreamer::emitFPOPushReg(MCRegister Reg, SMLoc L) {
FPOInstruction Inst;
Inst.Label = emitFPOLabel();
Inst.Op = FPOInstruction::PushReg;
Inst.RegOrOffset = Reg;
Inst.RegOrOffset = Reg.id();
CurFPOData->Instructions.push_back(Inst);
return false;
}
Expand Down
Loading