6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-08-08 19:25:47 +00:00
Code Issues Projects Releases Wiki Activity

Remove '4Virt' from member function names as it is obvious.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@11781 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Alkis Evlogimenos
2004-02-23 23:47:10 +00:00
parent 34d9bc9f16
commit 797428719f
2 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
lib/CodeGen/RegAllocLinearScan.cpp
View File

@@ -115,7 +115,7 @@ namespace {
std::cerr << "\t" << **i << " -> "; std::cerr << "\t" << **i << " -> ";
unsigned reg = (*i)->reg; unsigned reg = (*i)->reg;
if (MRegisterInfo::isVirtualRegister(reg)) { if (MRegisterInfo::isVirtualRegister(reg)) {
reg = vrm_->getPhys4Virt(reg); reg = vrm_->getPhys(reg);
} }
std::cerr << mri_->getName(reg) << '\n'; std::cerr << mri_->getName(reg) << '\n';
} }
@@ -218,7 +218,7 @@ bool RA::runOnMachineFunction(MachineFunction &fn) {
unsigned reg = (*i)->reg; unsigned reg = (*i)->reg;
DEBUG(std::cerr << "\tinterval " << **i << " expired\n"); DEBUG(std::cerr << "\tinterval " << **i << " expired\n");
if (MRegisterInfo::isVirtualRegister(reg)) if (MRegisterInfo::isVirtualRegister(reg))
reg = vrm_->getPhys4Virt(reg); reg = vrm_->getPhys(reg);
prt_->delRegUse(reg); prt_->delRegUse(reg);
} }
@@ -253,7 +253,7 @@ bool RA::runOnMachineFunction(MachineFunction &fn) {
if (op.isRegister() && if (op.isRegister() &&
MRegisterInfo::isVirtualRegister(op.getReg())) { MRegisterInfo::isVirtualRegister(op.getReg())) {
unsigned virtReg = op.getReg(); unsigned virtReg = op.getReg();
unsigned physReg = vrm_->getPhys4Virt(virtReg); unsigned physReg = vrm_->getPhys(virtReg);
DEBUG(std::cerr << "\t[reg" << virtReg DEBUG(std::cerr << "\t[reg" << virtReg
<< " -> " << mri_->getName(physReg) << ']'); << " -> " << mri_->getName(physReg) << ']');
mii->SetMachineOperandReg(i, physReg); mii->SetMachineOperandReg(i, physReg);
@@ -306,7 +306,7 @@ void RA::processActiveIntervals(IntervalPtrs::value_type cur)
if ((*i)->expiredAt(cur->start())) { if ((*i)->expiredAt(cur->start())) {
DEBUG(std::cerr << "\t\tinterval " << **i << " expired\n"); DEBUG(std::cerr << "\t\tinterval " << **i << " expired\n");
if (MRegisterInfo::isVirtualRegister(reg)) if (MRegisterInfo::isVirtualRegister(reg))
reg = vrm_->getPhys4Virt(reg); reg = vrm_->getPhys(reg);
prt_->delRegUse(reg); prt_->delRegUse(reg);
// remove from active // remove from active
i = active_.erase(i); i = active_.erase(i);
@@ -315,7 +315,7 @@ void RA::processActiveIntervals(IntervalPtrs::value_type cur)
else if (!(*i)->liveAt(cur->start())) { else if (!(*i)->liveAt(cur->start())) {
DEBUG(std::cerr << "\t\tinterval " << **i << " inactive\n"); DEBUG(std::cerr << "\t\tinterval " << **i << " inactive\n");
if (MRegisterInfo::isVirtualRegister(reg)) if (MRegisterInfo::isVirtualRegister(reg))
reg = vrm_->getPhys4Virt(reg); reg = vrm_->getPhys(reg);
prt_->delRegUse(reg); prt_->delRegUse(reg);
// add to inactive // add to inactive
inactive_.push_back(*i); inactive_.push_back(*i);
@@ -344,7 +344,7 @@ void RA::processInactiveIntervals(IntervalPtrs::value_type cur)
else if ((*i)->liveAt(cur->start())) { else if ((*i)->liveAt(cur->start())) {
DEBUG(std::cerr << "\t\tinterval " << **i << " active\n"); DEBUG(std::cerr << "\t\tinterval " << **i << " active\n");
if (MRegisterInfo::isVirtualRegister(reg)) if (MRegisterInfo::isVirtualRegister(reg))
reg = vrm_->getPhys4Virt(reg); reg = vrm_->getPhys(reg);
prt_->addRegUse(reg); prt_->addRegUse(reg);
// add to active // add to active
active_.push_back(*i); active_.push_back(*i);
@@ -377,7 +377,7 @@ void RA::assignRegOrStackSlotAtInterval(IntervalPtrs::value_type cur)
i != e; ++i) { i != e; ++i) {
unsigned reg = (*i)->reg; unsigned reg = (*i)->reg;
if (MRegisterInfo::isVirtualRegister(reg)) if (MRegisterInfo::isVirtualRegister(reg))
reg = vrm_->getPhys4Virt(reg); reg = vrm_->getPhys(reg);
updateSpillWeights(reg, (*i)->weight); updateSpillWeights(reg, (*i)->weight);
} }
@@ -388,7 +388,7 @@ void RA::assignRegOrStackSlotAtInterval(IntervalPtrs::value_type cur)
if (cur->overlaps(**i)) { if (cur->overlaps(**i)) {
unsigned reg = (*i)->reg; unsigned reg = (*i)->reg;
if (MRegisterInfo::isVirtualRegister(reg)) if (MRegisterInfo::isVirtualRegister(reg))
reg = vrm_->getPhys4Virt(reg); reg = vrm_->getPhys(reg);
prt_->addRegUse(reg); prt_->addRegUse(reg);
updateSpillWeights(reg, (*i)->weight); updateSpillWeights(reg, (*i)->weight);
} }
@@ -478,7 +478,7 @@ void RA::assignRegOrStackSlotAtInterval(IntervalPtrs::value_type cur)
for (IntervalPtrs::iterator i = active_.begin(); i != active_.end(); ++i) { for (IntervalPtrs::iterator i = active_.begin(); i != active_.end(); ++i) {
unsigned reg = (*i)->reg; unsigned reg = (*i)->reg;
if (MRegisterInfo::isVirtualRegister(reg) && if (MRegisterInfo::isVirtualRegister(reg) &&
toSpill[vrm_->getPhys4Virt(reg)] && toSpill[vrm_->getPhys(reg)] &&
cur->overlaps(**i)) { cur->overlaps(**i)) {
DEBUG(std::cerr << "\t\t\tspilling(a): " << **i << '\n'); DEBUG(std::cerr << "\t\t\tspilling(a): " << **i << '\n');
earliestStart = std::min(earliestStart, (*i)->start()); earliestStart = std::min(earliestStart, (*i)->start());
@@ -491,7 +491,7 @@ void RA::assignRegOrStackSlotAtInterval(IntervalPtrs::value_type cur)
i != inactive_.end(); ++i) { i != inactive_.end(); ++i) {
unsigned reg = (*i)->reg; unsigned reg = (*i)->reg;
if (MRegisterInfo::isVirtualRegister(reg) && if (MRegisterInfo::isVirtualRegister(reg) &&
toSpill[vrm_->getPhys4Virt(reg)] && toSpill[vrm_->getPhys(reg)] &&
cur->overlaps(**i)) { cur->overlaps(**i)) {
DEBUG(std::cerr << "\t\t\tspilling(i): " << **i << '\n'); DEBUG(std::cerr << "\t\t\tspilling(i): " << **i << '\n');
earliestStart = std::min(earliestStart, (*i)->start()); earliestStart = std::min(earliestStart, (*i)->start());
@@ -519,7 +519,7 @@ void RA::assignRegOrStackSlotAtInterval(IntervalPtrs::value_type cur)
prt_->delRegUse(i->reg); prt_->delRegUse(i->reg);
} }
else { else {
prt_->delRegUse(vrm_->getPhys4Virt(i->reg)); prt_->delRegUse(vrm_->getPhys(i->reg));
vrm_->clearVirtReg(i->reg); vrm_->clearVirtReg(i->reg);
if (i->spilled()) { if (i->spilled()) {
if (!i->empty()) { if (!i->empty()) {
@@ -575,7 +575,7 @@ void RA::assignRegOrStackSlotAtInterval(IntervalPtrs::value_type cur)
if (MRegisterInfo::isPhysicalRegister((*i)->reg)) if (MRegisterInfo::isPhysicalRegister((*i)->reg))
prt_->addRegUse((*i)->reg); prt_->addRegUse((*i)->reg);
else else
prt_->addRegUse(vrm_->getPhys4Virt((*i)->reg)); prt_->addRegUse(vrm_->getPhys((*i)->reg));
} }
} }
} }

6
lib/CodeGen/VirtRegMap.h
View File

@@ -28,7 +28,7 @@ namespace llvm {
public: public:
typedef std::vector<unsigned> Virt2PhysMap; typedef std::vector<unsigned> Virt2PhysMap;
typedef std::vector<int> Virt2StackSlotMap; typedef std::vector<int> Virt2StackSlotMap;
enum { enum {
NO_PHYS_REG = 0, NO_PHYS_REG = 0,
NO_STACK_SLOT = INT_MAX NO_STACK_SLOT = INT_MAX
@@ -57,7 +57,7 @@ namespace llvm {
v2ssMap_(mf.getSSARegMap()->getNumVirtualRegs(), NO_STACK_SLOT) { v2ssMap_(mf.getSSARegMap()->getNumVirtualRegs(), NO_STACK_SLOT) {
} }
unsigned getPhys4Virt(unsigned virtReg) const { unsigned getPhys(unsigned virtReg) const {
assert(MRegisterInfo::isVirtualRegister(virtReg)); assert(MRegisterInfo::isVirtualRegister(virtReg));
return v2pMap_[toIndex(virtReg)]; return v2pMap_[toIndex(virtReg)];
} }
@@ -78,7 +78,7 @@ namespace llvm {
v2pMap_[toIndex(virtReg)] = NO_PHYS_REG; v2pMap_[toIndex(virtReg)] = NO_PHYS_REG;
} }
int getStackSlot4Virt(unsigned virtReg) const { int getStackSlot(unsigned virtReg) const {
assert(MRegisterInfo::isVirtualRegister(virtReg)); assert(MRegisterInfo::isVirtualRegister(virtReg));
return v2ssMap_[toIndex(virtReg)]; return v2ssMap_[toIndex(virtReg)];
} }