From 739027ee4c0c8091858b2779d610b078b08c111e Mon Sep 17 00:00:00 2001 From: Andrew Lenharth Date: Mon, 16 Jan 2006 21:22:38 +0000 Subject: [PATCH] stack and rpcc git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@25369 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Target/Alpha/AlphaISelDAGToDAG.cpp | 36 ++++---------------------- lib/Target/Alpha/AlphaISelLowering.cpp | 5 +++- lib/Target/Alpha/AlphaInstrFormats.td | 5 ++-- 3 files changed, 11 insertions(+), 35 deletions(-) diff --git a/lib/Target/Alpha/AlphaISelDAGToDAG.cpp b/lib/Target/Alpha/AlphaISelDAGToDAG.cpp index 8a77c14f13f..e74dfd5865a 100644 --- a/lib/Target/Alpha/AlphaISelDAGToDAG.cpp +++ b/lib/Target/Alpha/AlphaISelDAGToDAG.cpp @@ -163,37 +163,6 @@ SDOperand AlphaDAGToDAGISel::Select(SDOperand Op) { case ISD::TAILCALL: case ISD::CALL: return SelectCALL(Op); - case ISD::DYNAMIC_STACKALLOC: { - if (!isa(N->getOperand(2)) || - cast(N->getOperand(2))->getValue() != 0) { - std::cerr << "Cannot allocate stack object with greater alignment than" - << " the stack alignment yet!"; - abort(); - } - - SDOperand Chain = Select(N->getOperand(0)); - SDOperand Amt = Select(N->getOperand(1)); - SDOperand Reg = CurDAG->getRegister(Alpha::R30, MVT::i64); - SDOperand Val = CurDAG->getCopyFromReg(Chain, Alpha::R30, MVT::i64); - Chain = Val.getValue(1); - - // Subtract the amount (guaranteed to be a multiple of the stack alignment) - // from the stack pointer, giving us the result pointer. - SDOperand Result = CurDAG->getTargetNode(Alpha::SUBQ, MVT::i64, Val, Amt); - - // Copy this result back into R30. - Chain = CurDAG->getNode(ISD::CopyToReg, MVT::Other, Chain, Reg, Result); - - // Copy this result back out of R30 to make sure we're not using the stack - // space without decrementing the stack pointer. - Result = CurDAG->getCopyFromReg(Chain, Alpha::R30, MVT::i64); - - // Finally, replace the DYNAMIC_STACKALLOC with the copyfromreg. - CodeGenMap[Op.getValue(0)] = Result; - CodeGenMap[Op.getValue(1)] = Result.getValue(1); - return SDOperand(Result.Val, Op.ResNo); - } - case ISD::FrameIndex: { int FI = cast(N)->getIndex(); return CurDAG->SelectNodeTo(N, Alpha::LDA, MVT::i64, @@ -218,6 +187,11 @@ SDOperand AlphaDAGToDAGISel::Select(SDOperand Op) { return CurDAG->SelectNodeTo(N, Alpha::BIS, MVT::i64, Chain, Chain); } + case ISD::READCYCLECOUNTER: { + SDOperand Chain = Select(N->getOperand(0)); //Select chain + return CurDAG->SelectNodeTo(N, Alpha::RPCC, MVT::i64, Chain); + } + case ISD::RET: { SDOperand Chain = Select(N->getOperand(0)); // Token chain. SDOperand InFlag; diff --git a/lib/Target/Alpha/AlphaISelLowering.cpp b/lib/Target/Alpha/AlphaISelLowering.cpp index 67e49c54f2d..7429416a2a9 100644 --- a/lib/Target/Alpha/AlphaISelLowering.cpp +++ b/lib/Target/Alpha/AlphaISelLowering.cpp @@ -112,7 +112,8 @@ AlphaTargetLowering::AlphaTargetLowering(TargetMachine &TM) : TargetLowering(TM) // Not implemented yet. setOperationAction(ISD::STACKSAVE, MVT::Other, Expand); setOperationAction(ISD::STACKRESTORE, MVT::Other, Expand); - + setOperationAction(ISD::DYNAMIC_STACKALLOC, MVT::i64, Expand); + // We want to legalize GlobalAddress and ConstantPool and // ExternalSymbols nodes into the appropriate instructions to // materialize the address. @@ -120,6 +121,8 @@ AlphaTargetLowering::AlphaTargetLowering(TargetMachine &TM) : TargetLowering(TM) setOperationAction(ISD::ConstantPool, MVT::i64, Custom); setOperationAction(ISD::ExternalSymbol, MVT::i64, Custom); + setStackPointerRegisterToSaveRestore(Alpha::R30); + addLegalFPImmediate(+0.0); //F31 addLegalFPImmediate(-0.0); //-F31 diff --git a/lib/Target/Alpha/AlphaInstrFormats.td b/lib/Target/Alpha/AlphaInstrFormats.td index 92248239320..88a405c509b 100644 --- a/lib/Target/Alpha/AlphaInstrFormats.td +++ b/lib/Target/Alpha/AlphaInstrFormats.td @@ -65,12 +65,11 @@ class MFormAlt opcode, string asmstr> let Inst{15-0} = disp; } class MfcForm opcode, bits<16> fc, string asmstr> - : InstAlpha { + : InstAlpha { bits<5> Ra; - bits<5> Rb; let Inst{25-21} = Ra; - let Inst{20-16} = Rb; + let Inst{20-16} = 0; let Inst{15-0} = fc; }