Changes in directory llvm/lib/Target/Alpha:
AlphaCodeEmitter.cpp updated: 1.13 -> 1.14
---
Log message:
Suck block address tracking out of targets into the JIT Emitter. This
simplifies the MachineCodeEmitter interface just a little bit and makes
BasicBlocks work like constant pools and jump tables.
---
Diffs of the changes: (+4 -11)
AlphaCodeEmitter.cpp | 15 ++++-----------
1 files changed, 4 insertions(+), 11 deletions(-)
Index: llvm/lib/Target/Alpha/AlphaCodeEmitter.cpp
diff -u llvm/lib/Target/Alpha/AlphaCodeEmitter.cpp:1.13
llvm/lib/Target/Alpha/AlphaCodeEmitter.cpp:1.14
--- llvm/lib/Target/Alpha/AlphaCodeEmitter.cpp:1.13 Tue May 2 19:31:21 2006
+++ llvm/lib/Target/Alpha/AlphaCodeEmitter.cpp Wed May 3 12:10:41 2006
@@ -35,8 +35,7 @@
class AlphaCodeEmitter : public MachineFunctionPass {
const AlphaInstrInfo *II;
MachineCodeEmitter &MCE;
- std::vector<unsigned*> BasicBlockAddrs;
- std::vector<std::pair<const MachineBasicBlock *, unsigned*> > BBRefs;
+ std::vector<std::pair<MachineBasicBlock *, unsigned*> > BBRefs;
/// getMachineOpValue - evaluates the MachineOperand of a given
MachineInstr
///
@@ -78,7 +77,6 @@
do {
BBRefs.clear();
- BasicBlockAddrs.clear();
MCE.startFunction(MF);
for (MachineFunction::iterator I = MF.begin(), E = MF.end(); I != E; ++I)
@@ -87,7 +85,8 @@
// Resolve all forward branches now...
for (unsigned i = 0, e = BBRefs.size(); i != e; ++i) {
- unsigned* Location = BasicBlockAddrs[BBRefs[i].first->getNumber()];
+ unsigned* Location =
+ (unsigned*)MCE.getMachineBasicBlockAddress(BBRefs[i].first);
unsigned* Ref = (unsigned*)BBRefs[i].second;
intptr_t BranchTargetDisp =
(((unsigned char*)Location - (unsigned char*)Ref) >> 2) - 1;
@@ -97,17 +96,11 @@
*Ref |= (BranchTargetDisp & ((1 << 21)-1));
}
BBRefs.clear();
- BasicBlockAddrs.clear();
-
return false;
}
void AlphaCodeEmitter::emitBasicBlock(MachineBasicBlock &MBB) {
- if (BasicBlockAddrs.size() <= (unsigned)MBB.getNumber())
- BasicBlockAddrs.resize((MBB.getNumber()+1)*2);
-
- BasicBlockAddrs[MBB.getNumber()] = (unsigned*)MCE.getCurrentPCValue();
-
+ MCE.StartMachineBasicBlock(&MBB);
for (MachineBasicBlock::iterator I = MBB.begin(), E = MBB.end();
I != E; ++I) {
MachineInstr &MI = *I;
_______________________________________________
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
