From 56524948c51dae09ecc4f56d1510e7a38021f7eb Mon Sep 17 00:00:00 2001 From: shylie Date: Mon, 8 Dec 2025 13:29:43 -0500 Subject: [PATCH] Fix global variables. --- llvm/lib/Target/Foot/FootISelDAGToDAG.cpp | 62 +---------------------- llvm/lib/Target/Foot/FootISelLowering.cpp | 1 + 2 files changed, 2 insertions(+), 61 deletions(-) diff --git a/llvm/lib/Target/Foot/FootISelDAGToDAG.cpp b/llvm/lib/Target/Foot/FootISelDAGToDAG.cpp index f8d3c55c7dcf..67042c77c4e9 100644 --- a/llvm/lib/Target/Foot/FootISelDAGToDAG.cpp +++ b/llvm/lib/Target/Foot/FootISelDAGToDAG.cpp @@ -113,9 +113,6 @@ void FootDAGToDAGISel::SelectAdd(SDNode *N, SDLoc &Loc) { if (isa(LHS.getNode())) { LHS_AddrMode = FOOT_ADDRMODE_I; } - else if (isa(LHS.getNode())) { - LHS_AddrMode = FOOT_ADDRMODE_I; - } else if (ConstantSDNode *CN = DoesConstantFitImm(LHS.getNode())) { LHS = CurDAG->getTargetConstant(CN->getSExtValue(), Loc, MVT::i32); LHS_AddrMode = FOOT_ADDRMODE_M; @@ -126,9 +123,6 @@ void FootDAGToDAGISel::SelectAdd(SDNode *N, SDLoc &Loc) { if (isa(RHS.getNode())) { RHS_AddrMode = FOOT_ADDRMODE_I; } - else if (isa(RHS.getNode())) { - RHS_AddrMode = FOOT_ADDRMODE_I; - } else if (ConstantSDNode *CN = DoesConstantFitImm(RHS.getNode())) { RHS = CurDAG->getTargetConstant(CN->getSExtValue(), Loc, MVT::i32); RHS_AddrMode = FOOT_ADDRMODE_M; @@ -176,9 +170,6 @@ void FootDAGToDAGISel::SelectSub(SDNode *N, SDLoc &Loc) { if (isa(LHS.getNode())) { LHS_AddrMode = FOOT_ADDRMODE_I; } - else if (isa(LHS.getNode())) { - LHS_AddrMode = FOOT_ADDRMODE_I; - } else if (ConstantSDNode *CN = DoesConstantFitImm(LHS.getNode())) { LHS = CurDAG->getTargetConstant(CN->getSExtValue(), Loc, MVT::i32); LHS_AddrMode = FOOT_ADDRMODE_M; @@ -189,9 +180,6 @@ void FootDAGToDAGISel::SelectSub(SDNode *N, SDLoc &Loc) { if (isa(RHS.getNode())) { RHS_AddrMode = FOOT_ADDRMODE_I; } - else if (isa(RHS.getNode())) { - RHS_AddrMode = FOOT_ADDRMODE_I; - } else if (ConstantSDNode *CN = DoesConstantFitImm(RHS.getNode())) { RHS = CurDAG->getTargetConstant(CN->getSExtValue(), Loc, MVT::i32); RHS_AddrMode = FOOT_ADDRMODE_M; @@ -239,9 +227,6 @@ void FootDAGToDAGISel::SelectMul(SDNode *N, SDLoc &Loc) { if (isa(LHS.getNode())) { LHS_AddrMode = FOOT_ADDRMODE_I; } - else if (isa(LHS.getNode())) { - LHS_AddrMode = FOOT_ADDRMODE_I; - } else if (ConstantSDNode *CN = DoesConstantFitImm(LHS.getNode())) { LHS = CurDAG->getTargetConstant(CN->getSExtValue(), Loc, MVT::i32); LHS_AddrMode = FOOT_ADDRMODE_M; @@ -252,9 +237,6 @@ void FootDAGToDAGISel::SelectMul(SDNode *N, SDLoc &Loc) { if (isa(RHS.getNode())) { RHS_AddrMode = FOOT_ADDRMODE_I; } - else if (isa(RHS.getNode())) { - RHS_AddrMode = FOOT_ADDRMODE_I; - } else if (ConstantSDNode *CN = DoesConstantFitImm(RHS.getNode())) { RHS = CurDAG->getTargetConstant(CN->getSExtValue(), Loc, MVT::i32); RHS_AddrMode = FOOT_ADDRMODE_M; @@ -302,9 +284,6 @@ void FootDAGToDAGISel::SelectSrem(SDNode *N, SDLoc &Loc) { if (isa(LHS.getNode())) { LHS_AddrMode = FOOT_ADDRMODE_I; } - else if (isa(LHS.getNode())) { - LHS_AddrMode = FOOT_ADDRMODE_I; - } else if (ConstantSDNode *CN = DoesConstantFitImm(LHS.getNode())) { LHS = CurDAG->getTargetConstant(CN->getSExtValue(), Loc, MVT::i32); LHS_AddrMode = FOOT_ADDRMODE_M; @@ -315,9 +294,6 @@ void FootDAGToDAGISel::SelectSrem(SDNode *N, SDLoc &Loc) { if (isa(RHS.getNode())) { RHS_AddrMode = FOOT_ADDRMODE_I; } - else if (isa(RHS.getNode())) { - RHS_AddrMode = FOOT_ADDRMODE_I; - } else if (ConstantSDNode *CN = DoesConstantFitImm(RHS.getNode())) { RHS = CurDAG->getTargetConstant(CN->getSExtValue(), Loc, MVT::i32); RHS_AddrMode = FOOT_ADDRMODE_M; @@ -365,9 +341,6 @@ void FootDAGToDAGISel::SelectOr(SDNode *N, SDLoc &Loc) { if (isa(LHS.getNode())) { LHS_AddrMode = FOOT_ADDRMODE_I; } - else if (isa(LHS.getNode())) { - LHS_AddrMode = FOOT_ADDRMODE_I; - } else if (ConstantSDNode *CN = DoesConstantFitImm(LHS.getNode())) { LHS = CurDAG->getTargetConstant(CN->getSExtValue(), Loc, MVT::i32); LHS_AddrMode = FOOT_ADDRMODE_M; @@ -378,9 +351,6 @@ void FootDAGToDAGISel::SelectOr(SDNode *N, SDLoc &Loc) { if (isa(RHS.getNode())) { RHS_AddrMode = FOOT_ADDRMODE_I; } - else if (isa(RHS.getNode())) { - RHS_AddrMode = FOOT_ADDRMODE_I; - } else if (ConstantSDNode *CN = DoesConstantFitImm(RHS.getNode())) { RHS = CurDAG->getTargetConstant(CN->getSExtValue(), Loc, MVT::i32); RHS_AddrMode = FOOT_ADDRMODE_M; @@ -428,9 +398,6 @@ void FootDAGToDAGISel::SelectAnd(SDNode *N, SDLoc &Loc) { if (isa(LHS.getNode())) { LHS_AddrMode = FOOT_ADDRMODE_I; } - else if (isa(LHS.getNode())) { - LHS_AddrMode = FOOT_ADDRMODE_I; - } else if (ConstantSDNode *CN = DoesConstantFitImm(LHS.getNode())) { LHS = CurDAG->getTargetConstant(CN->getSExtValue(), Loc, MVT::i32); LHS_AddrMode = FOOT_ADDRMODE_M; @@ -441,9 +408,6 @@ void FootDAGToDAGISel::SelectAnd(SDNode *N, SDLoc &Loc) { if (isa(RHS.getNode())) { RHS_AddrMode = FOOT_ADDRMODE_I; } - else if (isa(RHS.getNode())) { - RHS_AddrMode = FOOT_ADDRMODE_I; - } else if (ConstantSDNode *CN = DoesConstantFitImm(RHS.getNode())) { RHS = CurDAG->getTargetConstant(CN->getSExtValue(), Loc, MVT::i32); RHS_AddrMode = FOOT_ADDRMODE_M; @@ -491,9 +455,6 @@ void FootDAGToDAGISel::SelectXor(SDNode *N, SDLoc &Loc) { if (isa(LHS.getNode())) { LHS_AddrMode = FOOT_ADDRMODE_I; } - else if (isa(LHS.getNode())) { - LHS_AddrMode = FOOT_ADDRMODE_I; - } else if (ConstantSDNode *CN = DoesConstantFitImm(LHS.getNode())) { LHS = CurDAG->getTargetConstant(CN->getSExtValue(), Loc, MVT::i32); LHS_AddrMode = FOOT_ADDRMODE_M; @@ -504,9 +465,6 @@ void FootDAGToDAGISel::SelectXor(SDNode *N, SDLoc &Loc) { if (isa(RHS.getNode())) { RHS_AddrMode = FOOT_ADDRMODE_I; } - else if (isa(RHS.getNode())) { - RHS_AddrMode = FOOT_ADDRMODE_I; - } else if (ConstantSDNode *CN = DoesConstantFitImm(RHS.getNode())) { RHS = CurDAG->getTargetConstant(CN->getSExtValue(), Loc, MVT::i32); RHS_AddrMode = FOOT_ADDRMODE_M; @@ -554,9 +512,6 @@ void FootDAGToDAGISel::SelectShl(SDNode *N, SDLoc &Loc) { if (isa(LHS.getNode())) { LHS_AddrMode = FOOT_ADDRMODE_I; } - else if (isa(LHS.getNode())) { - LHS_AddrMode = FOOT_ADDRMODE_I; - } else if (ConstantSDNode *CN = DoesConstantFitImm(LHS.getNode())) { LHS = CurDAG->getTargetConstant(CN->getSExtValue(), Loc, MVT::i32); LHS_AddrMode = FOOT_ADDRMODE_M; @@ -567,9 +522,6 @@ void FootDAGToDAGISel::SelectShl(SDNode *N, SDLoc &Loc) { if (isa(RHS.getNode())) { RHS_AddrMode = FOOT_ADDRMODE_I; } - else if (isa(RHS.getNode())) { - RHS_AddrMode = FOOT_ADDRMODE_I; - } else if (ConstantSDNode *CN = DoesConstantFitImm(RHS.getNode())) { RHS = CurDAG->getTargetConstant(CN->getSExtValue(), Loc, MVT::i32); RHS_AddrMode = FOOT_ADDRMODE_M; @@ -617,9 +569,6 @@ void FootDAGToDAGISel::SelectSra(SDNode *N, SDLoc &Loc) { if (isa(LHS.getNode())) { LHS_AddrMode = FOOT_ADDRMODE_I; } - else if (isa(LHS.getNode())) { - LHS_AddrMode = FOOT_ADDRMODE_I; - } else if (ConstantSDNode *CN = DoesConstantFitImm(LHS.getNode())) { LHS = CurDAG->getTargetConstant(CN->getSExtValue(), Loc, MVT::i32); LHS_AddrMode = FOOT_ADDRMODE_M; @@ -630,9 +579,6 @@ void FootDAGToDAGISel::SelectSra(SDNode *N, SDLoc &Loc) { if (isa(RHS.getNode())) { RHS_AddrMode = FOOT_ADDRMODE_I; } - else if (isa(RHS.getNode())) { - RHS_AddrMode = FOOT_ADDRMODE_I; - } else if (ConstantSDNode *CN = DoesConstantFitImm(RHS.getNode())) { RHS = CurDAG->getTargetConstant(CN->getSExtValue(), Loc, MVT::i32); RHS_AddrMode = FOOT_ADDRMODE_M; @@ -679,10 +625,7 @@ void FootDAGToDAGISel::SelectSrl(SDNode *N, SDLoc &Loc) { if (isa(LHS.getNode())) { LHS_AddrMode = FOOT_ADDRMODE_I; - } - else if (isa(LHS.getNode())) { - LHS_AddrMode = FOOT_ADDRMODE_I; - } + } else if (ConstantSDNode *CN = DoesConstantFitImm(LHS.getNode())) { LHS = CurDAG->getTargetConstant(CN->getSExtValue(), Loc, MVT::i32); LHS_AddrMode = FOOT_ADDRMODE_M; @@ -693,9 +636,6 @@ void FootDAGToDAGISel::SelectSrl(SDNode *N, SDLoc &Loc) { if (isa(RHS.getNode())) { RHS_AddrMode = FOOT_ADDRMODE_I; } - else if (isa(RHS.getNode())) { - RHS_AddrMode = FOOT_ADDRMODE_I; - } else if (ConstantSDNode *CN = DoesConstantFitImm(RHS.getNode())) { RHS = CurDAG->getTargetConstant(CN->getSExtValue(), Loc, MVT::i32); RHS_AddrMode = FOOT_ADDRMODE_M; diff --git a/llvm/lib/Target/Foot/FootISelLowering.cpp b/llvm/lib/Target/Foot/FootISelLowering.cpp index b94aacbf823c..ac6485bc48bf 100644 --- a/llvm/lib/Target/Foot/FootISelLowering.cpp +++ b/llvm/lib/Target/Foot/FootISelLowering.cpp @@ -32,6 +32,7 @@ FootTargetLowering::FootTargetLowering(const TargetMachine &TM, setOperationAction(ISD::BR_CC, MVT::i32, Custom); setOperationAction(ISD::UMUL_LOHI, MVT::i32, Expand); + setOperationAction(ISD::SETCC, MVT::i32, Expand); computeRegisterProperties(Subtarget.getRegisterInfo()); }