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

User a helper overload for a common pattern.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@146270 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Jakob Stoklund Olesen
2011-12-09 19:44:39 +00:00
parent b583e42265
commit 493ad6b95d
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lib/Target/ARM/ARMConstantIslandPass.cpp
View File

@@ -265,8 +265,6 @@ namespace {
bool DoDump = false); bool DoDump = false);
bool WaterIsInRange(unsigned UserOffset, MachineBasicBlock *Water, bool WaterIsInRange(unsigned UserOffset, MachineBasicBlock *Water,
CPUser &U); CPUser &U);
bool OffsetIsInRange(unsigned UserOffset, unsigned TrialOffset,
unsigned Disp, bool NegativeOK, bool IsSoImm = false);
bool BBIsInRange(MachineInstr *MI, MachineBasicBlock *BB, unsigned Disp); bool BBIsInRange(MachineInstr *MI, MachineBasicBlock *BB, unsigned Disp);
bool FixUpImmediateBr(MachineFunction &MF, ImmBranch &Br); bool FixUpImmediateBr(MachineFunction &MF, ImmBranch &Br);
bool FixUpConditionalBr(MachineFunction &MF, ImmBranch &Br); bool FixUpConditionalBr(MachineFunction &MF, ImmBranch &Br);
@@ -283,6 +281,14 @@ namespace {
unsigned GetOffsetOf(MachineInstr *MI) const; unsigned GetOffsetOf(MachineInstr *MI) const;
void dumpBBs(); void dumpBBs();
void verify(MachineFunction &MF); void verify(MachineFunction &MF);
bool OffsetIsInRange(unsigned UserOffset, unsigned TrialOffset,
unsigned Disp, bool NegativeOK, bool IsSoImm = false);
bool OffsetIsInRange(unsigned UserOffset, unsigned TrialOffset,
const CPUser &U) {
return OffsetIsInRange(UserOffset, TrialOffset,
U.MaxDisp, U.NegOk, U.IsSoImm);
}
}; };
char ARMConstantIslands::ID = 0; char ARMConstantIslands::ID = 0;
} }
@@ -886,7 +892,6 @@ bool ARMConstantIslands::OffsetIsInRange(unsigned UserOffset,
bool ARMConstantIslands::WaterIsInRange(unsigned UserOffset, bool ARMConstantIslands::WaterIsInRange(unsigned UserOffset,
MachineBasicBlock* Water, CPUser &U) { MachineBasicBlock* Water, CPUser &U) {
unsigned MaxDisp = U.MaxDisp;
unsigned CPEOffset = BBInfo[Water->getNumber()].postOffset(); unsigned CPEOffset = BBInfo[Water->getNumber()].postOffset();
// If the CPE is to be inserted before the instruction, that will raise // If the CPE is to be inserted before the instruction, that will raise
@@ -894,7 +899,7 @@ bool ARMConstantIslands::WaterIsInRange(unsigned UserOffset,
if (CPEOffset < UserOffset) if (CPEOffset < UserOffset)
UserOffset += U.CPEMI->getOperand(2).getImm(); UserOffset += U.CPEMI->getOperand(2).getImm();
return OffsetIsInRange(UserOffset, CPEOffset, MaxDisp, U.NegOk, U.IsSoImm); return OffsetIsInRange(UserOffset, CPEOffset, U);
} }
/// CPEIsInRange - Returns true if the distance between specific MI and /// CPEIsInRange - Returns true if the distance between specific MI and
@@ -1113,8 +1118,7 @@ void ARMConstantIslands::CreateNewWater(unsigned CPUserIndex,
// Thumb2, 2 on Thumb1. Possible Thumb1 alignment padding is allowed for // Thumb2, 2 on Thumb1. Possible Thumb1 alignment padding is allowed for
// inside OffsetIsInRange. // inside OffsetIsInRange.
if (BBHasFallthrough(UserMBB) && if (BBHasFallthrough(UserMBB) &&
OffsetIsInRange(UserOffset, OffsetOfNextBlock + (isThumb1 ? 2: 4), OffsetIsInRange(UserOffset, OffsetOfNextBlock + (isThumb1 ? 2: 4), U)) {
U.MaxDisp, U.NegOk, U.IsSoImm)) {
DEBUG(dbgs() << "Split at end of block\n"); DEBUG(dbgs() << "Split at end of block\n");
if (&UserMBB->back() == UserMI) if (&UserMBB->back() == UserMI)
assert(BBHasFallthrough(UserMBB) && "Expected a fallthrough BB!"); assert(BBHasFallthrough(UserMBB) && "Expected a fallthrough BB!");
@@ -1174,8 +1178,7 @@ void ARMConstantIslands::CreateNewWater(unsigned CPUserIndex,
MI = llvm::next(MI)) { MI = llvm::next(MI)) {
if (CPUIndex < NumCPUsers && CPUsers[CPUIndex].MI == MI) { if (CPUIndex < NumCPUsers && CPUsers[CPUIndex].MI == MI) {
CPUser &U = CPUsers[CPUIndex]; CPUser &U = CPUsers[CPUIndex];
if (!OffsetIsInRange(Offset, EndInsertOffset, if (!OffsetIsInRange(Offset, EndInsertOffset, U)) {
U.MaxDisp, U.NegOk, U.IsSoImm)) {
BaseInsertOffset -= (isThumb1 ? 2 : 4); BaseInsertOffset -= (isThumb1 ? 2 : 4);
EndInsertOffset -= (isThumb1 ? 2 : 4); EndInsertOffset -= (isThumb1 ? 2 : 4);
} }