* Removed extraneous #includes

* Fixed file headers to be consistent with the rest of LLVM
* Other minor fixes


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@3277 91177308-0d34-0410-b5e6-96231b3b80d8

4 files changed, 21 insertions, 48 deletions

diff --git a/include/llvm/CodeGen/InstrForest.h b/include/llvm/CodeGen/InstrForest.h
index 650dbdd..f1871a6 100644
--- a/include/llvm/CodeGen/InstrForest.h
+++ b/include/llvm/CodeGen/InstrForest.h
@@ -1,8 +1,5 @@
-// $Id$ -*-c++-*-
-//***************************************************************************
-// File:
-//	InstrForest.h
-// 
+//===-- llvm/CodeGen/InstForest.h ------------------------------*- C++ -*--===//
+//
 // Purpose:
 //	Convert SSA graph to instruction trees for instruction selection.
 // 
@@ -17,9 +14,7 @@
 //  (2) O and I are part of the same basic block, and
 //  (3) O has only a single use, viz., I.
 // 
-// History:
-//	6/28/01	 -  Vikram Adve  -  Created
-//**************************************************************************/
+//===----------------------------------------------------------------------===//
 
 #ifndef LLVM_CODEGEN_INSTRFOREST_H
 #define LLVM_CODEGEN_INSTRFOREST_H
diff --git a/include/llvm/CodeGen/InstrSelection.h b/include/llvm/CodeGen/InstrSelection.h
index ed3e128..0e47296 100644
--- a/include/llvm/CodeGen/InstrSelection.h
+++ b/include/llvm/CodeGen/InstrSelection.h
@@ -1,14 +1,8 @@
-// $Id$ -*-c++-*-
-//***************************************************************************
-// File:
-//	InstrSelection.h
-// 
-// Purpose:
-//	External interface to instruction selection.
-// 
-// History:
-//	7/02/01	 -  Vikram Adve  -  Created
-//**************************************************************************/
+//===-- llvm/CodeGen/InstrSelection.h --------------------------*- C++ -*--===//
+//
+// External interface to instruction selection.
+//
+//===----------------------------------------------------------------------===//
 
 #ifndef LLVM_CODEGEN_INSTR_SELECTION_H
 #define LLVM_CODEGEN_INSTR_SELECTION_H
@@ -21,9 +15,9 @@ class InstructionNode;
 class TargetMachine;
 class Pass;
 
-/************************* Required Functions *******************************
- * Target-dependent functions that MUST be implemented for each target.
- ***************************************************************************/
+//===--------------------- Required Functions ---------------------------------
+// Target-dependent functions that MUST be implemented for each target.
+//
 
 const unsigned MAX_INSTR_PER_VMINSTR = 8;
 
diff --git a/include/llvm/CodeGen/InstrSelectionSupport.h b/include/llvm/CodeGen/InstrSelectionSupport.h
index 3f41fb4..a134e35 100644
--- a/include/llvm/CodeGen/InstrSelectionSupport.h
+++ b/include/llvm/CodeGen/InstrSelectionSupport.h
@@ -1,15 +1,9 @@
-// $Id$ -*-c++-*-
-//***************************************************************************
-// File:
-//	InstrSelectionSupport.h
-// 
-// Purpose:
-//	Target-independent instruction selection code.
-//      See SparcInstrSelection.cpp for usage.
+//===-- llvm/CodeGen/InstrSelectionSupport.h --------------------*- C++ -*-===//
+//
+//  Target-independent instruction selection code.  See SparcInstrSelection.cpp
+//  for usage.
 //      
-// History:
-//	10/10/01	 -  Vikram Adve  -  Created
-//**************************************************************************/
+//===----------------------------------------------------------------------===//
 
 #ifndef LLVM_CODEGEN_INSTR_SELECTION_SUPPORT_H
 #define LLVM_CODEGEN_INSTR_SELECTION_SUPPORT_H
diff --git a/include/llvm/CodeGen/MachineInstrAnnot.h b/include/llvm/CodeGen/MachineInstrAnnot.h
index d5f1da2..bd3f733 100644
--- a/include/llvm/CodeGen/MachineInstrAnnot.h
+++ b/include/llvm/CodeGen/MachineInstrAnnot.h
@@ -1,29 +1,20 @@
-// $Id$ -*-c++-*-
-//***************************************************************************
-// File:
-//	MachineInstrAnnot.h
+//===-- llvm/CodeGen/MachineInstrAnnot.h ------------------------*- C++ -*-===//
+//
+//  Annotations used to pass information between code generation phases.
 // 
-// Purpose:
-//      Annotations used to pass information between code generation phases.
-// 
-// History:
-//	5/10/02	 -  Vikram Adve  -  Created
-//**************************************************************************/
+//===----------------------------------------------------------------------===//
 
 #ifndef MACHINE_INSTR_ANNOT_h
 #define MACHINE_INSTR_ANNOT_h
 
 #include "llvm/Annotation.h"
 #include "llvm/CodeGen/MachineInstr.h"
-#include <vector>
 
 class Value;
 class TmpInstruction;
 class CallInst;
 
-
 class CallArgInfo {
-private:
   // Flag values for different argument passing methods
   static const unsigned char IntArgReg = 0x1;
   static const unsigned char FPArgReg  = 0x2;
@@ -60,9 +51,8 @@ public:
 
 
 class CallArgsDescriptor: public Annotation { // Annotation for a MachineInstr
-private:
   static AnnotationID AID;              // AnnotationID for this class
-  std::vector<CallArgInfo> argInfoVec;       // Descriptor for each argument
+  std::vector<CallArgInfo> argInfoVec;  // Descriptor for each argument
   const CallInst* callInstr;            // The call instruction == result value
   const Value* funcPtr;                 // Pointer for indirect calls 
   TmpInstruction* retAddrReg;           // Tmp value for return address reg.