Reverse order of memory arguments
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@70734 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Target/MSP430/MSP430ISelDAGToDAG.cpp b/lib/Target/MSP430/MSP430ISelDAGToDAG.cpp
index c057d69..7fc707b 100644
--- a/lib/Target/MSP430/MSP430ISelDAGToDAG.cpp
+++ b/lib/Target/MSP430/MSP430ISelDAGToDAG.cpp
@@ -57,7 +57,7 @@
private:
SDNode *Select(SDValue Op);
- bool SelectAddr(SDValue Op, SDValue Addr, SDValue &Disp, SDValue &Base);
+ bool SelectAddr(SDValue Op, SDValue Addr, SDValue &Base, SDValue &Disp);
#ifndef NDEBUG
unsigned Indent;
@@ -74,7 +74,7 @@
// FIXME: This is pretty dummy routine and needs to be rewritten in the future.
bool MSP430DAGToDAGISel::SelectAddr(SDValue Op, SDValue Addr,
- SDValue &Disp, SDValue &Base) {
+ SDValue &Base, SDValue &Disp) {
// We don't support frame index stuff yet.
if (isa<FrameIndexSDNode>(Addr))
return false;
@@ -100,17 +100,17 @@
case MSP430ISD::Wrapper:
SDValue N0 = Addr.getOperand(0);
if (GlobalAddressSDNode *G = dyn_cast<GlobalAddressSDNode>(N0)) {
- Base = CurDAG->getRegister(0, MVT::i16);
- Disp = CurDAG->getTargetGlobalAddress(G->getGlobal(),
+ Base = CurDAG->getTargetGlobalAddress(G->getGlobal(),
MVT::i16, G->getOffset());
+ Disp = CurDAG->getTargetConstant(0, MVT::i16);
return true;
}
break;
};
- Base = CurDAG->getRegister(0, MVT::i16);
- Disp = Addr;
+ Base = Addr;
+ Disp = CurDAG->getTargetConstant(0, MVT::i16);
return true;
}