forked from OSchip/llvm-project
parent
c57819d4a3
commit
bbbcac39e6
|
@ -40,6 +40,7 @@
|
|||
#include "llvm/Support/Debug.h"
|
||||
#include "llvm/Support/Compiler.h"
|
||||
#include "llvm/ADT/DepthFirstIterator.h"
|
||||
#include "llvm/ADT/SmallVector.h"
|
||||
#include "llvm/ADT/Statistic.h"
|
||||
#include "llvm/ADT/STLExtras.h"
|
||||
#include <algorithm>
|
||||
|
@ -213,20 +214,12 @@ bool FPS::processBasicBlock(MachineFunction &MF, MachineBasicBlock &BB) {
|
|||
|
||||
// Get dead variables list now because the MI pointer may be deleted as part
|
||||
// of processing!
|
||||
LiveVariables::killed_iterator IB, IE;
|
||||
tie(IB, IE) = LV->dead_range(MI);
|
||||
|
||||
DEBUG(
|
||||
const MRegisterInfo *MRI = MF.getTarget().getRegisterInfo();
|
||||
LiveVariables::killed_iterator I = LV->killed_begin(MI);
|
||||
LiveVariables::killed_iterator E = LV->killed_end(MI);
|
||||
if (I != E) {
|
||||
std::cerr << "Killed Operands:";
|
||||
for (; I != E; ++I)
|
||||
std::cerr << " %" << MRI->getName(*I);
|
||||
std::cerr << "\n";
|
||||
}
|
||||
);
|
||||
SmallVector<unsigned, 8> DeadRegs;
|
||||
for (unsigned i = 0, e = MI->getNumOperands(); i != e; ++i) {
|
||||
const MachineOperand &MO = MI->getOperand(i);
|
||||
if (MO.isReg() && MO.isDead())
|
||||
DeadRegs.push_back(MO.getReg());
|
||||
}
|
||||
|
||||
switch (Flags & X86II::FPTypeMask) {
|
||||
case X86II::ZeroArgFP: handleZeroArgFP(I); break;
|
||||
|
@ -241,8 +234,8 @@ bool FPS::processBasicBlock(MachineFunction &MF, MachineBasicBlock &BB) {
|
|||
|
||||
// Check to see if any of the values defined by this instruction are dead
|
||||
// after definition. If so, pop them.
|
||||
for (; IB != IE; ++IB) {
|
||||
unsigned Reg = *IB;
|
||||
for (unsigned i = 0, e = DeadRegs.size(); i != e; ++i) {
|
||||
unsigned Reg = DeadRegs[i];
|
||||
if (Reg >= X86::FP0 && Reg <= X86::FP6) {
|
||||
DEBUG(std::cerr << "Register FP#" << Reg-X86::FP0 << " is dead!\n");
|
||||
freeStackSlotAfter(I, Reg-X86::FP0);
|
||||
|
@ -762,6 +755,7 @@ void FPS::handleCondMovFP(MachineBasicBlock::iterator &I) {
|
|||
|
||||
unsigned Op0 = getFPReg(MI->getOperand(0));
|
||||
unsigned Op1 = getFPReg(MI->getOperand(2));
|
||||
bool KillsOp1 = LV->KillsRegister(MI, X86::FP0+Op1);
|
||||
|
||||
// The first operand *must* be on the top of the stack.
|
||||
moveToTop(Op0, I);
|
||||
|
@ -773,9 +767,8 @@ void FPS::handleCondMovFP(MachineBasicBlock::iterator &I) {
|
|||
MI->getOperand(0).setReg(getSTReg(Op1));
|
||||
MI->setOpcode(getConcreteOpcode(MI->getOpcode()));
|
||||
|
||||
|
||||
// If we kill the second operand, make sure to pop it from the stack.
|
||||
if (Op0 != Op1 && LV->KillsRegister(MI, X86::FP0+Op1)) {
|
||||
if (Op0 != Op1 && KillsOp1) {
|
||||
// Get this value off of the register stack.
|
||||
freeStackSlotAfter(I, Op1);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue