maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Get constant pools working. This fixes even more programs, allowing us to 

pass 24/42 in UnitTests (up from 20).

llvm-svn: 18196
This commit is contained in:
Chris Lattner 2004-11-24 01:56:12 +00:00
parent 13c71ca7b6
commit 6a7ebe034e
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
llvm/lib/Target/PowerPC/PPC32CodeEmitter.cpp
View File

@ -199,6 +199,7 @@ int PPC32CodeEmitter::getMachineOpValue(MachineInstr &MI, MachineOperand &MO) {
} else { } else {
assert(0 && "Unknown instruction for relocation!"); assert(0 && "Unknown instruction for relocation!");
} }
assert(MovePCtoLROffset && "MovePCtoLR not seen yet?");
MCE.addRelocation(MachineRelocation(MCE.getCurrentPCOffset(), MCE.addRelocation(MachineRelocation(MCE.getCurrentPCOffset(),
Reloc, MO.getGlobal(), Reloc, MO.getGlobal(),
-((intptr_t)MovePCtoLROffset+4))); -((intptr_t)MovePCtoLROffset+4)));
@ -208,27 +209,26 @@ int PPC32CodeEmitter::getMachineOpValue(MachineInstr &MI, MachineOperand &MO) {
BBRefs.push_back(std::make_pair(BB, CurrPC)); BBRefs.push_back(std::make_pair(BB, CurrPC));
} else if (MO.isConstantPoolIndex()) { } else if (MO.isConstantPoolIndex()) {
unsigned index = MO.getConstantPoolIndex(); unsigned index = MO.getConstantPoolIndex();
rv = MCE.getConstantPoolEntryAddress(index);
} else {
std::cerr << "ERROR: Unknown type of MachineOperand: " << MO << "\n";
abort();
}
// Special treatment for global symbols: constants and vars
if ((MO.isConstantPoolIndex() || MO.isGlobalAddress()) &&
MI.getOpcode() != PPC::CALLpcrel) {
unsigned Opcode = MI.getOpcode();
assert(MovePCtoLROffset && "MovePCtoLR not seen yet?"); assert(MovePCtoLROffset && "MovePCtoLR not seen yet?");
rv = MCE.getConstantPoolEntryAddress(index) - (intptr_t)MovePCtoLROffset-4;
unsigned Opcode = MI.getOpcode();
if (Opcode == PPC::LOADHiAddr) { if (Opcode == PPC::LOADHiAddr) {
// LoadHiAddr wants hi16(addr - &MovePCtoLR) // LoadHiAddr wants hi16(addr - &MovePCtoLR)
if ((short)rv < 0) rv += 1 << 16;
rv >>= 16; rv >>= 16;
} else if (Opcode == PPC::LWZ || Opcode == PPC::LA || } else if (Opcode == PPC::LWZ || Opcode == PPC::LA ||
Opcode == PPC::LFS || Opcode == PPC::LFD) { Opcode == PPC::LFS || Opcode == PPC::LFD) {
// These load opcodes want lo16(addr - &MovePCtoLR) // These load opcodes want lo16(addr - &MovePCtoLR)
rv &= 0xffff; rv &= 0xffff;
} else {
assert(0 && "Unknown constant pool using instruction!");
} }
} else {
std::cerr << "ERROR: Unknown type of MachineOperand: " << MO << "\n";
abort();
} }
return rv; return rv;
} }