* Removed extraneous #includes

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

llvm-svn: 3277

6 files changed, 28 insertions, 63 deletions

diff --git a/llvm/lib/CodeGen/InstrSched/InstrScheduling.cpp b/llvm/lib/CodeGen/InstrSched/InstrScheduling.cpp
index 3eae49ce1c5..97360c3dd08 100644
--- a/llvm/lib/CodeGen/InstrSched/InstrScheduling.cpp
+++ b/llvm/lib/CodeGen/InstrSched/InstrScheduling.cpp
@@ -13,7 +13,6 @@
 #include "llvm/Analysis/LiveVar/FunctionLiveVarInfo.h" // FIXME: Remove when modularized better
 #include "llvm/Target/TargetMachine.h"
 #include "llvm/BasicBlock.h"
-#include "llvm/Instruction.h"
 #include "Support/CommandLine.h"
 #include <algorithm>
 using std::cerr;
diff --git a/llvm/lib/CodeGen/InstrSched/SchedGraph.h b/llvm/lib/CodeGen/InstrSched/SchedGraph.h
index 0d59734e2da..eac9c1c6d60 100644
--- a/llvm/lib/CodeGen/InstrSched/SchedGraph.h
+++ b/llvm/lib/CodeGen/InstrSched/SchedGraph.h
@@ -1,20 +1,15 @@
-/* -*-C++-*-
- ****************************************************************************
- * File:
- *	SchedGraph.h
- * 
- * Purpose:
- *	Scheduling graph based on SSA graph plus extra dependence edges
- *	capturing dependences due to machine resources (machine registers,
- *	CC registers, and any others).
- * 
- * Strategy:
- *	This graph tries to leverage the SSA graph as much as possible,
- *	but captures the extra dependences through a common interface.
- * 
- * History:
- *	7/20/01	 -  Vikram Adve  -  Created
- ***************************************************************************/
+//===-- SchedGraph.h - Scheduling Graph --------------------------*- C++ -*--=//
+//
+// Purpose:
+//	Scheduling graph based on SSA graph plus extra dependence edges
+//	capturing dependences due to machine resources (machine registers,
+//	CC registers, and any others).
+// 
+// Strategy:
+//	This graph tries to leverage the SSA graph as much as possible,
+//	but captures the extra dependences through a common interface.
+// 
+//===----------------------------------------------------------------------===//
 
 #ifndef LLVM_CODEGEN_SCHEDGRAPH_H
 #define LLVM_CODEGEN_SCHEDGRAPH_H
diff --git a/llvm/lib/CodeGen/InstrSched/SchedPriorities.cpp b/llvm/lib/CodeGen/InstrSched/SchedPriorities.cpp
index 6277576c23b..57126aaa334 100644
--- a/llvm/lib/CodeGen/InstrSched/SchedPriorities.cpp
+++ b/llvm/lib/CodeGen/InstrSched/SchedPriorities.cpp
@@ -1,10 +1,4 @@
-// $Id$ -*-C++-*-
-//***************************************************************************
-// File:
-//	SchedPriorities.h
-// 
-// Purpose:
-//	Encapsulate heuristics for instruction scheduling.
+//===-- SchedPriorities.h - Encapsulate scheduling heuristics -------------===//
 // 
 // Strategy:
 //    Priority ordering rules:
@@ -13,10 +7,8 @@
 //    (3) Instruction that has the maximum number of dependent instructions.
 //    Note that rules 2 and 3 are only used if issue conflicts prevent
 //    choosing a higher priority instruction by rule 1.
-// 
-// History:
-//	7/30/01	 -  Vikram Adve  -  Created
-//**************************************************************************/
+//
+//===----------------------------------------------------------------------===//
 
 #include "SchedPriorities.h"
 #include "llvm/Analysis/LiveVar/FunctionLiveVarInfo.h"
