diff options
Diffstat (limited to 'include/llvm/CodeGen')
-rw-r--r-- | include/llvm/CodeGen/MachineBasicBlock.h | 22 | ||||
-rw-r--r-- | include/llvm/CodeGen/MachineCodeForBasicBlock.h | 22 | ||||
-rw-r--r-- | include/llvm/CodeGen/MachineCodeForMethod.h | 19 | ||||
-rw-r--r-- | include/llvm/CodeGen/MachineFunction.h | 26 |
4 files changed, 50 insertions, 39 deletions
diff --git a/include/llvm/CodeGen/MachineBasicBlock.h b/include/llvm/CodeGen/MachineBasicBlock.h index a95103f35f..1a3c7a00f6 100644 --- a/include/llvm/CodeGen/MachineBasicBlock.h +++ b/include/llvm/CodeGen/MachineBasicBlock.h @@ -1,27 +1,31 @@ -//===-- llvm/CodeGen/MachineCodeForBasicBlock.h -----------------*- C++ -*--=// +//===-- llvm/CodeGen/MachineBasicBlock.h ------------------------*- C++ -*--=// // // Collect the sequence of machine instructions for a basic block. // //===---------------------------------------------------------------------===// -#ifndef LLVM_CODEGEN_MACHINECODEFORBASICBLOCK_H -#define LLVM_CODEGEN_MACHINECODEFORBASICBLOCK_H +#ifndef LLVM_CODEGEN_MACHINEBASICBLOCK_H +#define LLVM_CODEGEN_MACHINEBASICBLOCK_H #include "llvm/BasicBlock.h" class MachineInstr; extern AnnotationID MCFBB_AID; -class MachineCodeForBasicBlock : public Annotation { +// FIXME: this should go away soon +class MachineBasicBlock; +typedef MachineBasicBlock MachineCodeForBasicBlock; + +class MachineBasicBlock: public Annotation { std::vector<MachineInstr*> Insts; public: - MachineCodeForBasicBlock(); - ~MachineCodeForBasicBlock() {} + MachineBasicBlock(); + ~MachineBasicBlock() {} - // Static methods to retrieve or destroy the MachineCodeForBasicBlock + // Static methods to retrieve or destroy the MachineBasicBlock // object for a given basic block. - static MachineCodeForBasicBlock& get(const BasicBlock *bb) { - return *(MachineCodeForBasicBlock*)bb->getOrCreateAnnotation(MCFBB_AID); + static MachineBasicBlock& get(const BasicBlock *bb) { + return *(MachineBasicBlock*)bb->getOrCreateAnnotation(MCFBB_AID); } static void destroy(const BasicBlock *bb) { diff --git a/include/llvm/CodeGen/MachineCodeForBasicBlock.h b/include/llvm/CodeGen/MachineCodeForBasicBlock.h index a95103f35f..1a3c7a00f6 100644 --- a/include/llvm/CodeGen/MachineCodeForBasicBlock.h +++ b/include/llvm/CodeGen/MachineCodeForBasicBlock.h @@ -1,27 +1,31 @@ -//===-- llvm/CodeGen/MachineCodeForBasicBlock.h -----------------*- C++ -*--=// +//===-- llvm/CodeGen/MachineBasicBlock.h ------------------------*- C++ -*--=// // // Collect the sequence of machine instructions for a basic block. // //===---------------------------------------------------------------------===// -#ifndef LLVM_CODEGEN_MACHINECODEFORBASICBLOCK_H -#define LLVM_CODEGEN_MACHINECODEFORBASICBLOCK_H +#ifndef LLVM_CODEGEN_MACHINEBASICBLOCK_H +#define LLVM_CODEGEN_MACHINEBASICBLOCK_H #include "llvm/BasicBlock.h" class MachineInstr; extern AnnotationID MCFBB_AID; -class MachineCodeForBasicBlock : public Annotation { +// FIXME: this should go away soon +class MachineBasicBlock; +typedef MachineBasicBlock MachineCodeForBasicBlock; + +class MachineBasicBlock: public Annotation { std::vector<MachineInstr*> Insts; public: - MachineCodeForBasicBlock(); - ~MachineCodeForBasicBlock() {} + MachineBasicBlock(); + ~MachineBasicBlock() {} - // Static methods to retrieve or destroy the MachineCodeForBasicBlock + // Static methods to retrieve or destroy the MachineBasicBlock // object for a given basic block. - static MachineCodeForBasicBlock& get(const BasicBlock *bb) { - return *(MachineCodeForBasicBlock*)bb->getOrCreateAnnotation(MCFBB_AID); + static MachineBasicBlock& get(const BasicBlock *bb) { + return *(MachineBasicBlock*)bb->getOrCreateAnnotation(MCFBB_AID); } static void destroy(const BasicBlock *bb) { diff --git a/include/llvm/CodeGen/MachineCodeForMethod.h b/include/llvm/CodeGen/MachineCodeForMethod.h index 742d4b5c0f..00f3cdee58 100644 --- a/include/llvm/CodeGen/MachineCodeForMethod.h +++ b/include/llvm/CodeGen/MachineCodeForMethod.h @@ -1,4 +1,4 @@ -//===-- llvm/CodeGen/MachineCodeForMethod.h ----------------------*- C++ -*--=// +//===-- llvm/CodeGen/MachineFunction.h ----------------------*- C++ -*--=// // // Purpose: // Collect native machine code information for a method. @@ -6,8 +6,8 @@ // to be stored with each method. //===----------------------------------------------------------------------===// -#ifndef LLVM_CODEGEN_MACHINECODEFORMETHOD_H -#define LLVM_CODEGEN_MACHINECODEFORMETHOD_H +#ifndef LLVM_CODEGEN_MACHINEFUNCTION_H +#define LLVM_CODEGEN_MACHINEFUNCTION_H #include "llvm/Annotation.h" #include "Support/NonCopyable.h" @@ -19,8 +19,11 @@ class Constant; class Type; class TargetMachine; +// FIXME: this should go away soon +class MachineFunction; +typedef MachineFunction MachineCodeForMethod; -class MachineCodeForMethod : private Annotation { +class MachineFunction : private Annotation { hash_set<const Constant*> constantsForConstPool; hash_map<const Value*, int> offsets; const Function* method; @@ -36,20 +39,20 @@ class MachineCodeForMethod : private Annotation { bool automaticVarsAreaFrozen; public: - /*ctor*/ MachineCodeForMethod(const Function* function, + /*ctor*/ MachineFunction(const Function* function, const TargetMachine& target); // The next two methods are used to construct and to retrieve - // the MachineCodeForMethod object for the given method. + // the MachineFunction object for the given method. // construct() -- Allocates and initializes for a given method and target // get() -- Returns a handle to the object. // This should not be called before "construct()" // for a given Method. // - static MachineCodeForMethod& construct(const Function *method, + static MachineFunction& construct(const Function *method, const TargetMachine &target); static void destruct(const Function *F); - static MachineCodeForMethod& get(const Function* function); + static MachineFunction& 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 742d4b5c0f..141838f600 100644 --- a/include/llvm/CodeGen/MachineFunction.h +++ b/include/llvm/CodeGen/MachineFunction.h @@ -1,13 +1,13 @@ -//===-- llvm/CodeGen/MachineCodeForMethod.h ----------------------*- C++ -*--=// +//===-- llvm/CodeGen/MachineFunction.h ---------------------------*- C++ -*--=// // -// Purpose: -// Collect native machine code information for a method. -// This allows target-specific information about the generated code -// to be stored with each method. +// Collect native machine code information for a method. This allows +// target-specific information about the generated code to be stored with each +// method. +// //===----------------------------------------------------------------------===// -#ifndef LLVM_CODEGEN_MACHINECODEFORMETHOD_H -#define LLVM_CODEGEN_MACHINECODEFORMETHOD_H +#ifndef LLVM_CODEGEN_MACHINEFUNCTION_H +#define LLVM_CODEGEN_MACHINEFUNCTION_H #include "llvm/Annotation.h" #include "Support/NonCopyable.h" @@ -20,7 +20,7 @@ class Type; class TargetMachine; -class MachineCodeForMethod : private Annotation { +class MachineFunction : private Annotation { hash_set<const Constant*> constantsForConstPool; hash_map<const Value*, int> offsets; const Function* method; @@ -36,20 +36,20 @@ class MachineCodeForMethod : private Annotation { bool automaticVarsAreaFrozen; public: - /*ctor*/ MachineCodeForMethod(const Function* function, - const TargetMachine& target); + /*ctor*/ MachineFunction(const Function* function, + const TargetMachine& target); // The next two methods are used to construct and to retrieve - // the MachineCodeForMethod object for the given method. + // the MachineFunction object for the given method. // construct() -- Allocates and initializes for a given method and target // get() -- Returns a handle to the object. // This should not be called before "construct()" // for a given Method. // - static MachineCodeForMethod& construct(const Function *method, + static MachineFunction& construct(const Function *method, const TargetMachine &target); static void destruct(const Function *F); - static MachineCodeForMethod& get(const Function* function); + static MachineFunction& get(const Function* function); // // Accessors for global information about generated code for a method. |