diff options
| -rw-r--r-- | lib/Target/ARM/ARMISelDAGToDAG.cpp | 4 | ||||
| -rw-r--r-- | lib/Target/ARM/ARMInstrInfo.td | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/lib/Target/ARM/ARMISelDAGToDAG.cpp b/lib/Target/ARM/ARMISelDAGToDAG.cpp index beb0d6775a..4e41717348 100644 --- a/lib/Target/ARM/ARMISelDAGToDAG.cpp +++ b/lib/Target/ARM/ARMISelDAGToDAG.cpp @@ -284,8 +284,8 @@ static SDOperand LowerCALL(SDOperand Op, SelectionDAG &DAG) { Ops.push_back(DAG.getRegister(Reg2, MVT::i32)); SDVTList VTs = DAG.getVTList(MVT::Other, MVT::Flag); - SDOperand Ops[] = {Chain, SDReg1, SDReg2, Arg}; //missing flag - Chain = DAG.getNode(ARMISD::FMRRD, VTs, Ops, 4); + SDOperand Ops[] = {Chain, SDReg1, SDReg2, Arg, InFlag}; + Chain = DAG.getNode(ARMISD::FMRRD, VTs, Ops, InFlag.Val ? 5 : 4); } else { if (VT == MVT::f32) Arg = DAG.getNode(ISD::BIT_CONVERT, MVT::i32, Arg); diff --git a/lib/Target/ARM/ARMInstrInfo.td b/lib/Target/ARM/ARMInstrInfo.td index cf08487b3c..cbdc5b9628 100644 --- a/lib/Target/ARM/ARMInstrInfo.td +++ b/lib/Target/ARM/ARMInstrInfo.td @@ -78,7 +78,8 @@ def armfsitos : SDNode<"ARMISD::FSITOS", SDTUnaryOp>; def armfsitod : SDNode<"ARMISD::FSITOD", SDTUnaryOp>; def SDTarmfmrrd : SDTypeProfile<0, 3, [SDTCisInt<0>, SDTCisInt<1>, SDTCisFP<2>]>; -def armfmrrd : SDNode<"ARMISD::FMRRD", SDTarmfmrrd, [SDNPHasChain, SDNPOutFlag]>; +def armfmrrd : SDNode<"ARMISD::FMRRD", SDTarmfmrrd, + [SDNPHasChain, SDNPOptInFlag, SDNPOutFlag]>; def SDTarmfmdrr : SDTypeProfile<1, 2, [SDTCisFP<0>, SDTCisInt<1>, SDTCisInt<2>]>; def armfmdrr : SDNode<"ARMISD::FMDRR", SDTarmfmdrr, []>; |