diff --git a/llvm/lib/CodeGen/InstrSched/SchedPriorities.h b/llvm/lib/CodeGen/InstrSched/SchedPriorities.h
index 4d763d21c5f..31d974dc4bb 100644
--- a/llvm/lib/CodeGen/InstrSched/SchedPriorities.h
+++ b/llvm/lib/CodeGen/InstrSched/SchedPriorities.h
@@ -1,10 +1,4 @@
-// -*-C++-*-
-//***************************************************************************
-// File:
-//	SchedPriorities.h
-// 
-// Purpose:
-//	Encapsulate heuristics for instruction scheduling.
+//===-- SchedPriorities.h - Encapsulate scheduling heuristics --*- C++ -*--===//
 // 
 // Strategy:
 //    Priority ordering rules:
@@ -13,10 +7,8 @@
 //    (3) Instruction that has the maximum number of dependent instructions.
 //    Note that rules 2 and 3 are only used if issue conflicts prevent
 //    choosing a higher priority instruction by rule 1.
-// 
-// History:
-//	7/30/01	 -  Vikram Adve  -  Created
-//**************************************************************************/
+//
+//===----------------------------------------------------------------------===//
 
 #ifndef LLVM_CODEGEN_SCHEDPRIORITIES_H
 #define LLVM_CODEGEN_SCHEDPRIORITIES_H
@@ -26,7 +18,7 @@
 #include "llvm/Target/MachineSchedInfo.h"
 #include <list>
 #include <Support/hash_set>
-#include <iostream>
+
 class Function;
 class MachineInstr;
 class SchedulingManager;
diff --git a/llvm/lib/CodeGen/RegAlloc/PhyRegAlloc.cpp b/llvm/lib/CodeGen/RegAlloc/PhyRegAlloc.cpp
index 66f6fed2bdc..415c7989989 100644
--- a/llvm/lib/CodeGen/RegAlloc/PhyRegAlloc.cpp
+++ b/llvm/lib/CodeGen/RegAlloc/PhyRegAlloc.cpp
@@ -1,13 +1,8 @@
-//***************************************************************************
-// File:
-//	PhyRegAlloc.cpp
+//===-- PhyRegAlloc.cpp ---------------------------------------------------===//
 // 
-// Purpose:
-//      Register allocation for LLVM.
-//	
-// History:
-//	9/10/01	 -  Ruchira Sasanka - created.
-//**************************************************************************/
+//  Register allocation for LLVM.
+// 
+//===----------------------------------------------------------------------===//
 
 #include "llvm/CodeGen/RegisterAllocation.h"
 #include "llvm/CodeGen/PhyRegAlloc.h"
diff --git a/llvm/lib/Target/MachineFrameInfo.cpp b/llvm/lib/Target/MachineFrameInfo.cpp
index be7feee5eec..0eeacbc2b0a 100644
--- a/llvm/lib/Target/MachineFrameInfo.cpp
+++ b/llvm/lib/Target/MachineFrameInfo.cpp
@@ -1,22 +1,14 @@
-// $Id$ -*-c++-*-
-//***************************************************************************
-// File:
-//	MachineFrameInfo.cpp
+//===-- MachineFrameInfo.cpp-----------------------------------------------===//
 // 
-// Purpose:
-//	Interface to layout of stack frame on target machine.
-//      Most functions of class MachineFrameInfo have to be machine-specific
-//      so there is little code here.
+// Interface to layout of stack frame on target machine.  Most functions of
+// class MachineFrameInfo have to be machine-specific so there is little code
+// here.
 // 
-// History:
-//	 4/17/02	 -  Vikram Adve  -  Created
-//**************************************************************************/
-
+//===----------------------------------------------------------------------===//
 
 #include "llvm/Target/MachineFrameInfo.h"
 #include "llvm/CodeGen/MachineCodeForMethod.h"
 
-
 int
 MachineFrameInfo::getIncomingArgOffset(MachineCodeForMethod& mcInfo,
                                        unsigned argNum) const