diff options
author | Evan Cheng <evan.cheng@apple.com> | 2008-10-31 19:55:13 +0000 |
---|---|---|
committer | Evan Cheng <evan.cheng@apple.com> | 2008-10-31 19:55:13 +0000 |
commit | 938b9d8ef78e83926437f8a331dd1e7645e28e4e (patch) | |
tree | fe897f92daff0ad2f478e19a0ee1d768c52ca5a5 /lib/Target/ARM/ARMCodeEmitter.cpp | |
parent | ba44df60d66363ce7490e81b18a35231c3f4c04a (diff) |
Use better data structure for ConstPoolId2AddrMap.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@58532 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Target/ARM/ARMCodeEmitter.cpp')
-rw-r--r-- | lib/Target/ARM/ARMCodeEmitter.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/lib/Target/ARM/ARMCodeEmitter.cpp b/lib/Target/ARM/ARMCodeEmitter.cpp index 0e932547e9..7aca1de387 100644 --- a/lib/Target/ARM/ARMCodeEmitter.cpp +++ b/lib/Target/ARM/ARMCodeEmitter.cpp @@ -43,16 +43,17 @@ namespace { const TargetData *TD; TargetMachine &TM; MachineCodeEmitter &MCE; - const MachineConstantPool *MCP; + const std::vector<MachineConstantPoolEntry> *MCPEs; + public: static char ID; explicit ARMCodeEmitter(TargetMachine &tm, MachineCodeEmitter &mce) : MachineFunctionPass(&ID), JTI(0), II(0), TD(0), TM(tm), - MCE(mce), MCP(0) {} + MCE(mce), MCPEs(0) {} ARMCodeEmitter(TargetMachine &tm, MachineCodeEmitter &mce, const ARMInstrInfo &ii, const TargetData &td) : MachineFunctionPass(&ID), JTI(0), II(&ii), TD(&td), TM(tm), - MCE(mce), MCP(0) {} + MCE(mce), MCPEs(0) {} bool runOnMachineFunction(MachineFunction &MF); @@ -153,7 +154,8 @@ bool ARMCodeEmitter::runOnMachineFunction(MachineFunction &MF) { II = ((ARMTargetMachine&)MF.getTarget()).getInstrInfo(); TD = ((ARMTargetMachine&)MF.getTarget()).getTargetData(); JTI = ((ARMTargetMachine&)MF.getTarget()).getJITInfo(); - MCP = MF.getConstantPool(); + MCPEs = &MF.getConstantPool()->getConstants(); + JTI->ResizeConstPoolMap(MCPEs->size()); do { DOUT << "JITTing function '" << MF.getFunction()->getName() << "'\n"; @@ -264,7 +266,7 @@ void ARMCodeEmitter::emitInstruction(const MachineInstr &MI) { void ARMCodeEmitter::emitConstPoolInstruction(const MachineInstr &MI) { unsigned CPI = MI.getOperand(0).getImm(); unsigned CPIndex = MI.getOperand(1).getIndex(); - const MachineConstantPoolEntry &MCPE = MCP->getConstants()[CPIndex]; + const MachineConstantPoolEntry &MCPE = (*MCPEs)[CPIndex]; // Remember the CONSTPOOL_ENTRY address for later relocation. JTI->addConstantPoolEntryAddr(CPI, MCE.getCurrentPCValue()); |