RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-10-18 18:42:46 +02:00
Code Issues Projects Releases Wiki Activity

[MIR] Allow frame-setup and frame-destroy on the same instruction

Browse Source 
Nothing prevents us from having both frame-setup and frame-destroy on
the same instruction.

When merging:
* frame-setup OPCODE1
* frame-destroy OPCODE2
into
* frame-setup frame-destroy OPCODE3

we want to be able to print and parse both flags.

llvm-svn: 327442
This commit is contained in:
Francis Visoiu Mistrih 2018-03-13 19:53:16 +00:00
parent 1c5842b814
commit 391493fd6e
4 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/CodeGen/MIRParser/MIParser.cpp
View File

@ -923,11 +923,13 @@ bool MIParser::verifyImplicitOperands(ArrayRef<ParsedMachineOperand> Operands,
}
bool MIParser::parseInstruction(unsigned &OpCode, unsigned &Flags) {
if (Token.is(MIToken::kw_frame_setup)) {
Flags |= MachineInstr::FrameSetup;
lex();
} else if (Token.is(MIToken::kw_frame_destroy)) {
Flags |= MachineInstr::FrameDestroy;
// Allow both:
// * frame-setup frame-destroy OPCODE
// * frame-destroy frame-setup OPCODE
while (Token.is(MIToken::kw_frame_setup) ||
Token.is(MIToken::kw_frame_destroy)) {
Flags |= Token.is(MIToken::kw_frame_setup) ? MachineInstr::FrameSetup
: MachineInstr::FrameDestroy;
lex();
}
if (Token.isNot(MIToken::Identifier))

2
lib/CodeGen/MIRPrinter.cpp
View File

@ -672,7 +672,7 @@ void MIPrinter::print(const MachineInstr &MI) {
OS << " = ";
if (MI.getFlag(MachineInstr::FrameSetup))
OS << "frame-setup ";
else if (MI.getFlag(MachineInstr::FrameDestroy))
if (MI.getFlag(MachineInstr::FrameDestroy))
OS << "frame-destroy ";
OS << TII->getName(MI.getOpcode());

2
lib/CodeGen/MachineInstr.cpp
View File

@ -1292,7 +1292,7 @@ void MachineInstr::print(raw_ostream &OS, ModuleSlotTracker &MST,
if (getFlag(MachineInstr::FrameSetup))
OS << "frame-setup ";
else if (getFlag(MachineInstr::FrameDestroy))
if (getFlag(MachineInstr::FrameDestroy))
OS << "frame-destroy ";
// Print the opcode name.

4
test/CodeGen/MIR/X86/frame-setup-instruction-flag.mir
View File

@ -32,5 +32,9 @@ body: |
CALL64pcrel32 @compute, csr_64, implicit $rsp, implicit $edi, implicit-def $rsp, implicit-def $eax
; CHECK: $rdx = frame-destroy POP64r
$rdx = frame-destroy POP64r implicit-def $rsp, implicit $rsp
; CHECK: $rdx = frame-setup frame-destroy POP64r
$rdx = frame-setup frame-destroy POP64r implicit-def $rsp, implicit $rsp
; CHECK: $rdx = frame-setup frame-destroy POP64r
$rdx = frame-destroy frame-setup POP64r implicit-def $rsp, implicit $rsp
RETQ $eax
...