style: fix sorting of includes and whitespace in some files

diff --git a/src/arch/alpha/faults.cc b/src/arch/alpha/faults.cc
index ff6de8d03ca522fe1904a57008fc223ee1cea26f..3264fc8b274eefb6506964be3becc95c91a5def5 100644 (file)
--- a/src/arch/alpha/faults.cc
+++ b/src/arch/alpha/faults.cc
@@ -35,6 +35,7 @@
 #include "cpu/thread_context.hh"
 #include "cpu/base.hh"
 #include "base/trace.hh"
+
 #if !FULL_SYSTEM
 #include "sim/process.hh"
 #include "mem/page_table.hh"

diff --git a/src/arch/alpha/linux/process.cc b/src/arch/alpha/linux/process.cc
index a653d7845ffae9a0274211f5dfe471119a9d3ad4..0e3c4ea37fd0b3afeff14661e7ec64d01af96252 100644 (file)
--- a/src/arch/alpha/linux/process.cc
+++ b/src/arch/alpha/linux/process.cc
@@ -32,11 +32,9 @@
 #include "arch/alpha/linux/linux.hh"
 #include "arch/alpha/linux/process.hh"
 #include "arch/alpha/isa_traits.hh"
-
 #include "base/trace.hh"
 #include "cpu/thread_context.hh"
 #include "kern/linux/linux.hh"
-
 #include "sim/process.hh"
 #include "sim/syscall_emul.hh"
 

diff --git a/src/arch/mips/faults.cc b/src/arch/mips/faults.cc
index 815784388a6909508793f583033e8b7a9b01a98d..68ee8645562dd865a337b737f0d126b923c4f8d1 100644 (file)
--- a/src/arch/mips/faults.cc
+++ b/src/arch/mips/faults.cc
@@ -32,13 +32,14 @@
  */
 
 #include "arch/mips/faults.hh"
-#include "cpu/thread_context.hh"
-#include "cpu/base.hh"
-#include "base/trace.hh"
 #include "arch/mips/pra_constants.hh"
+#include "base/trace.hh"
+#include "cpu/base.hh"
+#include "cpu/thread_context.hh"
+
 #if !FULL_SYSTEM
-#include "sim/process.hh"
 #include "mem/page_table.hh"
+#include "sim/process.hh"
 #endif
 
 namespace MipsISA

diff --git a/src/arch/mips/linux/process.cc b/src/arch/mips/linux/process.cc
index 4c3581ecb7d6f79a59bf34295242fcb243d3a32a..f3cac84e86fcb8fb5469ed4751e1cb3907441f25 100644 (file)
--- a/src/arch/mips/linux/process.cc
+++ b/src/arch/mips/linux/process.cc
@@ -33,11 +33,9 @@
 #include "arch/mips/linux/linux.hh"
 #include "arch/mips/linux/process.hh"
 #include "arch/mips/isa_traits.hh"
-
 #include "base/trace.hh"
 #include "cpu/thread_context.hh"
 #include "kern/linux/linux.hh"
-
 #include "sim/process.hh"
 #include "sim/system.hh"
 #include "sim/syscall_emul.hh"

diff --git a/src/arch/mips/locked_mem.hh b/src/arch/mips/locked_mem.hh
index 8cf94df98adca61fbdd9daa4711bdd721d26a0a0..21777e44085cdffc905c010676c5e52c3c568f16 100644 (file)
--- a/src/arch/mips/locked_mem.hh
+++ b/src/arch/mips/locked_mem.hh
@@ -42,7 +42,6 @@
 #include "base/trace.hh"
 #include "mem/request.hh"
 
