6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-05-20 20:38:48 +00:00
Code Issues Projects Releases Wiki Activity

Fixed commuteInstructions bug where if its called pre-regalloc the subreg indices weren't commuted

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@153579 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Pete Cooper 2012-03-28 17:02:22 +00:00
parent c1ea16ec43
commit 442ee9c3f7
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/CodeGen/TargetInstrInfoImpl.cpp
View File

@ -78,6 +78,9 @@ MachineInstr *TargetInstrInfoImpl::commuteInstruction(MachineInstr *MI,
unsigned Reg0 = HasDef ? MI->getOperand(0).getReg() : 0; unsigned Reg0 = HasDef ? MI->getOperand(0).getReg() : 0;
unsigned Reg1 = MI->getOperand(Idx1).getReg(); unsigned Reg1 = MI->getOperand(Idx1).getReg();
unsigned Reg2 = MI->getOperand(Idx2).getReg(); unsigned Reg2 = MI->getOperand(Idx2).getReg();
unsigned SubReg0 = HasDef ? MI->getOperand(0).getSubReg() : 0;
unsigned SubReg1 = MI->getOperand(Idx1).getSubReg();
unsigned SubReg2 = MI->getOperand(Idx2).getSubReg();
bool Reg1IsKill = MI->getOperand(Idx1).isKill(); bool Reg1IsKill = MI->getOperand(Idx1).isKill();
bool Reg2IsKill = MI->getOperand(Idx2).isKill(); bool Reg2IsKill = MI->getOperand(Idx2).isKill();
// If destination is tied to either of the commuted source register, then // If destination is tied to either of the commuted source register, then
@ -86,10 +89,12 @@ MachineInstr *TargetInstrInfoImpl::commuteInstruction(MachineInstr *MI,
MI->getDesc().getOperandConstraint(Idx1, MCOI::TIED_TO) == 0) { MI->getDesc().getOperandConstraint(Idx1, MCOI::TIED_TO) == 0) {
Reg2IsKill = false; Reg2IsKill = false;
Reg0 = Reg2; Reg0 = Reg2;
SubReg0 = SubReg2;
} else if (HasDef && Reg0 == Reg2 && } else if (HasDef && Reg0 == Reg2 &&
MI->getDesc().getOperandConstraint(Idx2, MCOI::TIED_TO) == 0) { MI->getDesc().getOperandConstraint(Idx2, MCOI::TIED_TO) == 0) {
Reg1IsKill = false; Reg1IsKill = false;
Reg0 = Reg1; Reg0 = Reg1;
SubReg0 = SubReg1;
} }
if (NewMI) { if (NewMI) {
@ -98,19 +103,23 @@ MachineInstr *TargetInstrInfoImpl::commuteInstruction(MachineInstr *MI,
MachineFunction &MF = *MI->getParent()->getParent(); MachineFunction &MF = *MI->getParent()->getParent();
if (HasDef) if (HasDef)
return BuildMI(MF, MI->getDebugLoc(), MI->getDesc()) return BuildMI(MF, MI->getDebugLoc(), MI->getDesc())
.addReg(Reg0, RegState::Define | getDeadRegState(Reg0IsDead)) .addReg(Reg0, RegState::Define | getDeadRegState(Reg0IsDead), SubReg0)
.addReg(Reg2, getKillRegState(Reg2IsKill)) .addReg(Reg2, getKillRegState(Reg2IsKill), SubReg2)
.addReg(Reg1, getKillRegState(Reg2IsKill)); .addReg(Reg1, getKillRegState(Reg1IsKill), SubReg1);
else else
return BuildMI(MF, MI->getDebugLoc(), MI->getDesc()) return BuildMI(MF, MI->getDebugLoc(), MI->getDesc())
.addReg(Reg2, getKillRegState(Reg2IsKill)) .addReg(Reg2, getKillRegState(Reg2IsKill), SubReg2)
.addReg(Reg1, getKillRegState(Reg2IsKill)); .addReg(Reg1, getKillRegState(Reg1IsKill), SubReg1);
} }
if (HasDef) if (HasDef) {
MI->getOperand(0).setReg(Reg0); MI->getOperand(0).setReg(Reg0);
MI->getOperand(0).setSubReg(SubReg0);
}
MI->getOperand(Idx2).setReg(Reg1); MI->getOperand(Idx2).setReg(Reg1);
MI->getOperand(Idx1).setReg(Reg2); MI->getOperand(Idx1).setReg(Reg2);
MI->getOperand(Idx2).setSubReg(SubReg1);
MI->getOperand(Idx1).setSubReg(SubReg2);
MI->getOperand(Idx2).setIsKill(Reg1IsKill); MI->getOperand(Idx2).setIsKill(Reg1IsKill);
MI->getOperand(Idx1).setIsKill(Reg2IsKill); MI->getOperand(Idx1).setIsKill(Reg2IsKill);
return MI; return MI;