replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Reverse order of memory arguments 

llvm-svn: 70734
This commit is contained in:
Anton Korobeynikov 2009-05-03 13:09:40 +00:00
parent 04888305f6
commit ed65671768
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
llvm/lib/Target/MSP430/MSP430AsmPrinter.cpp
View File

@ -161,22 +161,22 @@ void MSP430AsmPrinter::printOperand(const MachineInstr *MI, int OpNum,
void MSP430AsmPrinter::printSrcMemOperand(const MachineInstr *MI, int OpNum,
const char* Modifier) {
const MachineOperand &Disp = MI->getOperand(OpNum);
const MachineOperand &Base = MI->getOperand(OpNum+1);
const MachineOperand &Base = MI->getOperand(OpNum);
const MachineOperand &Disp = MI->getOperand(OpNum+1);
if (Disp.isGlobal())
if (Base.isGlobal())
printOperand(MI, OpNum, "mem");
else if (Disp.isImm() && !Base.getReg())
printOperand(MI, OpNum);
else if (Base.getReg()) {
if (Disp.getImm()) {
printOperand(MI, OpNum, "nohash");
printOperand(MI, OpNum + 1, "nohash");
O << '(';
printOperand(MI, OpNum + 1);
printOperand(MI, OpNum);
O << ')';
} else {
O << '@';
printOperand(MI, OpNum + 1);
printOperand(MI, OpNum);
}
} else
assert(0 && "Unsupported memory operand");

12
llvm/lib/Target/MSP430/MSP430ISelDAGToDAG.cpp
View File

@ -57,7 +57,7 @@ namespace {
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 @@ FunctionPass *llvm::createMSP430ISelDag(MSP430TargetMachine &TM) {
// 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 @@ bool MSP430DAGToDAGISel::SelectAddr(SDValue Op, SDValue Addr,
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;
}

4
llvm/lib/Target/MSP430/MSP430InstrInfo.td
View File

@ -52,12 +52,12 @@ def MSP430Wrapper : SDNode<"MSP430ISD::Wrapper", SDT_MSP430Wrapper>;
// Address operands
def memsrc : Operand<i16> {
let PrintMethod = "printSrcMemOperand";
let MIOperandInfo = (ops i16imm, GR16);
let MIOperandInfo = (ops GR16, i16imm);
}
def memdst : Operand<i16> {
let PrintMethod = "printSrcMemOperand";
let MIOperandInfo = (ops i16imm, GR16);
let MIOperandInfo = (ops GR16, i16imm);
}