-
 namespace MipsISA
 {
 

diff --git a/src/arch/mips/process.cc b/src/arch/mips/process.cc
index 7f1e9470962ed89d8961ded1d20853a44d7f36d6..fa3e3bff9a2586071e7bff2ccc8b0293144bf4b8 100644 (file)
--- a/src/arch/mips/process.cc
+++ b/src/arch/mips/process.cc
@@ -32,14 +32,11 @@
 
 #include "arch/mips/isa_traits.hh"
 #include "arch/mips/process.hh"
-
 #include "base/loader/object_file.hh"
 #include "base/loader/elf_object.hh"
 #include "base/misc.hh"
 #include "cpu/thread_context.hh"
-
 #include "mem/page_table.hh"
-
 #include "sim/process.hh"
 #include "sim/process_impl.hh"
 #include "sim/system.hh"

diff --git a/src/arch/mips/tlb.cc b/src/arch/mips/tlb.cc
index cf123074550d10f0fe62a38dde393eb047937728..e104b0bd21931179244cd85dcb89dc24ccd08667 100644 (file)
--- a/src/arch/mips/tlb.cc
+++ b/src/arch/mips/tlb.cc
@@ -47,7 +47,6 @@
 #include "mem/page_table.hh"
 #include "params/MipsTLB.hh"
 
-
 using namespace std;
 using namespace MipsISA;
 

diff --git a/src/arch/power/tlb.cc b/src/arch/power/tlb.cc
index a0ff693913b434ca5de40570185eada5ea0b673e..aa47b83c09d3c8deaa9e41e539b4f0f90893589c 100644 (file)
--- a/src/arch/power/tlb.cc
+++ b/src/arch/power/tlb.cc
@@ -50,7 +50,6 @@
 #include "params/PowerTLB.hh"
 #include "sim/process.hh"
 
-
 using namespace std;
 using namespace PowerISA;
 

diff --git a/src/arch/x86/insts/microregop.cc b/src/arch/x86/insts/microregop.cc
index 56ac4e94646b2cf868147f1e738537e4fab62364..6aee8744935dcc2fa9a043972a2e3a606f976ea5 100644 (file)
--- a/src/arch/x86/insts/microregop.cc
+++ b/src/arch/x86/insts/microregop.cc
@@ -37,10 +37,11 @@
  * Authors: Gabe Black
  */
 
+#include <string>
+
 #include "arch/x86/insts/microregop.hh"
 #include "arch/x86/regs/misc.hh"
 #include "base/condcodes.hh"
-#include <string>
 
 namespace X86ISA
 {

diff --git a/src/base/loader/aout_object.cc b/src/base/loader/aout_object.cc
index 1412adfc3d2230a1810098d79678fef69ca97e61..fe435a599bdcfb69542398349cd4bf6f6e54b72b 100644 (file)
--- a/src/base/loader/aout_object.cc
+++ b/src/base/loader/aout_object.cc
@@ -31,11 +31,8 @@
 #include <string>
 
 #include "base/loader/aout_object.hh"
-
 #include "base/loader/symtab.hh"
-
-#include "base/trace.hh"        // for DPRINTF
-
+#include "base/trace.hh"
 #include "base/loader/exec_aout.h"
 
 using namespace std;

diff --git a/src/base/loader/ecoff_object.cc b/src/base/loader/ecoff_object.cc
index d1719f1c686c1cbf7dd40b5965908436e52a1377..2027a2e1e7ed7953019366c178cf70a265e3636d 100644 (file)
--- a/src/base/loader/ecoff_object.cc
+++ b/src/base/loader/ecoff_object.cc
@@ -31,14 +31,19 @@
 #include <string>
 
 #include "base/loader/ecoff_object.hh"
-#include "base/misc.hh"
 #include "base/loader/symtab.hh"
-
-#include "base/trace.hh"        // for DPRINTF
-
-#include "base/loader/exec_ecoff.h"
+#include "base/misc.hh"
+#include "base/trace.hh"
+#include "base/types.hh"
+
+// Only alpha will be able to load ecoff files for now.
+// base/types.hh and ecoff_machdep.h must be before the other .h files
+// because they are are gathered from other code bases and require some 
+// typedefs from those files.
+#include "arch/alpha/ecoff_machdep.h"
 #include "base/loader/coff_sym.h"
 #include "base/loader/coff_symconst.h"
+#include "base/loader/exec_ecoff.h"
 
 using namespace std;
 

diff --git a/src/base/loader/elf_object.cc b/src/base/loader/elf_object.cc
index 2db206a3cdab6538a3a6edc39456a1ac7ff1dc59..a550d97657d030c3490cbfdc0baa86d32159c0fc 100644 (file)
--- a/src/base/loader/elf_object.cc
+++ b/src/base/loader/elf_object.cc
@@ -38,7 +38,7 @@
 #include "base/loader/elf_object.hh"
 #include "base/loader/symtab.hh"
 #include "base/misc.hh"
-#include "base/trace.hh"        // for DPRINTF
+#include "base/trace.hh"
 #include "sim/byteswap.hh"
 
 using namespace std;

diff --git a/src/base/loader/exec_ecoff.h b/src/base/loader/exec_ecoff.h
index 555589806c4c428176951e30f167f2e799bd358a..a076afbab5f51ad1b1404ce86c1538d44f4c5edb 100644 (file)
--- a/src/base/loader/exec_ecoff.h
+++ b/src/base/loader/exec_ecoff.h
@@ -37,9 +37,6 @@
 #ifndef        _SYS_EXEC_ECOFF_H_
 #define        _SYS_EXEC_ECOFF_H_
 
-//Only alpha will be able to load ecoff files for now
-#include "arch/alpha/ecoff_machdep.h"
-
 struct ecoff_filehdr {
         coff_ushort f_magic;   /* magic number */
         coff_ushort f_nscns;   /* # of sections */

diff --git a/src/cpu/o3/mem_dep_unit_impl.hh b/src/cpu/o3/mem_dep_unit_impl.hh
index 59344d9f71d550045ee1653df8ae462d783a494b..5f5e71624a1fadb1c9cef41d112af473520f6c8e 100644 (file)
--- a/src/cpu/o3/mem_dep_unit_impl.hh
+++ b/src/cpu/o3/mem_dep_unit_impl.hh
@@ -32,7 +32,6 @@
 
 #include "cpu/o3/inst_queue.hh"
 #include "cpu/o3/mem_dep_unit.hh"
-
 #include "params/DerivO3CPU.hh"
 
 template <class MemDepPred, class Impl>

diff --git a/src/dev/pcidev.cc b/src/dev/pcidev.cc
index b311ed8cf4df657916c42606de9ce4bfb5e9d742..26286c208c581881f569a375248fb7ce5e66c0fb 100644 (file)
--- a/src/dev/pcidev.cc
+++ b/src/dev/pcidev.cc
@@ -39,13 +39,13 @@
 #include <vector>
 
 #include "base/inifile.hh"
-#include "base/intmath.hh" // for isPowerOf2(
+#include "base/intmath.hh"
 #include "base/misc.hh"
-#include "base/str.hh"  // for to_number
+#include "base/str.hh"
 #include "base/trace.hh"
+#include "dev/alpha/tsunamireg.h"
 #include "dev/pciconfigall.hh"
 #include "dev/pcidev.hh"
-#include "dev/alpha/tsunamireg.h"
 #include "mem/packet.hh"
 #include "mem/packet_access.hh"
 #include "sim/byteswap.hh"

diff --git a/src/kern/linux/events.cc b/src/kern/linux/events.cc
index bfff816ca62cd917f6e6099dec100d7036a48532..f619dd11b5740b97b6ce7ba2520af01e3dcf0b88 100644 (file)
--- a/src/kern/linux/events.cc
+++ b/src/kern/linux/events.cc
@@ -29,16 +29,16 @@
  *          Ali Saidi
  */
 
-#include "sim/arguments.hh"
+#include <sstream>
+
 #include "base/trace.hh"
 #include "cpu/thread_context.hh"
 #include "kern/linux/events.hh"
 #include "kern/linux/printk.hh"
 #include "kern/system_events.hh"
+#include "sim/arguments.hh"
 #include "sim/system.hh"
 
-#include <sstream>
-
 namespace Linux {
 
 void

diff --git a/src/mem/cache/base.hh b/src/mem/cache/base.hh
index 94cdc959c4de859f99ad84ea1bd0a63678f82453..867d771210ad9a87c51ad8d315dfd2ffeadcf43c 100644 (file)
--- a/src/mem/cache/base.hh
+++ b/src/mem/cache/base.hh
@@ -38,10 +38,10 @@
 #ifndef __BASE_CACHE_HH__
 #define __BASE_CACHE_HH__
 
-#include <vector>
-#include <string>
-#include <list>
 #include <algorithm>
+#include <list>
+#include <string>
+#include <vector>
 
 #include "base/misc.hh"
 #include "base/statistics.hh"

diff --git a/src/mem/cache/tags/iic.cc b/src/mem/cache/tags/iic.cc
index b5bd66366e4037e126eaefaed03514acae8f2ecd..1315a17eebdb3ec20aafee8e85e78a259670ef04 100644 (file)
--- a/src/mem/cache/tags/iic.cc
+++ b/src/mem/cache/tags/iic.cc
@@ -34,18 +34,15 @@
  */
 
 #include <algorithm>
+#include <cmath>
 #include <string>
 #include <vector>
 
-#include <math.h>
-
+#include "base/intmath.hh"
+#include "base/trace.hh"
 #include "mem/cache/base.hh"
 #include "mem/cache/tags/iic.hh"
-#include "base/intmath.hh"
-#include "sim/core.hh" // for curTick
-
-#include "base/trace.hh" // for DPRINTF
-
+#include "sim/core.hh"
 
 using namespace std;
 

diff --git a/src/mem/cache/tags/lru.cc b/src/mem/cache/tags/lru.cc
index a99936abf4e7649893591c889fdf407cdc559ae6..8a8b0d0d650c714a23eadb7d62cddb8578ec568b 100644 (file)
--- a/src/mem/cache/tags/lru.cc
+++ b/src/mem/cache/tags/lru.cc
@@ -35,11 +35,11 @@
 
 #include <string>
 
-#include "mem/cache/base.hh"
 #include "base/intmath.hh"
+#include "mem/cache/base.hh"
+#include "mem/cache/tags/cacheset.hh"
 #include "mem/cache/tags/lru.hh"
 #include "sim/core.hh"
-#include "cacheset.hh"
 
 using namespace std;