6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-08-05 13:26:55 +00:00
Code Issues Projects Releases Wiki Activity

re-commit r66920 (which has been backed out in r66953) I may have more luck this time. I'll back out if needed...

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@80858 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Gabor Greif
2009-09-03 00:18:58 +00:00
parent 9947bbb297
commit 190390b8d3
12 changed files with 61 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/VMCore/AsmWriter.cpp
View File

@@ -1863,6 +1863,7 @@ void AssemblyWriter::printInstruction(const Instruction &I) {
if (PAL.getFnAttributes() != Attribute::None)
Out << ' ' << Attribute::getAsString(PAL.getFnAttributes());
} else if (const InvokeInst *II = dyn_cast<InvokeInst>(&I)) {
Operand = II->getCalledValue();
const PointerType *PTy = cast<PointerType>(Operand->getType());
const FunctionType *FTy = cast<FunctionType>(PTy->getElementType());
const Type *RetTy = FTy->getReturnType();
@@ -1899,10 +1900,10 @@ void AssemblyWriter::printInstruction(const Instruction &I) {
writeOperand(Operand, true);
}
Out << '(';
for (unsigned op = 3, Eop = I.getNumOperands(); op < Eop; ++op) {
if (op > 3)
for (unsigned op = 0, Eop = I.getNumOperands() - 3; op < Eop; ++op) {
if (op)
Out << ", ";
writeParamOperand(I.getOperand(op), PAL.getParamAttributes(op-2));
writeParamOperand(I.getOperand(op), PAL.getParamAttributes(op + 1));
}
Out << ')';

17
lib/VMCore/Instructions.cpp
View File

@@ -95,6 +95,13 @@ bool CallSite::hasArgument(const Value *Arg) const {
return false;
}
User::op_iterator CallSite::getCallee() const {
Instruction *II(getInstruction());
return isCall()
? cast<CallInst>(II)->op_begin()
: cast<InvokeInst>(II)->op_end() - 3; // Skip BB, BB, Function
}
#undef CALLSITE_DELEGATE_GETTER
#undef CALLSITE_DELEGATE_SETTER
@@ -435,10 +442,9 @@ bool CallInst::paramHasAttr(unsigned i, Attributes attr) const {
void InvokeInst::init(Value *Fn, BasicBlock *IfNormal, BasicBlock *IfException,
Value* const *Args, unsigned NumArgs) {
assert(NumOperands == 3+NumArgs && "NumOperands not set up?");
Use *OL = OperandList;
OL[0] = Fn;
OL[1] = IfNormal;
OL[2] = IfException;
Op<-3>() = Fn;
Op<-2>() = IfNormal;
Op<-1>() = IfException;
const FunctionType *FTy =
cast<FunctionType>(cast<PointerType>(Fn->getType())->getElementType());
FTy = FTy; // silence warning.
@@ -447,12 +453,13 @@ void InvokeInst::init(Value *Fn, BasicBlock *IfNormal, BasicBlock *IfException,
(FTy->isVarArg() && NumArgs > FTy->getNumParams())) &&
"Calling a function with bad signature");
Use *OL = OperandList;
for (unsigned i = 0, e = NumArgs; i != e; i++) {
assert((i >= FTy->getNumParams() ||
FTy->getParamType(i) == Args[i]->getType()) &&
"Invoking a function with a bad signature!");
OL[i+3] = Args[i];
OL[i] = Args[i];
}
}

2
lib/VMCore/Verifier.cpp
View File

@@ -1412,7 +1412,7 @@ void Verifier::visitInstruction(Instruction &I) {
"Instruction does not dominate all uses!", Op, &I);
}
} else if (isa<InlineAsm>(I.getOperand(i))) {
Assert1(i == 0 && (isa<CallInst>(I) || isa<InvokeInst>(I)),
Assert1((i == 0 && isa<CallInst>(I)) || (i + 3 == e && isa<InvokeInst>(I)),
"Cannot take the address of an inline asm!", &I);
}
}