From f771a323c26217fba258e0f49c0ffffa6f261cab Mon Sep 17 00:00:00 2001 From: Evan Cheng Date: Thu, 1 Mar 2007 07:52:44 +0000 Subject: [PATCH] Switch from std::vector to BitVector. llvm-svn: 34781 --- lib/Target/ARM/ARMMachineFunctionInfo.h | 44 ++++++++++++++++++------- 1 file changed, 32 insertions(+), 12 deletions(-) diff --git a/lib/Target/ARM/ARMMachineFunctionInfo.h b/lib/Target/ARM/ARMMachineFunctionInfo.h index cf4c105fe17..87eda4b7e8d 100644 --- a/lib/Target/ARM/ARMMachineFunctionInfo.h +++ b/lib/Target/ARM/ARMMachineFunctionInfo.h @@ -17,6 +17,7 @@ #include "ARMSubtarget.h" #include "llvm/CodeGen/MachineFunction.h" #include "llvm/Target/TargetMachine.h" +#include "llvm/ADT/BitVector.h" namespace llvm { @@ -41,7 +42,7 @@ class ARMFunctionInfo : public MachineFunctionInfo { bool LRForceSpilled; /// R3IsLiveIn - True if R3 is live in to this function. - /// + /// FIXME: Remove when register scavenger for Thumb is done. bool R3IsLiveIn; /// FramePtrSpillOffset - If HasStackFrame, this records the frame pointer @@ -68,9 +69,9 @@ class ARMFunctionInfo : public MachineFunctionInfo { /// GPRCS1Frames, GPRCS2Frames, DPRCSFrames - Keeps track of frame indices /// which belong to these spill areas. - std::vector GPRCS1Frames; - std::vector GPRCS2Frames; - std::vector DPRCSFrames; + BitVector GPRCS1Frames; + BitVector GPRCS2Frames; + BitVector DPRCSFrames; /// JumpTableUId - Unique id for jumptables. /// @@ -82,14 +83,18 @@ public: VarArgsRegSaveSize(0), HasStackFrame(false), LRForceSpilled(false), R3IsLiveIn(false), FramePtrSpillOffset(0), GPRCS1Offset(0), GPRCS2Offset(0), DPRCSOffset(0), - GPRCS1Size(0), GPRCS2Size(0), DPRCSSize(0), JumpTableUId(0) {} + GPRCS1Size(0), GPRCS2Size(0), DPRCSSize(0), + GPRCS1Frames(32), GPRCS2Frames(32), DPRCSFrames(32), + JumpTableUId(0) {} ARMFunctionInfo(MachineFunction &MF) : isThumb(MF.getTarget().getSubtarget().isThumb()), VarArgsRegSaveSize(0), HasStackFrame(false), LRForceSpilled(false), R3IsLiveIn(false), FramePtrSpillOffset(0), GPRCS1Offset(0), GPRCS2Offset(0), DPRCSOffset(0), - GPRCS1Size(0), GPRCS2Size(0), DPRCSSize(0), JumpTableUId(0) {} + GPRCS1Size(0), GPRCS2Size(0), DPRCSSize(0), + GPRCS1Frames(32), GPRCS2Frames(32), DPRCSFrames(32), + JumpTableUId(0) {} bool isThumbFunction() const { return isThumb; } @@ -142,22 +147,37 @@ public: void addGPRCalleeSavedArea1Frame(int fi) { if (fi >= 0) { - if (fi >= (int)GPRCS1Frames.size()) - GPRCS1Frames.resize(fi+1); + int Size = GPRCS1Frames.size(); + if (fi >= Size) { + Size *= 2; + if (fi >= Size) + Size = fi+1; + GPRCS1Frames.resize(Size); + } GPRCS1Frames[fi] = true; } } void addGPRCalleeSavedArea2Frame(int fi) { if (fi >= 0) { - if (fi >= (int)GPRCS2Frames.size()) - GPRCS2Frames.resize(fi+1); + int Size = GPRCS2Frames.size(); + if (fi >= Size) { + Size *= 2; + if (fi >= Size) + Size = fi+1; + GPRCS2Frames.resize(Size); + } GPRCS2Frames[fi] = true; } } void addDPRCalleeSavedAreaFrame(int fi) { if (fi >= 0) { - if (fi >= (int)DPRCSFrames.size()) - DPRCSFrames.resize(fi+1); + int Size = DPRCSFrames.size(); + if (fi >= Size) { + Size *= 2; + if (fi >= Size) + Size = fi+1; + DPRCSFrames.resize(Size); + } DPRCSFrames[fi] = true; } }