6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-12-14 11:32:34 +00:00
Code Issues Projects Releases Wiki Activity

If we have a constant pointer reference to a function, we were printing

Browse Source 
out the entire llvm disassembly for the function at global constant-output
time, which caused the assembler to barf in 164.gzip. This fixes that
particular problem (though 164.gzip has other problems with X86 llc.)


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@7168 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Brian Gaeke 2003-07-11 21:57:01 +00:00
parent 1aa476edf0
commit 0517c5ac92
2 changed files with 44 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lib/Target/X86/Printer.cpp
View File

@ -943,6 +943,17 @@ bool Printer::doInitialization(Module &M)
return false; // success
}
static const Function *isConstantFunctionPointerRef (const Constant *C) {
const ConstantPointerRef *R = dyn_cast<ConstantPointerRef>(C);
if (R) {
const Function *F = dyn_cast<Function>(R->getValue());
if (F) {
return F;
}
}
return NULL;
}
bool Printer::doFinalization(Module &M)
{
// Print out module-level global variables here.
@ -956,7 +967,17 @@ bool Printer::doFinalization(Module &M)
O << "\t.size " << name << ","
<< (unsigned)TD->getTypeSize(I->getType()) << "\n";
O << "\t.align " << (unsigned)TD->getTypeAlignment(C->getType()) << "\n";
O << name << ":\t\t\t\t\t#" << *C << "\n";
O << name << ":\t\t\t\t\t#";
// If this is a constant function pointer, we only print out the
// name of the function in the comment (because printing the
// function means calling AsmWriter to print the whole LLVM
// assembly, which would corrupt the X86 assembly output.)
// Otherwise we print out the whole llvm value as a comment.
if (const Function *F = isConstantFunctionPointerRef (C)) {
O << " %" << F->getName() << "()\n";
} else {
O << *C << "\n";
}
printConstantValueOnly (C);
} else {
O << "\t.globl " << name << "\n";

23
lib/Target/X86/X86AsmPrinter.cpp
View File

@ -943,6 +943,17 @@ bool Printer::doInitialization(Module &M)
return false; // success
}
static const Function *isConstantFunctionPointerRef (const Constant *C) {
const ConstantPointerRef *R = dyn_cast<ConstantPointerRef>(C);
if (R) {
const Function *F = dyn_cast<Function>(R->getValue());
if (F) {
return F;
}
}
return NULL;
}
bool Printer::doFinalization(Module &M)
{
// Print out module-level global variables here.
@ -956,7 +967,17 @@ bool Printer::doFinalization(Module &M)
O << "\t.size " << name << ","
<< (unsigned)TD->getTypeSize(I->getType()) << "\n";
O << "\t.align " << (unsigned)TD->getTypeAlignment(C->getType()) << "\n";
O << name << ":\t\t\t\t\t#" << *C << "\n";
O << name << ":\t\t\t\t\t#";
// If this is a constant function pointer, we only print out the
// name of the function in the comment (because printing the
// function means calling AsmWriter to print the whole LLVM
// assembly, which would corrupt the X86 assembly output.)
// Otherwise we print out the whole llvm value as a comment.
if (const Function *F = isConstantFunctionPointerRef (C)) {
O << " %" << F->getName() << "()\n";
} else {
O << *C << "\n";
}
printConstantValueOnly (C);
} else {
O << "\t.globl " << name << "\n";