diff options
Diffstat (limited to 'include/llvm/CodeGen')
-rw-r--r-- | include/llvm/CodeGen/FunctionLiveVarInfo.h | 12 | ||||
-rw-r--r-- | include/llvm/CodeGen/InstrForest.h | 4 | ||||
-rw-r--r-- | include/llvm/CodeGen/InstrSelection.h | 4 | ||||
-rw-r--r-- | include/llvm/CodeGen/MachineCodeForMethod.h | 12 | ||||
-rw-r--r-- | include/llvm/CodeGen/MachineFunction.h | 12 | ||||
-rw-r--r-- | include/llvm/CodeGen/MachineInstr.h | 2 |
6 files changed, 23 insertions, 23 deletions
diff --git a/include/llvm/CodeGen/FunctionLiveVarInfo.h b/include/llvm/CodeGen/FunctionLiveVarInfo.h index 8785334572..435f177045 100644 --- a/include/llvm/CodeGen/FunctionLiveVarInfo.h +++ b/include/llvm/CodeGen/FunctionLiveVarInfo.h @@ -8,7 +8,7 @@ It must be called like: - MethodLiveVarInfo MLVI( Mehtod *); // initializes data structures + MethodLiveVarInfo MLVI(Function *); // initializes data structures MLVI.analyze(); // do the actural live variable anal After the analysis, getInSetOfBB or getOutSetofBB can be called to get @@ -86,16 +86,16 @@ class MethodLiveVarInfo : public MethodPass { // Machine Instr to LiveVarSet Map for providing LVset AFTER each inst std::map<const MachineInstr *, const ValueSet *> MInst2LVSetAI; - // Stored Method that the data is computed with respect to - const Method *M; + // Stored Function that the data is computed with respect to + const Function *M; // --------- private methods ----------------------------------------- // constructs BBLiveVars and init Def and In sets - void constructBBs(const Method *M); + void constructBBs(const Function *F); // do one backward pass over the CFG - bool doSingleBackwardPass(const Method *M, unsigned int iter); + bool doSingleBackwardPass(const Function *F, unsigned int iter); // calculates live var sets for instructions in a BB void calcLiveVarSetsForBB(const BasicBlock *BB); @@ -108,7 +108,7 @@ public: // --------- Implement the MethodPass interface ---------------------- // runOnMethod - Perform analysis, update internal data structures. - virtual bool runOnMethod(Method *M); + virtual bool runOnMethod(Function *F); // releaseMemory - After LiveVariable analysis has been used, forget! virtual void releaseMemory(); diff --git a/include/llvm/CodeGen/InstrForest.h b/include/llvm/CodeGen/InstrForest.h index 0f614a6a9f..834899d22c 100644 --- a/include/llvm/CodeGen/InstrForest.h +++ b/include/llvm/CodeGen/InstrForest.h @@ -31,7 +31,7 @@ class Constant; class BasicBlock; -class Method; +class Function; class InstrTreeNode; class InstrForest; @@ -243,7 +243,7 @@ private: std::hash_set<InstructionNode*> treeRoots; public: - /*ctor*/ InstrForest (Method *M); + /*ctor*/ InstrForest (Function *F); /*dtor*/ ~InstrForest (); inline InstructionNode *getTreeNodeForInstr(Instruction* instr) { diff --git a/include/llvm/CodeGen/InstrSelection.h b/include/llvm/CodeGen/InstrSelection.h index fa4f21a175..4d5e497dca 100644 --- a/include/llvm/CodeGen/InstrSelection.h +++ b/include/llvm/CodeGen/InstrSelection.h @@ -14,7 +14,7 @@ #define LLVM_CODEGEN_INSTR_SELECTION_H #include "llvm/Instruction.h" -class Method; +class Function; class InstrForest; class MachineInstr; class InstructionNode; @@ -55,7 +55,7 @@ extern bool ThisIsAChainRule (int eruleno); // Implemented in machine-specific instruction selection file. //--------------------------------------------------------------------------- -bool SelectInstructionsForMethod (Method* method, +bool SelectInstructionsForMethod (Function* function, TargetMachine &Target); diff --git a/include/llvm/CodeGen/MachineCodeForMethod.h b/include/llvm/CodeGen/MachineCodeForMethod.h index 631e823719..9970c1f926 100644 --- a/include/llvm/CodeGen/MachineCodeForMethod.h +++ b/include/llvm/CodeGen/MachineCodeForMethod.h @@ -14,14 +14,14 @@ #include "Support/HashExtras.h" #include <ext/hash_set> class Value; -class Method; +class Function; class Constant; class Type; class TargetMachine; class MachineCodeForMethod : private Annotation { - const Method* method; + const Function* method; bool compiledAsLeaf; unsigned staticStackSize; unsigned automaticVarsSize; @@ -33,7 +33,7 @@ class MachineCodeForMethod : private Annotation { std::hash_map<const Value*, int> offsets; public: - /*ctor*/ MachineCodeForMethod(const Method* method, + /*ctor*/ MachineCodeForMethod(const Function* function, const TargetMachine& target); // The next two methods are used to construct and to retrieve @@ -43,10 +43,10 @@ public: // This should not be called before "construct()" // for a given Method. // - static MachineCodeForMethod& construct(const Method *method, + static MachineCodeForMethod& construct(const Function *method, const TargetMachine &target); - static void destruct(const Method *M); - static MachineCodeForMethod& get(const Method* method); + static void destruct(const Function *F); + static MachineCodeForMethod& get(const Function* function); // // Accessors for global information about generated code for a method. diff --git a/include/llvm/CodeGen/MachineFunction.h b/include/llvm/CodeGen/MachineFunction.h index 631e823719..9970c1f926 100644 --- a/include/llvm/CodeGen/MachineFunction.h +++ b/include/llvm/CodeGen/MachineFunction.h @@ -14,14 +14,14 @@ #include "Support/HashExtras.h" #include <ext/hash_set> class Value; -class Method; +class Function; class Constant; class Type; class TargetMachine; class MachineCodeForMethod : private Annotation { - const Method* method; + const Function* method; bool compiledAsLeaf; unsigned staticStackSize; unsigned automaticVarsSize; @@ -33,7 +33,7 @@ class MachineCodeForMethod : private Annotation { std::hash_map<const Value*, int> offsets; public: - /*ctor*/ MachineCodeForMethod(const Method* method, + /*ctor*/ MachineCodeForMethod(const Function* function, const TargetMachine& target); // The next two methods are used to construct and to retrieve @@ -43,10 +43,10 @@ public: // This should not be called before "construct()" // for a given Method. // - static MachineCodeForMethod& construct(const Method *method, + static MachineCodeForMethod& construct(const Function *method, const TargetMachine &target); - static void destruct(const Method *M); - static MachineCodeForMethod& get(const Method* method); + static void destruct(const Function *F); + static MachineCodeForMethod& get(const Function* function); // // Accessors for global information about generated code for a method. diff --git a/include/llvm/CodeGen/MachineInstr.h b/include/llvm/CodeGen/MachineInstr.h index 729d37b911..7893304406 100644 --- a/include/llvm/CodeGen/MachineInstr.h +++ b/include/llvm/CodeGen/MachineInstr.h @@ -452,7 +452,7 @@ std::ostream& operator<< (std::ostream& os, const MachineInstr& minstr); std::ostream& operator<< (std::ostream& os, const MachineOperand& mop); -void PrintMachineInstructions(const Method *method); +void PrintMachineInstructions(const Function *F); //**************************************************************************/ |