Fixed a bunch of test cases in test/Regression/Jello which could not get the

address of a floating-point (allocated via ConstantPool) correctly.

llvm-svn: 6647
This commit is contained in:
Misha Brukman 2003-06-06 04:41:22 +00:00
parent 65d29b87e3
commit b7f76d32fe
1 changed files with 13 additions and 2 deletions

View File

@ -22,7 +22,7 @@
bool UltraSparc::addPassesToEmitMachineCode(PassManager &PM, bool UltraSparc::addPassesToEmitMachineCode(PassManager &PM,
MachineCodeEmitter &MCE) { MachineCodeEmitter &MCE) {
MachineCodeEmitter *M = &MCE; MachineCodeEmitter *M = &MCE;
DEBUG(MachineCodeEmitter::createFilePrinterEmitter(MCE)); DEBUG(M = MachineCodeEmitter::createFilePrinterEmitter(MCE));
PM.add(new SparcV9CodeEmitter(*this, *M)); PM.add(new SparcV9CodeEmitter(*this, *M));
PM.add(createMachineCodeDestructionPass()); // Free stuff no longer needed PM.add(createMachineCodeDestructionPass()); // Free stuff no longer needed
return false; return false;
@ -443,8 +443,19 @@ int64_t SparcV9CodeEmitter::getMachineOpValue(MachineInstr &MI,
DEBUG(std::cerr << "already generated: 0x" << std::hex << rv << "\n"); DEBUG(std::cerr << "already generated: 0x" << std::hex << rv << "\n");
} }
} else { } else {
DEBUG(std::cerr << "not a function: " << *GV << "\n");
rv = (int64_t)MCE.getGlobalValueAddress(GV); rv = (int64_t)MCE.getGlobalValueAddress(GV);
if (rv == 0) {
if (Constant *C = ConstantPointerRef::get(GV)) {
if (ConstantMap.find(C) != ConstantMap.end()) {
rv = MCE.getConstantPoolEntryAddress(ConstantMap[C]);
} else {
std::cerr << "Constant: 0x" << std::hex << &*C << std::dec
<< ", " << *V << " not found in ConstantMap!\n";
abort();
}
}
}
DEBUG(std::cerr << "Global addr: " << rv << "\n");
} }
// The real target of the call is Addr = PC + (rv * 4) // The real target of the call is Addr = PC + (rv * 4)
// So undo that: give the instruction (Addr - PC) / 4 // So undo that: give the instruction (Addr - PC) / 4