mirror of
https://github.com/RPCSX/llvm.git
synced 2024-11-30 07:00:45 +00:00
I have finally seen the light. The code to change the opcode must live higher in
the loop, and in both cases. In the first case, it is a VReg that is a constant so it may be actually converted to a constant. In the second case, it is already a constant, but then if it doesn't change its type (e.g. to become a register and have the value loaded from memory if it is too large to live in its instruction field), we must change the opcode BEFORE the 'continue', otherwise we miss the opportunity. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@6602 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
d22807a43e
commit
d15cd2752f
@ -186,6 +186,12 @@ FixConstantOperandsForInstr(Instruction* vmInstr,
|
||||
immedValue);
|
||||
if (opType == MachineOperand::MO_VirtualRegister)
|
||||
constantThatMustBeLoaded = true;
|
||||
else {
|
||||
// The optype has changed from being a register to an immediate
|
||||
// This means we need to change the opcode, e.g. ADDr -> ADDi
|
||||
unsigned newOpcode = convertOpcodeFromRegToImm(opCode);
|
||||
minstr->setOpcode(newOpcode);
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
@ -203,6 +209,13 @@ FixConstantOperandsForInstr(Instruction* vmInstr,
|
||||
opCode, target, (immedPos == (int)op),
|
||||
machineRegNum, immedValue);
|
||||
|
||||
if (opType == MachineOperand::MO_SignExtendedImmed) {
|
||||
// The optype is an immediate value
|
||||
// This means we need to change the opcode, e.g. ADDr -> ADDi
|
||||
unsigned newOpcode = convertOpcodeFromRegToImm(opCode);
|
||||
minstr->setOpcode(newOpcode);
|
||||
}
|
||||
|
||||
if (opType == mop.getType())
|
||||
continue; // no change: this is the most common case
|
||||
|
||||
@ -220,10 +233,6 @@ FixConstantOperandsForInstr(Instruction* vmInstr,
|
||||
else if (opType == MachineOperand::MO_SignExtendedImmed ||
|
||||
opType == MachineOperand::MO_UnextendedImmed) {
|
||||
minstr->SetMachineOperandConst(op, opType, immedValue);
|
||||
// The optype has changed from being a register to an immediate
|
||||
// This means we need to change the opcode, e.g. ADDr -> ADDi
|
||||
unsigned newOpcode = convertOpcodeFromRegToImm(opCode);
|
||||
minstr->setOpcode(newOpcode);
|
||||
} else if (constantThatMustBeLoaded ||
|
||||
(opValue && isa<GlobalValue>(opValue)))
|
||||
{ // opValue is a constant that must be explicitly loaded into a reg
|
||||
|
@ -186,6 +186,12 @@ FixConstantOperandsForInstr(Instruction* vmInstr,
|
||||
immedValue);
|
||||
if (opType == MachineOperand::MO_VirtualRegister)
|
||||
constantThatMustBeLoaded = true;
|
||||
else {
|
||||
// The optype has changed from being a register to an immediate
|
||||
// This means we need to change the opcode, e.g. ADDr -> ADDi
|
||||
unsigned newOpcode = convertOpcodeFromRegToImm(opCode);
|
||||
minstr->setOpcode(newOpcode);
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
@ -203,6 +209,13 @@ FixConstantOperandsForInstr(Instruction* vmInstr,
|
||||
opCode, target, (immedPos == (int)op),
|
||||
machineRegNum, immedValue);
|
||||
|
||||
if (opType == MachineOperand::MO_SignExtendedImmed) {
|
||||
// The optype is an immediate value
|
||||
// This means we need to change the opcode, e.g. ADDr -> ADDi
|
||||
unsigned newOpcode = convertOpcodeFromRegToImm(opCode);
|
||||
minstr->setOpcode(newOpcode);
|
||||
}
|
||||
|
||||
if (opType == mop.getType())
|
||||
continue; // no change: this is the most common case
|
||||
|
||||
@ -220,10 +233,6 @@ FixConstantOperandsForInstr(Instruction* vmInstr,
|
||||
else if (opType == MachineOperand::MO_SignExtendedImmed ||
|
||||
opType == MachineOperand::MO_UnextendedImmed) {
|
||||
minstr->SetMachineOperandConst(op, opType, immedValue);
|
||||
// The optype has changed from being a register to an immediate
|
||||
// This means we need to change the opcode, e.g. ADDr -> ADDi
|
||||
unsigned newOpcode = convertOpcodeFromRegToImm(opCode);
|
||||
minstr->setOpcode(newOpcode);
|
||||
} else if (constantThatMustBeLoaded ||
|
||||
(opValue && isa<GlobalValue>(opValue)))
|
||||
{ // opValue is a constant that must be explicitly loaded into a reg
|
||||
|
Loading…
Reference in New Issue
Block a user