RPCSX/llvm
1
0
Fork 0
mirror of https://github.com/RPCSX/llvm.git synced 2024-12-04 01:43:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[mips] [IAS] Move NOP emission after pseudo-instruction expansion. NFC.

Browse Source 
As suggested in the review for http://reviews.llvm.org/D8537.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@235601 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Toma Tabacu 2015-04-23 14:48:38 +00:00
parent 5d538f71c2
commit b685acfe78
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/Target/Mips/AsmParser/MipsAsmParser.cpp
View File

@ -1383,14 +1383,6 @@ bool MipsAsmParser::processInstruction(MCInst &Inst, SMLoc IDLoc,
}
}
// If this instruction has a delay slot and .set reorder is active,
// emit a NOP after it.
if (MCID.hasDelaySlot() && AssemblerOptions.back()->isReorder()) {
Instructions.push_back(Inst);
createNop(hasShortDelaySlot(Inst.getOpcode()), IDLoc, Instructions);
return false;
}
if (MCID.mayLoad() || MCID.mayStore()) {
// Check the offset of memory operand, if it is a symbol
// reference or immediate we may have to expand instructions.
@ -1580,11 +1572,17 @@ bool MipsAsmParser::processInstruction(MCInst &Inst, SMLoc IDLoc,
}
}
if (needsExpansion(Inst))
return expandInstruction(Inst, IDLoc, Instructions);
else
if (needsExpansion(Inst)) {
if (expandInstruction(Inst, IDLoc, Instructions))
return true;
} else
Instructions.push_back(Inst);
// If this instruction has a delay slot and .set reorder is active,
// emit a NOP after it.
if (MCID.hasDelaySlot() && AssemblerOptions.back()->isReorder())
createNop(hasShortDelaySlot(Inst.getOpcode()), IDLoc, Instructions);
return false;
}