RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-24 11:42:57 +01:00
Code Issues Projects Releases Wiki Activity

Use CallSites for call sites, instead of CallInsts. A revolutionary concept.

Browse Source 
llvm-svn: 9784
This commit is contained in:
Brian Gaeke 2003-11-07 19:26:23 +00:00
parent 94b9c4cf02
commit 29d6325ca3
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/ExecutionEngine/Interpreter/Execution.cpp
View File

@ -453,10 +453,10 @@ void Interpreter::popStackAndReturnValueToCaller (const Type *RetTy,
// If we have a previous stack frame, and we have a previous call,
// fill in the return value...
ExecutionContext &CallingSF = ECStack.back();
if (CallingSF.Caller) {
if (CallingSF.Caller->getType() != Type::VoidTy) // Save result...
SetValue(CallingSF.Caller, Result, CallingSF);
CallingSF.Caller = 0; // We returned from the call...
if (CallingSF.Caller.getInstruction()) {
if (CallingSF.Caller.getType() != Type::VoidTy) // Save result...
SetValue(CallingSF.Caller.getInstruction(), Result, CallingSF);
CallingSF.Caller = CallSite(); // We returned from the call...
}
}
}
@ -639,7 +639,7 @@ void Interpreter::visitStoreInst(StoreInst &I) {
void Interpreter::visitCallInst(CallInst &I) {
ExecutionContext &SF = ECStack.back();
SF.Caller = &I;
SF.Caller = CallSite(&I);
std::vector<GenericValue> ArgVals;
ArgVals.reserve(I.getNumOperands()-1);
for (unsigned i = 1; i < I.getNumOperands(); ++i) {
@ -804,8 +804,8 @@ void Interpreter::visitVANextInst(VANextInst &I) {
//
void Interpreter::callFunction(Function *F,
const std::vector<GenericValue> &ArgVals) {
assert((ECStack.empty() || ECStack.back().Caller == 0 ||
ECStack.back().Caller->getNumOperands()-1 == ArgVals.size()) &&
assert((ECStack.empty() || ECStack.back().Caller.getInstruction() == 0 ||
ECStack.back().Caller.arg_size() == ArgVals.size()) &&
"Incorrect number of arguments passed into function call!");
// Make a new stack frame... and fill it in.
ECStack.push_back(ExecutionContext());

3
lib/ExecutionEngine/Interpreter/Interpreter.h
View File

@ -18,6 +18,7 @@
#include "llvm/ExecutionEngine/ExecutionEngine.h"
#include "llvm/ExecutionEngine/GenericValue.h"
#include "llvm/Support/InstVisitor.h"
#include "llvm/Support/CallSite.h"
#include "llvm/Target/TargetData.h"
#include "Support/DataTypes.h"
@ -64,7 +65,7 @@ struct ExecutionContext {
BasicBlock::iterator CurInst; // The next instruction to execute
std::map<Value *, GenericValue> Values; // LLVM values used in this invocation
std::vector<GenericValue> VarArgs; // Values passed through an ellipsis
CallInst *Caller; // Holds the call that called subframes.
CallSite Caller; // Holds the call that called subframes.
// NULL if main func or debugger invoked fn
AllocaHolderHandle Allocas; // Track memory allocated by alloca
};