diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/CodeGen/MachineInstr.cpp | 2 | ||||
| -rw-r--r-- | lib/CodeGen/SelectionDAG/ScheduleDAG.cpp | 4 | ||||
| -rw-r--r-- | lib/CodeGen/SelectionDAG/SelectionDAG.cpp | 21 | ||||
| -rw-r--r-- | lib/Target/PowerPC/PPCISelLowering.cpp | 4 | ||||
| -rw-r--r-- | lib/Target/X86/X86InstrInfo.cpp | 2 |
5 files changed, 17 insertions, 16 deletions
diff --git a/lib/CodeGen/MachineInstr.cpp b/lib/CodeGen/MachineInstr.cpp index d2aa2bb221..6c4fb3c834 100644 --- a/lib/CodeGen/MachineInstr.cpp +++ b/lib/CodeGen/MachineInstr.cpp @@ -693,7 +693,7 @@ void MachineInstr::print(std::ostream &OS, const TargetMachine *TM) const { if (getNumMemOperands() > 0) { OS << ", Mem:"; for (unsigned i = 0; i < getNumMemOperands(); i++) { - const MemOperand &MRO = getMemOperand(i); + const MachineMemOperand &MRO = getMemOperand(i); const Value *V = MRO.getValue(); assert((MRO.isLoad() || MRO.isStore()) && diff --git a/lib/CodeGen/SelectionDAG/ScheduleDAG.cpp b/lib/CodeGen/SelectionDAG/ScheduleDAG.cpp index 00b5677879..2af394fa8a 100644 --- a/lib/CodeGen/SelectionDAG/ScheduleDAG.cpp +++ b/lib/CodeGen/SelectionDAG/ScheduleDAG.cpp @@ -369,7 +369,7 @@ unsigned ScheduleDAG::CountResults(SDNode *Node) { unsigned ScheduleDAG::CountOperands(SDNode *Node) { unsigned N = ComputeMemOperandsEnd(Node); while (N && isa<MemOperandSDNode>(Node->getOperand(N - 1).Val)) - --N; // Ignore MemOperand nodes + --N; // Ignore MEMOPERAND nodes return N; } @@ -656,7 +656,7 @@ void ScheduleDAG::AddOperand(MachineInstr *MI, SDOperand Op, } -void ScheduleDAG::AddMemOperand(MachineInstr *MI, const MemOperand &MO) { +void ScheduleDAG::AddMemOperand(MachineInstr *MI, const MachineMemOperand &MO) { MI->addMemOperand(MO); } diff --git a/lib/CodeGen/SelectionDAG/SelectionDAG.cpp b/lib/CodeGen/SelectionDAG/SelectionDAG.cpp index a3a0c82e78..a1d6c779b9 100644 --- a/lib/CodeGen/SelectionDAG/SelectionDAG.cpp +++ b/lib/CodeGen/SelectionDAG/SelectionDAG.cpp @@ -385,7 +385,7 @@ static void AddNodeIDNode(FoldingSetNodeID &ID, SDNode *N) { ID.AddPointer(cast<SrcValueSDNode>(N)->getValue()); break; case ISD::MEMOPERAND: { - const MemOperand &MO = cast<MemOperandSDNode>(N)->MO; + const MachineMemOperand &MO = cast<MemOperandSDNode>(N)->MO; ID.AddPointer(MO.getValue()); ID.AddInteger(MO.getFlags()); ID.AddInteger(MO.getOffset()); @@ -1014,7 +1014,7 @@ SDOperand SelectionDAG::getSrcValue(const Value *V) { return SDOperand(N, 0); } -SDOperand SelectionDAG::getMemOperand(const MemOperand &MO) { +SDOperand SelectionDAG::getMemOperand(const MachineMemOperand &MO) { const Value *v = MO.getValue(); assert((!v || isa<PointerType>(v->getType())) && "SrcValue is not a pointer?"); @@ -3635,24 +3635,25 @@ GlobalAddressSDNode::GlobalAddressSDNode(bool isTarget, const GlobalValue *GA, TheGlobal = const_cast<GlobalValue*>(GA); } -/// getMemOperand - Return a MemOperand object describing the memory +/// getMemOperand - Return a MachineMemOperand object describing the memory /// reference performed by this load or store. -MemOperand LSBaseSDNode::getMemOperand() const { +MachineMemOperand LSBaseSDNode::getMemOperand() const { int Size = (MVT::getSizeInBits(getMemoryVT()) + 7) >> 3; int Flags = - getOpcode() == ISD::LOAD ? MemOperand::MOLoad : MemOperand::MOStore; - if (IsVolatile) Flags |= MemOperand::MOVolatile; + getOpcode() == ISD::LOAD ? MachineMemOperand::MOLoad : + MachineMemOperand::MOStore; + if (IsVolatile) Flags |= MachineMemOperand::MOVolatile; // Check if the load references a frame index, and does not have // an SV attached. const FrameIndexSDNode *FI = dyn_cast<const FrameIndexSDNode>(getBasePtr().Val); if (!getSrcValue() && FI) - return MemOperand(PseudoSourceValue::getFixedStack(), Flags, - FI->getIndex(), Size, Alignment); + return MachineMemOperand(PseudoSourceValue::getFixedStack(), Flags, + FI->getIndex(), Size, Alignment); else - return MemOperand(getSrcValue(), Flags, - getSrcValueOffset(), Size, Alignment); + return MachineMemOperand(getSrcValue(), Flags, + getSrcValueOffset(), Size, Alignment); } /// Profile - Gather unique data for the node. diff --git a/lib/Target/PowerPC/PPCISelLowering.cpp b/lib/Target/PowerPC/PPCISelLowering.cpp index f307184561..ddc8e1a785 100644 --- a/lib/Target/PowerPC/PPCISelLowering.cpp +++ b/lib/Target/PowerPC/PPCISelLowering.cpp @@ -2500,8 +2500,8 @@ SDOperand PPCTargetLowering::LowerSINT_TO_FP(SDOperand Op, SelectionDAG &DAG) { Op.getOperand(0)); // STD the extended value into the stack slot. - MemOperand MO(PseudoSourceValue::getFixedStack(), - MemOperand::MOStore, FrameIdx, 8, 8); + MachineMemOperand MO(PseudoSourceValue::getFixedStack(), + MachineMemOperand::MOStore, FrameIdx, 8, 8); SDOperand Store = DAG.getNode(PPCISD::STD_32, MVT::Other, DAG.getEntryNode(), Ext64, FIdx, DAG.getMemOperand(MO)); diff --git a/lib/Target/X86/X86InstrInfo.cpp b/lib/Target/X86/X86InstrInfo.cpp index c9de586e78..eaf58b39e2 100644 --- a/lib/Target/X86/X86InstrInfo.cpp +++ b/lib/Target/X86/X86InstrInfo.cpp @@ -1930,7 +1930,7 @@ MachineInstr* X86InstrInfo::foldMemoryOperand(MachineFunction &MF, unsigned Alignment = 0; for (unsigned i = 0, e = LoadMI->getNumMemOperands(); i != e; ++i) { - const MemOperand &MRO = LoadMI->getMemOperand(i); + const MachineMemOperand &MRO = LoadMI->getMemOperand(i); unsigned Align = MRO.getAlignment(); if (Align > Alignment) Alignment = Align; |