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

Move FunctionArgument out of iOther.h into Argument.h and rename class to

Browse Source 
be 'Argument' instead of FunctionArgument.

llvm-svn: 2217
This commit is contained in:
Chris Lattner 2002-04-09 19:59:31 +00:00
parent 5e12c7caf5
commit 4434e03eb6
6 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/llvm/Analysis/DataStructure.h
View File

@ -13,7 +13,7 @@
class Type;
class CallInst;
class AllocationInst;
class FunctionArgument;
class Argument;
class DSNode;
class FunctionRepBuilder;
class GlobalValue;
@ -312,9 +312,9 @@ private:
// ArgDSNode - Represent an incoming argument to the current function...
//
class ArgDSNode : public DSNode {
FunctionArgument *FuncArg;
Argument *FuncArg;
public:
ArgDSNode(FunctionArgument *MA);
ArgDSNode(Argument *FA);
virtual std::string getCaption() const;
// isEquivalentTo - Return true if the nodes should be merged...

2
include/llvm/Analysis/InstForest.h
View File

@ -240,7 +240,7 @@ InstTreeNode<Payload>::InstTreeNode(InstForest<Payload> &IF, Value *V,
if (!isa<Instruction>(V)) {
assert((isa<Constant>(V) || isa<BasicBlock>(V) ||
isa<FunctionArgument>(V) || isa<GlobalValue>(V)) &&
isa<Argument>(V) || isa<GlobalValue>(V)) &&
"Unrecognized value type for InstForest Partition!");
if (isa<Constant>(V))
getTreeData().first.second = ConstNode;

4
include/llvm/Assembly/CachedWriter.h
View File

@ -15,7 +15,7 @@
class GlobalVariable;
class Function;
class FunctionArgument;
class Argument;
class BasicBlock;
class Instruction;
class Constant;
@ -55,7 +55,7 @@ public:
inline CachedWriter &operator<<(const Function *X) {
return *this << (const Value*)X;
}
inline CachedWriter &operator<<(const FunctionArgument *X) {
inline CachedWriter &operator<<(const Argument *X) {
return *this << (const Value*)X;
}
inline CachedWriter &operator<<(const BasicBlock *X) {

4
include/llvm/Function.h
View File

@ -19,8 +19,8 @@ class FunctionType;
class Function : public GlobalValue, public SymTabValue {
public:
typedef ValueHolder<FunctionArgument, Function, Function> ArgumentListType;
typedef ValueHolder<BasicBlock , Function, Function> BasicBlocksType;
typedef ValueHolder<Argument , Function, Function> ArgumentListType;
typedef ValueHolder<BasicBlock, Function, Function> BasicBlocksType;
// BasicBlock iterators...
typedef BasicBlocksType::iterator iterator;

12
include/llvm/Value.h
View File

@ -19,7 +19,7 @@
class User;
class Type;
class Constant;
class FunctionArgument;
class Argument;
class Instruction;
class BasicBlock;
class GlobalValue;
@ -40,7 +40,7 @@ public:
enum ValueTy {
TypeVal, // This is an instance of Type
ConstantVal, // This is an instance of Constant
FunctionArgumentVal, // This is an instance of FunctionArgument
ArgumentVal, // This is an instance of Argument
InstructionVal, // This is an instance of Instruction
BasicBlockVal, // This is an instance of BasicBlock
FunctionVal, // This is an instance of Function
@ -202,11 +202,11 @@ template <> inline bool isa<Constant, const Value*>(const Value *Val) {
template <> inline bool isa<Constant, Value*>(Value *Val) {
return Val->getValueType() == Value::ConstantVal;
}
template <> inline bool isa<FunctionArgument, const Value*>(const Value *Val) {
return Val->getValueType() == Value::FunctionArgumentVal;
template <> inline bool isa<Argument, const Value*>(const Value *Val) {
return Val->getValueType() == Value::ArgumentVal;
}
template <> inline bool isa<FunctionArgument, Value*>(Value *Val) {
return Val->getValueType() == Value::FunctionArgumentVal;
template <> inline bool isa<Argument, Value*>(Value *Val) {
return Val->getValueType() == Value::ArgumentVal;
}
template <> inline bool isa<Instruction, const Value*>(const Value *Val) {
return Val->getValueType() == Value::InstructionVal;

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

@ -1029,7 +1029,7 @@ MethodInfo::MethodInfo(Function *M) : Annotation(MethodInfoAID) {
const Function::ArgumentListType &ArgList = M->getArgumentList();
for (Function::ArgumentListType::const_iterator AI = ArgList.begin(),
AE = ArgList.end(); AI != AE; ++AI)
(*AI)->addAnnotation(new SlotNumber(getValueSlot(*AI)));
((Value*)(*AI))->addAnnotation(new SlotNumber(getValueSlot((Value*)*AI)));
// Iterate over all of the instructions...
unsigned InstNum = 0;
@ -1114,9 +1114,9 @@ void Interpreter::callMethod(Function *M, const vector<GenericValue> &ArgVals) {
assert(ArgVals.size() == M->getArgumentList().size() &&
"Invalid number of values passed to function invocation!");
unsigned i = 0;
for (Function::ArgumentListType::iterator MI = M->getArgumentList().begin(),
ME = M->getArgumentList().end(); MI != ME; ++MI, ++i) {
SetValue(*MI, ArgVals[i], StackFrame);
for (Function::ArgumentListType::iterator AI = M->getArgumentList().begin(),
AE = M->getArgumentList().end(); AI != AE; ++AI, ++i) {
SetValue((Value*)*AI, ArgVals[i], StackFrame);
}
}
@ -1360,7 +1360,8 @@ void Interpreter::printStackFrame(int FrameNo = -1) {
if (i != 0) cout << ", ";
CW << (Value*)Args[i] << "=";
printValue(Args[i]->getType(), getOperandValue(Args[i], ECStack[FrameNo]));
printValue(((Value*)Args[i])->getType(),
getOperandValue((Value*)Args[i], ECStack[FrameNo]));
}
cout << ")\n";