mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2025-09-24 23:28:41 +00:00
Second installment of "BasicBlock operands to the back"
changes. For InvokeInst now all arguments begin at op_begin(). The Callee, Cont and Fail are now faster to get by access relative to op_end(). This patch introduces some temporary uglyness in CallSite. Next I'll bring CallInst up to a similar scheme and then the uglyness will magically vanish. This patch also exposes all the reliance of the libraries on InvokeInst's operand ordering. I am thinking of taking care of that too. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@66920 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
@@ -93,6 +93,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
|
||||
|
||||
@@ -431,10 +438,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.
|
||||
@@ -443,12 +449,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];
|
||||
}
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user