From 6318ffd7361677e3b4487025538997ee01304452 Mon Sep 17 00:00:00 2001 From: Evan Cheng Date: Thu, 25 Jan 2007 03:07:27 +0000 Subject: [PATCH] Getting rid uses of evil std::set<> git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@33496 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Target/ARM/ARMAsmPrinter.cpp | 1 - lib/Target/ARM/ARMMachineFunctionInfo.h | 48 +++++++++++++++++-------- lib/Target/ARM/ARMRegisterInfo.h | 1 - 3 files changed, 33 insertions(+), 17 deletions(-) diff --git a/lib/Target/ARM/ARMAsmPrinter.cpp b/lib/Target/ARM/ARMAsmPrinter.cpp index 1ca8bfd75cf..3bdf3f967cc 100644 --- a/lib/Target/ARM/ARMAsmPrinter.cpp +++ b/lib/Target/ARM/ARMAsmPrinter.cpp @@ -37,7 +37,6 @@ #include "llvm/Support/MathExtras.h" #include #include -#include using namespace llvm; STATISTIC(EmittedInsts, "Number of machine instrs printed"); diff --git a/lib/Target/ARM/ARMMachineFunctionInfo.h b/lib/Target/ARM/ARMMachineFunctionInfo.h index 8de6bf85589..05dc0dccdeb 100644 --- a/lib/Target/ARM/ARMMachineFunctionInfo.h +++ b/lib/Target/ARM/ARMMachineFunctionInfo.h @@ -60,9 +60,9 @@ class ARMFunctionInfo : public MachineFunctionInfo { /// GPRCS1Frames, GPRCS2Frames, DPRCSFrames - Keeps track of frame indices /// which belong to these spill areas. - std::set GPRCS1Frames; - std::set GPRCS2Frames; - std::set DPRCSFrames; + std::vector GPRCS1Frames; + std::vector GPRCS2Frames; + std::vector DPRCSFrames; /// JumpTableUId - Unique id for jumptables. /// @@ -107,24 +107,42 @@ public: void setGPRCalleeSavedArea2Size(unsigned s) { GPRCS2Size = s; } void setDPRCalleeSavedAreaSize(unsigned s) { DPRCSSize = s; } - bool isGPRCalleeSavedArea1Frame(unsigned fi) const { - return GPRCS1Frames.count(fi); + bool isGPRCalleeSavedArea1Frame(int fi) const { + if (fi < 0 || fi >= (int)GPRCS1Frames.size()) + return false; + return GPRCS1Frames[fi]; } - bool isGPRCalleeSavedArea2Frame(unsigned fi) const { - return GPRCS2Frames.count(fi); + bool isGPRCalleeSavedArea2Frame(int fi) const { + if (fi < 0 || fi >= (int)GPRCS2Frames.size()) + return false; + return GPRCS2Frames[fi]; } - bool isDPRCalleeSavedAreaFrame(unsigned fi) const { - return DPRCSFrames.count(fi); + bool isDPRCalleeSavedAreaFrame(int fi) const { + if (fi < 0 || fi >= (int)DPRCSFrames.size()) + return false; + return DPRCSFrames[fi]; } - void addGPRCalleeSavedArea1Frame(unsigned fi) { - GPRCS1Frames.insert(fi); + void addGPRCalleeSavedArea1Frame(int fi) { + if (fi >= 0) { + if (fi >= (int)GPRCS1Frames.size()) + GPRCS1Frames.resize(fi+1); + GPRCS1Frames[fi] = true; + } } - void addGPRCalleeSavedArea2Frame(unsigned fi) { - GPRCS2Frames.insert(fi); + void addGPRCalleeSavedArea2Frame(int fi) { + if (fi >= 0) { + if (fi >= (int)GPRCS2Frames.size()) + GPRCS2Frames.resize(fi+1); + GPRCS2Frames[fi] = true; + } } - void addDPRCalleeSavedAreaFrame(unsigned fi) { - DPRCSFrames.insert(fi); + void addDPRCalleeSavedAreaFrame(int fi) { + if (fi >= 0) { + if (fi >= (int)DPRCSFrames.size()) + DPRCSFrames.resize(fi+1); + DPRCSFrames[fi] = true; + } } unsigned createJumpTableUId() { diff --git a/lib/Target/ARM/ARMRegisterInfo.h b/lib/Target/ARM/ARMRegisterInfo.h index 96a969856f9..e46da07b000 100644 --- a/lib/Target/ARM/ARMRegisterInfo.h +++ b/lib/Target/ARM/ARMRegisterInfo.h @@ -17,7 +17,6 @@ #include "llvm/Target/MRegisterInfo.h" #include "ARMGenRegisterInfo.h.inc" -#include namespace llvm { class TargetInstrInfo;