6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-09-27 16:17:17 +00:00
Code Issues Projects Releases Wiki Activity

Fix reversed logic in getRegsUsed. Rename RegStates to RegsAvailable to

Browse Source 
hopefully forestall similar errors.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@35362 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Dale Johannesen
2007-03-26 22:23:54 +00:00
parent 0e5444bb20
commit c6b9ef80a8
2 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
include/llvm/CodeGen/RegisterScavenging.h
View File

@@ -47,10 +47,10 @@ class RegScavenger {
/// ///
const TargetRegisterClass *ScavengedRC; const TargetRegisterClass *ScavengedRC;
/// RegStates - The current state of all the physical registers immediately /// RegsAvailable - The current state of all the physical registers immediately
/// before MBBI. One bit per physical register. If bit is set that means it's /// before MBBI. One bit per physical register. If bit is set that means it's
/// available, unset means the register is currently being used. /// available, unset means the register is currently being used.
BitVector RegStates; BitVector RegsAvailable;
public: public:
RegScavenger() RegScavenger()
@@ -88,18 +88,18 @@ public:
/// isUsed / isUsed - Test if a register is currently being used. /// isUsed / isUsed - Test if a register is currently being used.
/// ///
bool isUsed(unsigned Reg) const { return !RegStates[Reg]; } bool isUsed(unsigned Reg) const { return !RegsAvailable[Reg]; }
bool isUnused(unsigned Reg) const { return RegStates[Reg]; } bool isUnused(unsigned Reg) const { return RegsAvailable[Reg]; }
/// getRegsUsed - return all registers currently in use in used. /// getRegsUsed - return all registers currently in use in used.
void getRegsUsed(BitVector &used, bool includeReserved); void getRegsUsed(BitVector &used, bool includeReserved);
/// setUsed / setUnused - Mark the state of one or a number of registers. /// setUsed / setUnused - Mark the state of one or a number of registers.
/// ///
void setUsed(unsigned Reg) { RegStates.reset(Reg); } void setUsed(unsigned Reg) { RegsAvailable.reset(Reg); }
void setUsed(BitVector Regs) { RegStates &= ~Regs; } void setUsed(BitVector Regs) { RegsAvailable &= ~Regs; }
void setUnused(unsigned Reg) { RegStates.set(Reg); } void setUnused(unsigned Reg) { RegsAvailable.set(Reg); }
void setUnused(BitVector Regs) { RegStates |= Regs; } void setUnused(BitVector Regs) { RegsAvailable |= Regs; }
/// FindUnusedReg - Find a unused register of the specified register class /// FindUnusedReg - Find a unused register of the specified register class
/// from the specified set of registers. It return 0 is none is found. /// from the specified set of registers. It return 0 is none is found.

30
lib/CodeGen/RegisterScavenging.cpp
View File

@@ -36,7 +36,7 @@ void RegScavenger::enterBasicBlock(MachineBasicBlock *mbb) {
if (!MBB) { if (!MBB) {
NumPhysRegs = RegInfo->getNumRegs(); NumPhysRegs = RegInfo->getNumRegs();
RegStates.resize(NumPhysRegs); RegsAvailable.resize(NumPhysRegs);
// Create reserved registers bitvector. // Create reserved registers bitvector.
ReservedRegs = RegInfo->getReservedRegs(MF); ReservedRegs = RegInfo->getReservedRegs(MF);
@@ -54,10 +54,10 @@ void RegScavenger::enterBasicBlock(MachineBasicBlock *mbb) {
ScavengedRC = NULL; ScavengedRC = NULL;
// All registers started out unused. // All registers started out unused.
RegStates.set(); RegsAvailable.set();
// Reserved registers are always used. // Reserved registers are always used.
RegStates ^= ReservedRegs; RegsAvailable ^= ReservedRegs;
// Live-in registers are in use. // Live-in registers are in use.
if (!MBB->livein_empty()) if (!MBB->livein_empty())
@@ -182,9 +182,9 @@ void RegScavenger::backward() {
void RegScavenger::getRegsUsed(BitVector &used, bool includeReserved) { void RegScavenger::getRegsUsed(BitVector &used, bool includeReserved) {
if (includeReserved) if (includeReserved)
used = RegStates; used = ~RegsAvailable;
else else
used = RegStates & ~ReservedRegs; used = ~RegsAvailable & ~ReservedRegs;
} }
/// CreateRegClassMask - Set the bits that represent the registers in the /// CreateRegClassMask - Set the bits that represent the registers in the
@@ -198,32 +198,32 @@ static void CreateRegClassMask(const TargetRegisterClass *RC, BitVector &Mask) {
unsigned RegScavenger::FindUnusedReg(const TargetRegisterClass *RegClass, unsigned RegScavenger::FindUnusedReg(const TargetRegisterClass *RegClass,
const BitVector &Candidates) const { const BitVector &Candidates) const {
// Mask off the registers which are not in the TargetRegisterClass. // Mask off the registers which are not in the TargetRegisterClass.
BitVector RegStatesCopy(NumPhysRegs, false); BitVector RegsAvailableCopy(NumPhysRegs, false);
CreateRegClassMask(RegClass, RegStatesCopy); CreateRegClassMask(RegClass, RegsAvailableCopy);
RegStatesCopy &= RegStates; RegsAvailableCopy &= RegsAvailable;
// Restrict the search to candidates. // Restrict the search to candidates.
RegStatesCopy &= Candidates; RegsAvailableCopy &= Candidates;
// Returns the first unused (bit is set) register, or 0 is none is found. // Returns the first unused (bit is set) register, or 0 is none is found.
int Reg = RegStatesCopy.find_first(); int Reg = RegsAvailableCopy.find_first();
return (Reg == -1) ? 0 : Reg; return (Reg == -1) ? 0 : Reg;
} }
unsigned RegScavenger::FindUnusedReg(const TargetRegisterClass *RegClass, unsigned RegScavenger::FindUnusedReg(const TargetRegisterClass *RegClass,
bool ExCalleeSaved) const { bool ExCalleeSaved) const {
// Mask off the registers which are not in the TargetRegisterClass. // Mask off the registers which are not in the TargetRegisterClass.
BitVector RegStatesCopy(NumPhysRegs, false); BitVector RegsAvailableCopy(NumPhysRegs, false);
CreateRegClassMask(RegClass, RegStatesCopy); CreateRegClassMask(RegClass, RegsAvailableCopy);
RegStatesCopy &= RegStates; RegsAvailableCopy &= RegsAvailable;
// If looking for a non-callee-saved register, mask off all the callee-saved // If looking for a non-callee-saved register, mask off all the callee-saved
// registers. // registers.
if (ExCalleeSaved) if (ExCalleeSaved)
RegStatesCopy &= ~CalleeSavedRegs; RegsAvailableCopy &= ~CalleeSavedRegs;
// Returns the first unused (bit is set) register, or 0 is none is found. // Returns the first unused (bit is set) register, or 0 is none is found.
int Reg = RegStatesCopy.find_first(); int Reg = RegsAvailableCopy.find_first();
return (Reg == -1) ? 0 : Reg; return (Reg == -1) ? 0 : Reg;
} }