RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2025-01-31 01:03:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Don't allow TargetFlags on MO_Register MachineOperands.

Browse Source 
Register operands are manipulated by a lot of target-independent code,
and it is not always possible to preserve target flags. That means it is
not safe to use target flags on register operands.

None of the targets in the tree are using register operand target flags.
External targets should be using immediate operands to annotate
instructions with operand modifiers.

llvm-svn: 162770
This commit is contained in:
Jakob Stoklund Olesen 2012-08-28 18:05:48 +00:00
parent ffe4d583f6
commit 3a30b60584
2 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
include/llvm/CodeGen/MachineOperand.h
View File

@ -60,12 +60,15 @@ private:
/// union.
unsigned char OpKind; // MachineOperandType
/// SubReg - Subregister number, only valid for MO_Register. A value of 0
/// indicates the MO_Register has no subReg.
unsigned char SubReg;
// This union is discriminated by OpKind.
union {
/// SubReg - Subregister number, only valid for MO_Register. A value of 0
/// indicates the MO_Register has no subReg.
unsigned char SubReg;
/// TargetFlags - This is a set of target-specific operand flags.
unsigned char TargetFlags;
/// TargetFlags - This is a set of target-specific operand flags.
unsigned char TargetFlags;
};
/// IsDef/IsImp/IsKill/IsDead flags - These are only valid for MO_Register
/// operands.
@ -176,9 +179,17 @@ public:
///
MachineOperandType getType() const { return (MachineOperandType)OpKind; }
unsigned char getTargetFlags() const { return TargetFlags; }
void setTargetFlags(unsigned char F) { TargetFlags = F; }
void addTargetFlag(unsigned char F) { TargetFlags |= F; }
unsigned char getTargetFlags() const {
return isReg() ? 0 : TargetFlags;
}
void setTargetFlags(unsigned char F) {
assert(!isReg() && "Register operands can't have target flags");
TargetFlags = F;
}
void addTargetFlag(unsigned char F) {
assert(!isReg() && "Register operands can't have target flags");
TargetFlags |= F;
}
/// getParent - Return the instruction that this operand belongs to.

4
lib/CodeGen/MachineInstr.cpp
View File

@ -208,8 +208,8 @@ bool MachineOperand::isIdenticalTo(const MachineOperand &Other) const {
hash_code llvm::hash_value(const MachineOperand &MO) {
switch (MO.getType()) {
case MachineOperand::MO_Register:
return hash_combine(MO.getType(), MO.getTargetFlags(), MO.getReg(),
MO.getSubReg(), MO.isDef());
// Register operands don't have target flags.
return hash_combine(MO.getType(), MO.getReg(), MO.getSubReg(), MO.isDef());
case MachineOperand::MO_Immediate:
return hash_combine(MO.getType(), MO.getTargetFlags(), MO.getImm());
case MachineOperand::MO_CImmediate: