Changes in directory llvm/lib/Target/ARM:
ARMConstantIslandPass.cpp updated: 1.35 -> 1.36
---
Log message:
Make Thumb funcs containing islands 4-byte aligned. Fix bugs maintaining
BBOffsets and BBSizes when adjusting conditional branches.
---
Diffs of the changes: (+19 -6)
ARMConstantIslandPass.cpp | 25 +++++++++++++++++++------
1 files changed, 19 insertions(+), 6 deletions(-)
Index: llvm/lib/Target/ARM/ARMConstantIslandPass.cpp
diff -u llvm/lib/Target/ARM/ARMConstantIslandPass.cpp:1.35
llvm/lib/Target/ARM/ARMConstantIslandPass.cpp:1.36
--- llvm/lib/Target/ARM/ARMConstantIslandPass.cpp:1.35 Tue Apr 3 18:39:48 2007
+++ llvm/lib/Target/ARM/ARMConstantIslandPass.cpp Mon Apr 23 15:09:04 2007
@@ -121,7 +121,6 @@
bool HasFarJump;
const TargetInstrInfo *TII;
- const ARMFunctionInfo *AFI;
bool isThumb;
public:
virtual bool runOnMachineFunction(MachineFunction &Fn);
@@ -173,9 +172,9 @@
bool ARMConstantIslands::runOnMachineFunction(MachineFunction &Fn) {
MachineConstantPool &MCP = *Fn.getConstantPool();
+ ARMFunctionInfo *AFI = Fn.getInfo<ARMFunctionInfo>();
TII = Fn.getTarget().getInstrInfo();
- AFI = Fn.getInfo<ARMFunctionInfo>();
isThumb = AFI->isThumbFunction();
HasFarJump = false;
@@ -184,11 +183,18 @@
// the numbers agree with the position of the block in the function.
Fn.RenumberBlocks();
+ /// Thumb functions containing constant pools get 2-byte alignment. This is
so
+ /// we can keep exact track of where the alignment padding goes. Set
default.
+ AFI->setAlign(isThumb ? 1U : 2U);
+
// Perform the initial placement of the constant pool entries. To start
with,
// we put them all at the end of the function.
std::vector<MachineInstr*> CPEMIs;
- if (!MCP.isEmpty())
+ if (!MCP.isEmpty()) {
DoInitialPlacement(Fn, CPEMIs);
+ if (isThumb)
+ AFI->setAlign(2U);
+ }
/// The next UID to take is the first unused one.
NextUID = CPEMIs.size();
@@ -1071,6 +1077,9 @@
SplitBlockBeforeInstr(MI);
// No need for the branch to the next block. We're adding a unconditional
// branch to the destination.
+ int delta = ARM::GetInstSize(&MBB->back());
+ BBSizes[MBB->getNumber()] -= delta;
+ AdjustBBOffsetsAfter(MBB, -delta);
MBB->back().eraseFromParent();
}
MachineBasicBlock *NextBB = next(MachineFunction::iterator(MBB));
@@ -1079,18 +1088,22 @@
<< " also invert condition and change dest. to BB#"
<< NextBB->getNumber() << "\n";
- // Insert a unconditional branch and replace the conditional branch.
+ // Insert a new conditional branch and a new unconditional branch.
// Also update the ImmBranch as well as adding a new entry for the new
branch.
BuildMI(MBB, TII->get(MI->getOpcode())).addMBB(NextBB).addImm(CC);
Br.MI = &MBB->back();
+ BBSizes[MBB->getNumber()] += ARM::GetInstSize(&MBB->back());
BuildMI(MBB, TII->get(Br.UncondBr)).addMBB(DestBB);
+ BBSizes[MBB->getNumber()] += ARM::GetInstSize(&MBB->back());
unsigned MaxDisp = getUnconditionalBrDisp(Br.UncondBr);
ImmBranches.push_back(ImmBranch(&MBB->back(), MaxDisp, false, Br.UncondBr));
+
+ // Remove the old conditional branch. It may or may not still be in MBB.
+ BBSizes[MI->getParent()->getNumber()] -= ARM::GetInstSize(MI);
MI->eraseFromParent();
- // Increase the size of MBB to account for the new unconditional branch.
+ // The net size change is an addition of one unconditional branch.
int delta = ARM::GetInstSize(&MBB->back());
- BBSizes[MBB->getNumber()] += delta;
AdjustBBOffsetsAfter(MBB, delta);
return true;
}
_______________________________________________
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
