includes: sort all includes

diff --git a/src/arch/alpha/faults.cc b/src/arch/alpha/faults.cc
index 38386cce1a66f83f809285416e29359e462ac354..4f84a151a07d67d3b28e9d58448dabe160753999 100644 (file)
--- a/src/arch/alpha/faults.cc
+++ b/src/arch/alpha/faults.cc
@@ -32,13 +32,13 @@
 #include "arch/alpha/ev5.hh"
 #include "arch/alpha/faults.hh"
 #include "arch/alpha/tlb.hh"
-#include "cpu/thread_context.hh"
-#include "cpu/base.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 AlphaISA {

diff --git a/src/arch/alpha/isa.hh b/src/arch/alpha/isa.hh
index 500bd039b195bffeb7d5f206c3924e4d1d217fa5..f1bfcebec0271408104e62cc4a97d5d3dbe19871 100644 (file)
--- a/src/arch/alpha/isa.hh
+++ b/src/arch/alpha/isa.hh
@@ -31,10 +31,9 @@
 #ifndef __ARCH_ALPHA_ISA_HH__
 #define __ARCH_ALPHA_ISA_HH__
 
-#include <string.h>
-
-#include <string>
+#include <cstring>
 #include <iostream>
+#include <string>
 
 #include "arch/alpha/registers.hh"
 #include "arch/alpha/types.hh"

diff --git a/src/arch/alpha/isa/main.isa b/src/arch/alpha/isa/main.isa
index 077520139bfba7cb703a1dc8a13bd0ba8d4d7bbb..4b5678e81fe90080453b6aa814cab5e9a0e57760 100644 (file)
--- a/src/arch/alpha/isa/main.isa
+++ b/src/arch/alpha/isa/main.isa
@@ -41,16 +41,16 @@
 //
 
 output header {{
-#include <sstream>
-#include <iostream>
 #include <iomanip>
+#include <iostream>
+#include <sstream>
 
 #include "arch/alpha/faults.hh"
 #include "arch/alpha/types.hh"
 #include "config/ss_compatible_fp.hh"
 #include "cpu/static_inst.hh"
-#include "mem/request.hh"  // some constructors use MemReq flags
 #include "mem/packet.hh"
+#include "mem/request.hh"  // some constructors use MemReq flags
 }};
 
 output decoder {{
@@ -58,9 +58,9 @@ output decoder {{
 
 #include "arch/alpha/registers.hh"
 #include "arch/alpha/regredir.hh"
+#include "base/loader/symtab.hh"
 #include "base/cprintf.hh"
 #include "base/fenv.hh"
-#include "base/loader/symtab.hh"
 #include "config/ss_compatible_fp.hh"
 #include "cpu/thread_context.hh"  // for Jump::branchTarget()
 #include "mem/packet.hh"
@@ -71,16 +71,16 @@ using namespace AlphaISA;
 output exec {{
 #include <math.h>
 
+#include "arch/alpha/registers.hh"
 #include "arch/alpha/regredir.hh"
 #include "base/cp_annotate.hh"
-#include "sim/pseudo_inst.hh"
-#include "arch/alpha/registers.hh"
 #include "base/fenv.hh"
 #include "config/ss_compatible_fp.hh"
 #include "cpu/base.hh"
 #include "cpu/exetrace.hh"
 #include "mem/packet.hh"
 #include "mem/packet_access.hh"
+#include "sim/pseudo_inst.hh"
 #include "sim/sim_exit.hh"
 
 using namespace AlphaISA;

diff --git a/src/arch/alpha/linux/system.cc b/src/arch/alpha/linux/system.cc
index 1bb8bd2cf9b3c491da0db396286fd19477b7507c..e7440e003c17a9c9c8c38c00d0b0c9c3283836a0 100644 (file)
--- a/src/arch/alpha/linux/system.cc
+++ b/src/arch/alpha/linux/system.cc
@@ -40,17 +40,17 @@
  * up boot time.
  */
 
-#include "arch/vtophys.hh"
-#include "arch/alpha/idle_event.hh"
 #include "arch/alpha/linux/system.hh"
 #include "arch/alpha/linux/threadinfo.hh"
+#include "arch/alpha/idle_event.hh"
 #include "arch/alpha/system.hh"
+#include "arch/vtophys.hh"
 #include "base/loader/symtab.hh"
-#include "cpu/thread_context.hh"
 #include "cpu/base.hh"
+#include "cpu/thread_context.hh"
 #include "dev/platform.hh"
-#include "kern/linux/printk.hh"
 #include "kern/linux/events.hh"
+#include "kern/linux/printk.hh"
 #include "mem/physical.hh"
 #include "mem/port.hh"
 #include "sim/arguments.hh"

diff --git a/src/arch/alpha/mt.hh b/src/arch/alpha/mt.hh
index 57cf90f79c98d78c042fd0679a53f31da5f5ee5a..03ecf8486c432e7d37ef3be62869e1c4942b728e 100644 (file)
--- a/src/arch/alpha/mt.hh
+++ b/src/arch/alpha/mt.hh
@@ -38,12 +38,12 @@
  * ISA-specific helper functions for multithreaded execution.
  */
 
+#include <iostream>
+
 #include "arch/isa_traits.hh"
 #include "base/bitfield.hh"
-#include "base/trace.hh"
 #include "base/misc.hh"
-
-#include <iostream>
+#include "base/trace.hh"
 using namespace std;
 
 namespace AlphaISA

diff --git a/src/arch/alpha/process.cc b/src/arch/alpha/process.cc
index 3c3fd9b2533d5d9ee3c1b1b3f6fc871acd2b66cb..269a7bd635f5b10fabd93781e7eef9fc12ba0f60 100644 (file)
--- a/src/arch/alpha/process.cc
+++ b/src/arch/alpha/process.cc
@@ -31,8 +31,8 @@
 
 #include "arch/alpha/isa_traits.hh"
 #include "arch/alpha/process.hh"
-#include "base/loader/object_file.hh"
 #include "base/loader/elf_object.hh"
+#include "base/loader/object_file.hh"
 #include "base/misc.hh"
 #include "cpu/thread_context.hh"
 #include "mem/page_table.hh"

diff --git a/src/arch/alpha/remote_gdb.cc b/src/arch/alpha/remote_gdb.cc
index 9a2a5f23f31722946274c83adb4de98bf3eee0fe..f05b448fad312a97004e2507399fd6d5dbf5a40e 100644 (file)
--- a/src/arch/alpha/remote_gdb.cc
+++ b/src/arch/alpha/remote_gdb.cc
@@ -127,15 +127,15 @@
 #endif
 
 #include "arch/alpha/kgdb.h"
-#include "arch/alpha/utility.hh"
 #include "arch/alpha/regredir.hh"
 #include "arch/alpha/remote_gdb.hh"
+#include "arch/alpha/utility.hh"
 #include "base/intmath.hh"
 #include "base/remote_gdb.hh"
 #include "base/socket.hh"
 #include "base/trace.hh"
-#include "cpu/thread_context.hh"
 #include "cpu/static_inst.hh"
+#include "cpu/thread_context.hh"
 #include "mem/physical.hh"
 #include "mem/port.hh"
 #include "sim/system.hh"

diff --git a/src/arch/alpha/remote_gdb.hh b/src/arch/alpha/remote_gdb.hh
index 43d0580d8efef8ab2466ae06b676dfef30cc150f..b7aef5f647685db798dfc43eeb9dfce046801b4d 100644 (file)
--- a/src/arch/alpha/remote_gdb.hh
+++ b/src/arch/alpha/remote_gdb.hh
@@ -33,12 +33,12 @@
 
 #include <map>
 
-#include "arch/alpha/types.hh"
 #include "arch/alpha/kgdb.h"
-#include "base/remote_gdb.hh"
-#include "cpu/pc_event.hh"
+#include "arch/alpha/types.hh"
 #include "base/pollevent.hh"
+#include "base/remote_gdb.hh"
 #include "base/socket.hh"
+#include "cpu/pc_event.hh"
 
 class System;
 class ThreadContext;

diff --git a/src/arch/alpha/tlb.cc b/src/arch/alpha/tlb.cc
index 58d54e79022479ade84c8cefa789c3b15f9d8b6d..6bcfffa3aaabb4a871088d173b335eb9dab03fb4 100644 (file)
--- a/src/arch/alpha/tlb.cc
+++ b/src/arch/alpha/tlb.cc
@@ -33,9 +33,9 @@
 #include <string>
 #include <vector>
 
+#include "arch/alpha/faults.hh"
 #include "arch/alpha/pagetable.hh"
 #include "arch/alpha/tlb.hh"
-#include "arch/alpha/faults.hh"
 #include "base/inifile.hh"
 #include "base/str.hh"
 #include "base/trace.hh"

diff --git a/src/arch/alpha/tru64/process.cc b/src/arch/alpha/tru64/process.cc
index b10fea02b630a60958cbb38a107e4aaa4a1e0c14..96fe2725fc5df606af346e139a1520d8d1b1c53c 100644 (file)
--- a/src/arch/alpha/tru64/process.cc
+++ b/src/arch/alpha/tru64/process.cc
@@ -29,9 +29,9 @@
  *          Ali Saidi
  */
 
+#include "arch/alpha/tru64/process.hh"
 #include "arch/alpha/tru64/tru64.hh"
 #include "arch/alpha/isa_traits.hh"
-#include "arch/alpha/tru64/process.hh"
 #include "cpu/thread_context.hh"
 #include "kern/tru64/tru64.hh"
 #include "sim/byteswap.hh"

diff --git a/src/arch/alpha/types.hh b/src/arch/alpha/types.hh
index 4713f0849bd1869b6087e6768b96547e79b50a6d..645e091050deb11b619d59d552d0ce191f206385 100644 (file)
--- a/src/arch/alpha/types.hh
+++ b/src/arch/alpha/types.hh
@@ -32,8 +32,8 @@
 #ifndef __ARCH_ALPHA_TYPES_HH__
 #define __ARCH_ALPHA_TYPES_HH__
 
-#include "base/types.hh"
 #include "arch/generic/types.hh"
+#include "base/types.hh"
 
 namespace AlphaISA {
 

diff --git a/src/arch/alpha/utility.hh b/src/arch/alpha/utility.hh
index fdac8b8d1c84efd6872010a25e77ccdd894a08d2..8759b49ce19adfbdc0c85c64c278fb618b1397af 100644 (file)
--- a/src/arch/alpha/utility.hh
+++ b/src/arch/alpha/utility.hh
@@ -32,9 +32,9 @@
 #ifndef __ARCH_ALPHA_UTILITY_HH__
 #define __ARCH_ALPHA_UTILITY_HH__
 
-#include "arch/alpha/types.hh"
 #include "arch/alpha/isa_traits.hh"
 #include "arch/alpha/registers.hh"
+#include "arch/alpha/types.hh"
 #include "base/misc.hh"
 #include "config/full_system.hh"
 #include "cpu/static_inst.hh"

diff --git a/src/arch/arm/faults.cc b/src/arch/arm/faults.cc
index 01d43f3385842b2a49b7a770b70a0afd5422ead3..4150adba68ee7dcd1e7510481da2d93ac6d950da 100644 (file)
--- a/src/arch/arm/faults.cc
+++ b/src/arch/arm/faults.cc
@@ -43,9 +43,9 @@
  */
 
 #include "arch/arm/faults.hh"
-#include "cpu/thread_context.hh"
-#include "cpu/base.hh"
 #include "base/trace.hh"
+#include "cpu/base.hh"
+#include "cpu/thread_context.hh"
 
 namespace ArmISA
 {

diff --git a/src/arch/arm/faults.hh b/src/arch/arm/faults.hh
index 8df8d0abfa01f9e5186baf9a6e42fd74153df090..234d8cfec61e6d151367535fc6b046c09df0ae22 100644 (file)
--- a/src/arch/arm/faults.hh
+++ b/src/arch/arm/faults.hh
@@ -47,9 +47,9 @@
 
 #include "arch/arm/miscregs.hh"
 #include "arch/arm/types.hh"
+#include "base/misc.hh"
 #include "config/full_system.hh"
 #include "sim/faults.hh"
-#include "base/misc.hh"
 
 // The design of the "name" and "vect" functions is in sim/faults.hh
 

diff --git a/src/arch/arm/insts/macromem.cc b/src/arch/arm/insts/macromem.cc
index 28852bf89807aaf9a7e74a5ac9e21073b2c1c02a..e056856b6f96004e60fa0fe7a3d59ea3480b1aba 100644 (file)
--- a/src/arch/arm/insts/macromem.cc
+++ b/src/arch/arm/insts/macromem.cc
@@ -40,9 +40,10 @@
  * Authors: Stephen Hines
  */
 
+#include <sstream>
+
 #include "arch/arm/insts/macromem.hh"
 #include "arch/arm/decoder.hh"
-#include <sstream>
 
 using namespace std;
 using namespace ArmISAInst;

diff --git a/src/arch/arm/insts/static_inst.cc b/src/arch/arm/insts/static_inst.cc
index 52811175980d0be976fdc06d2cff5219bb8bb7ca..8306c620f4a1cebb917cb5d0194cb411f756c33f 100644 (file)
--- a/src/arch/arm/insts/static_inst.cc
+++ b/src/arch/arm/insts/static_inst.cc
@@ -40,11 +40,11 @@
  * Authors: Stephen Hines
  */
 
-#include "arch/arm/faults.hh"
 #include "arch/arm/insts/static_inst.hh"
+#include "arch/arm/faults.hh"
+#include "base/loader/symtab.hh"
 #include "base/condcodes.hh"
 #include "base/cprintf.hh"
-#include "base/loader/symtab.hh"
 
 namespace ArmISA
 {

diff --git a/src/arch/arm/insts/vfp.hh b/src/arch/arm/insts/vfp.hh
index e962704e04111f380a94010f25a7b47d20663aae..57b74d040fdca051b4e4cb8e2e9cc34a2d65166f 100644 (file)
--- a/src/arch/arm/insts/vfp.hh
+++ b/src/arch/arm/insts/vfp.hh
@@ -40,11 +40,13 @@
 #ifndef __ARCH_ARM_INSTS_VFP_HH__
 #define __ARCH_ARM_INSTS_VFP_HH__
 
-#include "arch/arm/insts/misc.hh"
-#include "arch/arm/miscregs.hh"
 #include <fenv.h>
+
 #include <cmath>
 
+#include "arch/arm/insts/misc.hh"
+#include "arch/arm/miscregs.hh"
+
 namespace ArmISA
 {
 

diff --git a/src/arch/arm/intregs.hh b/src/arch/arm/intregs.hh
index 2cbed6c59a535da20a6d719bbd95008e05cfd373..9da91010644528c7b57ea464722954dd494b6d19 100644 (file)
--- a/src/arch/arm/intregs.hh
+++ b/src/arch/arm/intregs.hh
@@ -40,7 +40,7 @@
  * Authors: Gabe Black
  */
 
-#include <assert.h>
+#include <cassert>
 
 #ifndef __ARCH_ARM_INTREGS_HH__
 #define __ARCH_ARM_INTREGS_HH__

diff --git a/src/arch/arm/isa/includes.isa b/src/arch/arm/isa/includes.isa
index 5840cc9b278705368ceff14f4eac7ac93a15ecb2..aebce09442a9dda3747ef367d09153748632d5d7 100644 (file)
--- a/src/arch/arm/isa/includes.isa
+++ b/src/arch/arm/isa/includes.isa
@@ -46,8 +46,8 @@
 //
 
 output header {{
-#include <sstream>
 #include <iostream>
+#include <sstream>
 
 #include "arch/arm/insts/branch.hh"
 #include "arch/arm/insts/macromem.hh"
@@ -67,21 +67,21 @@ output decoder {{
 #include "arch/arm/intregs.hh"
 #include "arch/arm/isa_traits.hh"
 #include "arch/arm/utility.hh"
-#include "base/cprintf.hh"
 #include "base/loader/symtab.hh"
+#include "base/cprintf.hh"
 #include "cpu/thread_context.hh"
 
 using namespace ArmISA;
 }};
 
 output exec {{
+#include <cmath>
+
 #include "arch/arm/faults.hh"
 #include "arch/arm/isa_traits.hh"
 #include "arch/arm/utility.hh"
 #include "base/condcodes.hh"
 #include "sim/pseudo_inst.hh"
-
-#include <cmath>
 #if defined(linux)
 #include <fenv.h>
 #endif

diff --git a/src/arch/arm/linux/atag.hh b/src/arch/arm/linux/atag.hh
index d01474ac0f899e24e27cb9f84ebe8766d4082b4f..b7c37dffdc0b2a1bef31b424527a4996ca955a8a 100644 (file)
--- a/src/arch/arm/linux/atag.hh
+++ b/src/arch/arm/linux/atag.hh
@@ -42,6 +42,7 @@
 
 #include <cstring>
 #include <string>
+
 #include "base/types.hh"
 
 enum {

diff --git a/src/arch/arm/linux/linux.cc b/src/arch/arm/linux/linux.cc
index a26567475a7db4e718cd4d3fe23d359da0c6da31..1e3a1e725dafb613983cfe0fa29a3576d575ea7e 100644 (file)
--- a/src/arch/arm/linux/linux.cc
+++ b/src/arch/arm/linux/linux.cc
@@ -29,10 +29,10 @@
  * Authors: Stephen Hines
  */
 
-#include "arch/arm/linux/linux.hh"
-
 #include <fcntl.h>
 
+#include "arch/arm/linux/linux.hh"
+
 // open(2) flags translation table
 OpenFlagTransTable ArmLinux::openFlagTable[] = {
 #ifdef _MSC_VER

diff --git a/src/arch/arm/linux/process.cc b/src/arch/arm/linux/process.cc
index 6b449c2e75665a3555e8a88f19b71a2056990391..f177492521292c5605f97a8eac6deffdb814d3a9 100644 (file)
--- a/src/arch/arm/linux/process.cc
+++ b/src/arch/arm/linux/process.cc
@@ -46,11 +46,9 @@
 #include "arch/arm/linux/linux.hh"
 #include "arch/arm/linux/process.hh"
 #include "arch/arm/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"
 #include "sim/system.hh"

diff --git a/src/arch/arm/linux/process.hh b/src/arch/arm/linux/process.hh
index f0a81c5fcabe79cff01f833f551dc72c78103db4..854b0b176db3eea6df82c726ac03449f504e0b56 100644 (file)
--- a/src/arch/arm/linux/process.hh
+++ b/src/arch/arm/linux/process.hh
@@ -33,7 +33,6 @@
 
 #include "arch/arm/process.hh"
 
-
 /// A process with emulated Arm/Linux syscalls.
 class ArmLinuxProcess : public ArmLiveProcess
 {

diff --git a/src/arch/arm/linux/system.cc b/src/arch/arm/linux/system.cc
index 7aff2b6ef2e3a9fee1660120497d3a2de028b3a8..0d34121b4b58088abfa74cd238b2afb5d79e83aa 100644 (file)
--- a/src/arch/arm/linux/system.cc
+++ b/src/arch/arm/linux/system.cc
@@ -40,9 +40,9 @@
  * Authors: Ali Saidi
  */
 
-#include "arch/arm/isa_traits.hh"
 #include "arch/arm/linux/atag.hh"
 #include "arch/arm/linux/system.hh"
+#include "arch/arm/isa_traits.hh"
 #include "arch/arm/utility.hh"
 #include "base/loader/object_file.hh"
 #include "base/loader/symtab.hh"

diff --git a/src/arch/arm/locked_mem.hh b/src/arch/arm/locked_mem.hh
index f902bdb49548c9817b8d21009c717f05a2474d9e..f95542bb06b0591d57d29e325985a0b64c1c9996 100644 (file)
--- a/src/arch/arm/locked_mem.hh
+++ b/src/arch/arm/locked_mem.hh
@@ -43,7 +43,6 @@
 #include "arch/arm/miscregs.hh"
 #include "mem/request.hh"
 
-
 namespace ArmISA
 {
 template <class XC>

diff --git a/src/arch/arm/pagetable.hh b/src/arch/arm/pagetable.hh
index 46322046f6ce2e467c866ce53655171234c02dcc..6d84fbf7bf08916ddb468ba339cb880128698a37 100644 (file)
--- a/src/arch/arm/pagetable.hh
+++ b/src/arch/arm/pagetable.hh
@@ -47,7 +47,6 @@
 #include "arch/arm/utility.hh"
 #include "arch/arm/vtophys.hh"
 #include "config/full_system.hh"
-
 #include "sim/serialize.hh"
 
 namespace ArmISA {

diff --git a/src/arch/arm/predecoder.hh b/src/arch/arm/predecoder.hh
index e650d52d60184542a7ab768ec22cb7a9d310aa76..188f675bb2286ee3aedd6a6723a0458c51a3ff13 100644 (file)
--- a/src/arch/arm/predecoder.hh
+++ b/src/arch/arm/predecoder.hh
@@ -47,8 +47,8 @@
 
 #include <cassert>
 
-#include "arch/arm/types.hh"
 #include "arch/arm/miscregs.hh"
+#include "arch/arm/types.hh"
 #include "base/types.hh"
 
 class ThreadContext;

diff --git a/src/arch/arm/process.hh b/src/arch/arm/process.hh
index 8816b765d86aae5219c32632dcfc59a0795aa16f..26a59323f30afdca0520991fb3c001fdff2e8531 100644 (file)
--- a/src/arch/arm/process.hh
+++ b/src/arch/arm/process.hh
@@ -33,6 +33,7 @@
 
 #include <string>
 #include <vector>
+
 #include "base/loader/object_file.hh"
 #include "sim/process.hh"
 

diff --git a/src/arch/arm/registers.hh b/src/arch/arm/registers.hh
index 30289ff27938db0ae1330bf2fc33598366620d41..14ec0347184a9c41b2fbceb9b231682447161323 100644 (file)
--- a/src/arch/arm/registers.hh
+++ b/src/arch/arm/registers.hh
@@ -43,8 +43,8 @@
 #ifndef __ARCH_ARM_REGISTERS_HH__
 #define __ARCH_ARM_REGISTERS_HH__
 
-#include "arch/arm/max_inst_regs.hh"
 #include "arch/arm/intregs.hh"
+#include "arch/arm/max_inst_regs.hh"
 #include "arch/arm/miscregs.hh"
 
 namespace ArmISA {

diff --git a/src/arch/arm/remote_gdb.cc b/src/arch/arm/remote_gdb.cc
index bf763957523a11c002867ebc1ab3cb6868ecb4c2..2a4680782d04a5caabe60159d3bb4931dff25486 100644 (file)
--- a/src/arch/arm/remote_gdb.cc
+++ b/src/arch/arm/remote_gdb.cc
@@ -139,22 +139,22 @@
 #include "arch/arm/vtophys.hh"
 #endif
 
-#include "arch/arm/utility.hh"
-#include "arch/arm/remote_gdb.hh"
+#include "arch/arm/pagetable.hh"
 #include "arch/arm/registers.hh"
+#include "arch/arm/remote_gdb.hh"
+#include "arch/arm/utility.hh"
 #include "arch/arm/vtophys.hh"
 #include "base/intmath.hh"
 #include "base/remote_gdb.hh"
 #include "base/socket.hh"
 #include "base/trace.hh"
+#include "cpu/static_inst.hh"
 #include "cpu/thread_context.hh"
 #include "cpu/thread_state.hh"
-#include "cpu/static_inst.hh"
+#include "mem/page_table.hh"
 #include "mem/physical.hh"
 #include "mem/port.hh"
 #include "sim/system.hh"
-#include "arch/arm/pagetable.hh"
-#include "mem/page_table.hh"
 
 using namespace std;
 using namespace ArmISA;

diff --git a/src/arch/arm/system.cc b/src/arch/arm/system.cc
index f6e265ae45a3fe05c0d92ac57fa583b174549b57..d61db4cfe952398f11fbf37a2fec4d12f3dbe556 100644 (file)
--- a/src/arch/arm/system.cc
+++ b/src/arch/arm/system.cc
@@ -40,9 +40,10 @@
  * Authors: Ali Saidi
  */
 
-#include "arch/arm/system.hh"
 #include <iostream>
 
+#include "arch/arm/system.hh"
+
 using namespace std;
 using namespace Linux;
 

diff --git a/src/arch/arm/system.hh b/src/arch/arm/system.hh
index c64673df53bc1def8c2ce41f573d1f4d9e6cd82e..8711e7cce50e273bb8537aaae20a9b32745fe030 100644 (file)
--- a/src/arch/arm/system.hh
+++ b/src/arch/arm/system.hh
@@ -46,10 +46,10 @@
 #include <string>
 #include <vector>
 
+#include "kern/linux/events.hh"
 #include "params/ArmSystem.hh"
 #include "sim/sim_object.hh"
 #include "sim/system.hh"
-#include "kern/linux/events.hh"
 
 class ArmSystem : public System
 {

diff --git a/src/arch/arm/table_walker.cc b/src/arch/arm/table_walker.cc
index 2d0e323f669df2dfb1b2c1e971f6b48896fc39e2..9296b951a5e5bbdf350a354ba17572dc267240e2 100644 (file)
--- a/src/arch/arm/table_walker.cc
+++ b/src/arch/arm/table_walker.cc
@@ -40,9 +40,9 @@
 #include "arch/arm/faults.hh"
 #include "arch/arm/table_walker.hh"
 #include "arch/arm/tlb.hh"
-#include "dev/io_device.hh"
 #include "cpu/base.hh"
 #include "cpu/thread_context.hh"
+#include "dev/io_device.hh"
 #include "sim/system.hh"
 
 using namespace ArmISA;

diff --git a/src/arch/arm/table_walker.hh b/src/arch/arm/table_walker.hh
index 96a39cc619776a60e560cb1819ece342afcb2d17..85db1fa777f868974edbacde12a4b5256ad0127b 100644 (file)
--- a/src/arch/arm/table_walker.hh
+++ b/src/arch/arm/table_walker.hh
@@ -46,7 +46,6 @@
 #include "arch/arm/tlb.hh"
 #include "mem/mem_object.hh"
 #include "mem/request.hh"
-#include "mem/request.hh"
 #include "params/ArmTableWalker.hh"
 #include "sim/eventq.hh"
 #include "sim/fault_fwd.hh"

diff --git a/src/arch/arm/tlb.hh b/src/arch/arm/tlb.hh
index e60de38ddecb89d6ba00d540efbd32bf2f05170f..269128c2a1cc97c475e7d5b6b090e9c0e7840c1d 100644 (file)
--- a/src/arch/arm/tlb.hh
+++ b/src/arch/arm/tlb.hh
@@ -46,9 +46,9 @@
 #include <map>
 
 #include "arch/arm/isa_traits.hh"
+#include "arch/arm/pagetable.hh"
 #include "arch/arm/utility.hh"
 #include "arch/arm/vtophys.hh"
-#include "arch/arm/pagetable.hh"
 #include "base/statistics.hh"
 #include "mem/request.hh"
 #include "params/ArmTLB.hh"

diff --git a/src/arch/arm/vtophys.hh b/src/arch/arm/vtophys.hh
index 12b4846edbcb873b5eb50b020d949b1047a0b857..a85209a4a04518f584da2738987583dcc4a67b18 100644 (file)
--- a/src/arch/arm/vtophys.hh
+++ b/src/arch/arm/vtophys.hh
@@ -37,7 +37,6 @@
 #include "arch/arm/isa_traits.hh"
 #include "arch/arm/utility.hh"
 
-
 class ThreadContext;
 class FunctionalPort;
 

diff --git a/src/arch/generic/debugfaults.hh b/src/arch/generic/debugfaults.hh
index acffadc343ac37518141e5e549e1066230d6e677..68bc6c5330c57ac639c26a8f3a46c5968cf401b6 100644 (file)
--- a/src/arch/generic/debugfaults.hh
+++ b/src/arch/generic/debugfaults.hh
@@ -40,11 +40,11 @@
 #ifndef __ARCH_GENERIC_DEBUGFAULTS_HH__
 #define __ARCH_GENERIC_DEBUGFAULTS_HH__
 
+#include <string>
+
 #include "base/misc.hh"
 #include "sim/faults.hh"
 
-#include <string>
-
 namespace GenericISA
 {
 class M5DebugFault : public FaultBase

diff --git a/src/arch/generic/types.hh b/src/arch/generic/types.hh
index 214b01926ec1ec7d9a0c1ab74dea7140b1e64a6d..931349ac4b771431d02a3d41c4f214a49c43f100 100644 (file)
--- a/src/arch/generic/types.hh
+++ b/src/arch/generic/types.hh
@@ -33,8 +33,8 @@
 
 #include <iostream>
 
-#include "base/types.hh"
 #include "base/trace.hh"
+#include "base/types.hh"
 #include "sim/serialize.hh"
 
 namespace GenericISA

diff --git a/src/arch/mips/dsp.cc b/src/arch/mips/dsp.cc
index b8b02ae9e1345f050121dc53201a8a45b8aae1a1..49698eec6e59dcc3a953c39231053eb3a0df636b 100755 (executable)
--- a/src/arch/mips/dsp.cc
+++ b/src/arch/mips/dsp.cc
@@ -28,13 +28,13 @@
  * Authors: Brett Miller
  */
 
-#include "arch/mips/isa_traits.hh"
 #include "arch/mips/dsp.hh"
+#include "arch/mips/isa_traits.hh"
+#include "base/bitfield.hh"
+#include "base/misc.hh"
 #include "config/full_system.hh"
 #include "cpu/static_inst.hh"
 #include "sim/serialize.hh"
-#include "base/bitfield.hh"
-#include "base/misc.hh"
 
 using namespace MipsISA;
 using namespace std;

diff --git a/src/arch/mips/dsp.hh b/src/arch/mips/dsp.hh
index 1cca5138497808176d8a1e4ad5e085b23c1a8c4a..f1343171423fe7e8dfdb1d1cf6fa94fc88bb091c 100755 (executable)
--- a/src/arch/mips/dsp.hh
+++ b/src/arch/mips/dsp.hh
@@ -31,8 +31,8 @@
 #ifndef __ARCH_MIPS_DSP_HH__
 #define __ARCH_MIPS_DSP_HH__
 
-#include "arch/mips/types.hh"
 #include "arch/mips/isa_traits.hh"
+#include "arch/mips/types.hh"
 #include "base/misc.hh"
 #include "base/types.hh"
 #include "config/full_system.hh"

diff --git a/src/arch/mips/isa.cc b/src/arch/mips/isa.cc
index 66d8b08154fbc0738e5a9cec080dd9249a95fa91..902574bace80f3806e506ef622c1fc073b36c15f 100644 (file)
--- a/src/arch/mips/isa.cc
+++ b/src/arch/mips/isa.cc
@@ -29,8 +29,8 @@
  */
 
 #include "arch/mips/isa.hh"
-#include "arch/mips/mt_constants.hh"
 #include "arch/mips/mt.hh"
+#include "arch/mips/mt_constants.hh"
 #include "arch/mips/pra_constants.hh"
 #include "base/bitfield.hh"
 #include "cpu/base.hh"

diff --git a/src/arch/mips/isa.hh b/src/arch/mips/isa.hh
index cc075a9a6487e0e6c258571006585076e3677eaf..720c7725ebc2a6d34272df66364e4ed6e7ad74a6 100644 (file)
--- a/src/arch/mips/isa.hh
+++ b/src/arch/mips/isa.hh
@@ -31,8 +31,8 @@
 #ifndef __ARCH_MIPS_ISA_HH__
 #define __ARCH_MIPS_ISA_HH__
 
-#include <string>
 #include <queue>
+#include <string>
 #include <vector>
 
 #include "arch/mips/registers.hh"

diff --git a/src/arch/mips/isa/includes.isa b/src/arch/mips/isa/includes.isa
index d5e1448ac3a9cff5d69593fa2eaac0a791ccb635..b0d1aa748020a54aeec14177c122c48e6e92c19b 100644 (file)
--- a/src/arch/mips/isa/includes.isa
+++ b/src/arch/mips/isa/includes.isa
@@ -34,9 +34,9 @@
 //
 
 output header {{
-#include <sstream>
-#include <iostream>
 #include <iomanip>
+#include <iostream>
+#include <sstream>
 
 #include "arch/mips/isa_traits.hh"
 #include "arch/mips/types.hh"
@@ -45,20 +45,19 @@ output header {{
 }};
 
 output decoder {{
-#include "arch/mips/isa_traits.hh"
-#include "base/cprintf.hh"
-#include "base/loader/symtab.hh"
-#include "cpu/thread_context.hh"
+#include <math.h>
+
+#include "arch/mips/dsp.hh"
+#include "arch/mips/dt_constants.hh"
 #include "arch/mips/faults.hh"
 #include "arch/mips/isa_traits.hh"
-#include "arch/mips/pra_constants.hh"
-#include "arch/mips/dt_constants.hh"
 #include "arch/mips/mt_constants.hh"
+#include "arch/mips/pra_constants.hh"
 #include "arch/mips/utility.hh"
-#include "arch/mips/dsp.hh"
+#include "base/loader/symtab.hh"
+#include "base/cprintf.hh"
+#include "cpu/thread_context.hh"
 #include "mem/packet.hh"
-
-#include <math.h>
 #if defined(linux)
 #include <fenv.h>
 #endif
@@ -67,29 +66,27 @@ using namespace MipsISA;
 }};
 
 output exec {{
+#include <math.h>
+
+#include "arch/mips/dsp.hh"
+#include "arch/mips/dt_constants.hh"
 #include "arch/mips/faults.hh"
 #include "arch/mips/isa_traits.hh"
-#include "arch/mips/utility.hh"
-#include "arch/mips/dsp.hh"
 #include "arch/mips/mt.hh"
-#include "arch/mips/pra_constants.hh"
-#include "arch/mips/dt_constants.hh"
 #include "arch/mips/mt_constants.hh"
-
-#include <math.h>
+#include "arch/mips/pra_constants.hh"
+#include "arch/mips/utility.hh"
 #if defined(linux)
 #include <fenv.h>
 #endif
 
 #include "cpu/base.hh"
 #include "cpu/exetrace.hh"
-
 #include "mem/packet.hh"
 #include "mem/packet_access.hh"
-
-#include "sim/sim_exit.hh"
 #include "sim/eventq.hh"
 #include "sim/sim_events.hh"
+#include "sim/sim_exit.hh"
 
 using namespace MipsISA;
 }};

diff --git a/src/arch/mips/isa_traits.hh b/src/arch/mips/isa_traits.hh
index 648713926f37d66397a3e35b3d97b5cdbe62a5df..4d07c5abe7af495d66a2890deda460db222015ba 100644 (file)
--- a/src/arch/mips/isa_traits.hh
+++ b/src/arch/mips/isa_traits.hh
@@ -34,8 +34,8 @@
 #ifndef __ARCH_MIPS_ISA_TRAITS_HH__
 #define __ARCH_MIPS_ISA_TRAITS_HH__
 
-#include "arch/mips/types.hh"
 #include "arch/mips/mips_core_specific.hh"
+#include "arch/mips/types.hh"
 #include "base/types.hh"
 #include "config/full_system.hh"
 

diff --git a/src/arch/mips/linux/linux.cc b/src/arch/mips/linux/linux.cc
index 6cfc93585645347665c8d89e6f6ceaeee185e03d..8c4e3bf8c8206dbe41c3158245e5863dc89969d3 100644 (file)
--- a/src/arch/mips/linux/linux.cc
+++ b/src/arch/mips/linux/linux.cc
@@ -28,10 +28,10 @@
  * Authors: Korey Sewell
  */
 
-#include "arch/mips/linux/linux.hh"
-
 #include <fcntl.h>
 
+#include "arch/mips/linux/linux.hh"
+
 // open(2) flags translation table
 OpenFlagTransTable MipsLinux::openFlagTable[] = {
 #ifdef _MSC_VER

diff --git a/src/arch/mips/linux/process.cc b/src/arch/mips/linux/process.cc
index f3cac84e86fcb8fb5469ed4751e1cb3907441f25..fa8e659b68978e17a81cdd7007c4ad0e2931e013 100644 (file)
--- a/src/arch/mips/linux/process.cc
+++ b/src/arch/mips/linux/process.cc
@@ -36,10 +36,10 @@
 #include "base/trace.hh"
 #include "cpu/thread_context.hh"
 #include "kern/linux/linux.hh"
+#include "sim/eventq.hh"
 #include "sim/process.hh"
-#include "sim/system.hh"
 #include "sim/syscall_emul.hh"
-#include "sim/eventq.hh"
+#include "sim/system.hh"
 
 using namespace std;
 using namespace MipsISA;

diff --git a/src/arch/mips/linux/process.hh b/src/arch/mips/linux/process.hh
index 8c45014e0046dc06dafcb4a64438391db7d6f832..fd96be4c184b614385e05fc7a56abc383ff03627 100644 (file)
--- a/src/arch/mips/linux/process.hh
+++ b/src/arch/mips/linux/process.hh
@@ -32,8 +32,8 @@
 #ifndef __MIPS_LINUX_PROCESS_HH__
 #define __MIPS_LINUX_PROCESS_HH__
 
-#include "arch/mips/process.hh"
 #include "arch/mips/linux/linux.hh"
+#include "arch/mips/process.hh"
 #include "sim/eventq.hh"
 
 /// A process with emulated Mips/Linux syscalls.

diff --git a/src/arch/mips/linux/system.cc b/src/arch/mips/linux/system.cc
index ff07f526a1b048ebe16e617df1760da46eb2c693..67e21574e8ad5f4e820eee4dabfe742379cf1057 100644 (file)
--- a/src/arch/mips/linux/system.cc
+++ b/src/arch/mips/linux/system.cc
@@ -39,17 +39,17 @@
  * up boot time.
  */
 
-#include "arch/vtophys.hh"
-#include "arch/mips/idle_event.hh"
 #include "arch/mips/linux/system.hh"
 #include "arch/mips/linux/threadinfo.hh"
+#include "arch/mips/idle_event.hh"
 #include "arch/mips/system.hh"
+#include "arch/vtophys.hh"
 #include "base/loader/symtab.hh"
-#include "cpu/thread_context.hh"
 #include "cpu/base.hh"
+#include "cpu/thread_context.hh"
 #include "dev/platform.hh"
-#include "kern/linux/printk.hh"
 #include "kern/linux/events.hh"
+#include "kern/linux/printk.hh"
 #include "mem/physical.hh"
 #include "mem/port.hh"
 #include "sim/arguments.hh"

diff --git a/src/arch/mips/mt.hh b/src/arch/mips/mt.hh
index c63c65a7391b63b177d812cc24b674a453ebacb4..f163d3240fb2b689c70feede619c78704962f21d 100755 (executable)
--- a/src/arch/mips/mt.hh
+++ b/src/arch/mips/mt.hh
@@ -37,16 +37,16 @@
  * ISA-specific helper functions for multithreaded execution.
  */
 
+#include <iostream>
+
 #include "arch/mips/faults.hh"
 #include "arch/mips/isa_traits.hh"
 #include "arch/mips/mt_constants.hh"
 #include "arch/mips/pra_constants.hh"
 #include "arch/mips/registers.hh"
 #include "base/bitfield.hh"
-#include "base/trace.hh"
 #include "base/misc.hh"
-
-#include <iostream>
+#include "base/trace.hh"
 
 namespace MipsISA
 {

diff --git a/src/arch/mips/process.cc b/src/arch/mips/process.cc
index 26a2a0ddb1bff0a70288eb5b5a3927f6b1ffcb89..b6f21c95c0dc255d5ec69e0394e5dc0282dcf8d2 100644 (file)
--- a/src/arch/mips/process.cc
+++ b/src/arch/mips/process.cc
@@ -32,8 +32,8 @@
 
 #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/loader/object_file.hh"
 #include "base/misc.hh"
 #include "cpu/thread_context.hh"
 #include "mem/page_table.hh"

diff --git a/src/arch/mips/process.hh b/src/arch/mips/process.hh
index a065feb8f59b155c3f8744090bc1ed5c205be6e2..3f9a7aff0326fc3513966cb4dda6fc7553b232bd 100644 (file)
--- a/src/arch/mips/process.hh
+++ b/src/arch/mips/process.hh
@@ -34,6 +34,7 @@
 
 #include <string>
 #include <vector>
+
 #include "sim/process.hh"
 
 class LiveProcess;

diff --git a/src/arch/mips/system.cc b/src/arch/mips/system.cc
index 6e2ad4d5a174ba8c7bade07851deb36e63b02671..c1735b74074e753f8e619f1c0eb5e65e9a660994 100755 (executable)
--- a/src/arch/mips/system.cc
+++ b/src/arch/mips/system.cc
@@ -33,15 +33,14 @@
 
 #include "arch/mips/system.hh"
 #include "arch/vtophys.hh"
-#include "base/loader/object_file.hh"
 #include "base/loader/hex_file.hh"
+#include "base/loader/object_file.hh"
 #include "base/loader/symtab.hh"
 #include "base/trace.hh"
 #include "mem/physical.hh"
 #include "params/MipsSystem.hh"
 #include "sim/byteswap.hh"
 
-
 using namespace LittleEndianGuest;
 
 MipsSystem::MipsSystem(Params *p) : System(p)

diff --git a/src/arch/mips/system.hh b/src/arch/mips/system.hh
index cfdf316b3f699445395a223c4e44ca95903c53a2..128f365811eef5d791b4be38b6b8bc8c59d2a174 100755 (executable)
--- a/src/arch/mips/system.hh
+++ b/src/arch/mips/system.hh
@@ -37,13 +37,13 @@
 #include <string>
 #include <vector>
 
-#include "sim/system.hh"
-#include "base/loader/symtab.hh"
 #include "base/loader/hex_file.hh"
+#include "base/loader/symtab.hh"
 #include "cpu/pc_event.hh"
 #include "kern/system_events.hh"
 #include "params/MipsSystem.hh"
 #include "sim/sim_object.hh"
+#include "sim/system.hh"
 
 class MipsSystem : public System
 {

diff --git a/src/arch/mips/tlb.cc b/src/arch/mips/tlb.cc
index 288c8e88e2a4b1e427acf5911681fc77967fce15..b73eae72f1d944874bf96b1b01e772b8563d3daf 100644 (file)
--- a/src/arch/mips/tlb.cc
+++ b/src/arch/mips/tlb.cc
@@ -34,18 +34,18 @@
 #include <string>
 #include <vector>
 
-#include "arch/mips/pra_constants.hh"
+#include "arch/mips/faults.hh"
 #include "arch/mips/pagetable.hh"
+#include "arch/mips/pra_constants.hh"
 #include "arch/mips/tlb.hh"
-#include "arch/mips/faults.hh"
 #include "arch/mips/utility.hh"
 #include "base/inifile.hh"
 #include "base/str.hh"
 #include "base/trace.hh"
 #include "cpu/thread_context.hh"
-#include "sim/process.hh"
 #include "mem/page_table.hh"
 #include "params/MipsTLB.hh"
+#include "sim/process.hh"
 
 using namespace std;
 using namespace MipsISA;

diff --git a/src/arch/mips/tlb.hh b/src/arch/mips/tlb.hh
index 5c8b10263678504f8145e9915776df0a750d5b0b..4b145686252f6c527703dc37945acc2185518811 100644 (file)
--- a/src/arch/mips/tlb.hh
+++ b/src/arch/mips/tlb.hh
@@ -38,15 +38,15 @@
 #include <map>
 
 #include "arch/mips/isa_traits.hh"
+#include "arch/mips/pagetable.hh"
 #include "arch/mips/utility.hh"
 #include "arch/mips/vtophys.hh"
-#include "arch/mips/pagetable.hh"
 #include "base/statistics.hh"
 #include "mem/request.hh"
 #include "params/MipsTLB.hh"
 #include "sim/fault_fwd.hh"
-#include "sim/tlb.hh"
 #include "sim/sim_object.hh"
+#include "sim/tlb.hh"
 
 class ThreadContext;
 

diff --git a/src/arch/mips/utility.cc b/src/arch/mips/utility.cc
index 0859eb80f06835459f20de2155ae0bc29954ae4a..37f71416f8f68131b1d782825fb03ad1f6f83743 100644 (file)
--- a/src/arch/mips/utility.cc
+++ b/src/arch/mips/utility.cc
@@ -32,12 +32,12 @@
 
 #include "arch/mips/isa_traits.hh"
 #include "arch/mips/utility.hh"
+#include "base/bitfield.hh"
+#include "base/misc.hh"
 #include "config/full_system.hh"
-#include "cpu/thread_context.hh"
 #include "cpu/static_inst.hh"
+#include "cpu/thread_context.hh"
 #include "sim/serialize.hh"
-#include "base/bitfield.hh"
-#include "base/misc.hh"
 
 #if FULL_SYSTEM
 #include "arch/mips/registers.hh"

diff --git a/src/arch/mips/utility.hh b/src/arch/mips/utility.hh
index 2f6726c59a8f463b3c2b7bbe5342e778064541eb..61c43a158f589eaa9b8ccffa64329753f2bb1fdf 100644 (file)
--- a/src/arch/mips/utility.hh
+++ b/src/arch/mips/utility.hh
@@ -33,9 +33,8 @@
 
 #ifndef __ARCH_MIPS_UTILITY_HH__
 #define __ARCH_MIPS_UTILITY_HH__
-#include "config/full_system.hh"
-#include "arch/mips/types.hh"
 #include "arch/mips/isa_traits.hh"
+#include "arch/mips/types.hh"
 #include "base/misc.hh"
 #include "base/types.hh"
 #include "config/full_system.hh"

diff --git a/src/arch/mips/vtophys.hh b/src/arch/mips/vtophys.hh
index 6fde36aacd08e2814afcf8beafc069527f588470..5ecc30b1f1200ec78106268a0d7aedf97484d421 100644 (file)
--- a/src/arch/mips/vtophys.hh
+++ b/src/arch/mips/vtophys.hh
@@ -37,7 +37,6 @@
 #include "arch/mips/isa_traits.hh"
 #include "arch/mips/utility.hh"
 
-
 class ThreadContext;
 class FunctionalPort;
 

diff --git a/src/arch/power/insts/floating.hh b/src/arch/power/insts/floating.hh
index deeac82cf69babac0a658b2aa18d8804bad19f30..65906e507bb504d7256905f0169b9415c4cd2582 100644 (file)
--- a/src/arch/power/insts/floating.hh
+++ b/src/arch/power/insts/floating.hh
@@ -33,8 +33,8 @@
 #define __ARCH_POWER_INSTS_FLOATING_HH__
 
 #include "arch/power/insts/static_inst.hh"
-#include "base/cprintf.hh"
 #include "base/bitfield.hh"
+#include "base/cprintf.hh"
 
 namespace PowerISA
 {

diff --git a/src/arch/power/insts/integer.hh b/src/arch/power/insts/integer.hh
index a7270cd38f490a40126578a4b72508124224ccab..f911eb08aea4a43f38499ec2d392a1cf7466e6ec 100644 (file)
--- a/src/arch/power/insts/integer.hh
+++ b/src/arch/power/insts/integer.hh
@@ -32,8 +32,8 @@
 #define __ARCH_POWER_INSTS_INTEGER_HH__
 
 #include "arch/power/insts/static_inst.hh"
-#include "base/cprintf.hh"
 #include "base/bitfield.hh"
+#include "base/cprintf.hh"
 
 namespace PowerISA
 {

diff --git a/src/arch/power/isa/includes.isa b/src/arch/power/isa/includes.isa
index 47e8c1411c3ff646ff28f971610629cb17ec7d54..a9069710bdd1ff2c47c5bd50fb63acc1e6cf65e3 100644 (file)
--- a/src/arch/power/isa/includes.isa
+++ b/src/arch/power/isa/includes.isa
@@ -34,15 +34,15 @@
 //
 
 output header {{
-#include <sstream>
-#include <iostream>
 #include <iomanip>
+#include <iostream>
+#include <sstream>
 
 #include "arch/power/insts/branch.hh"
-#include "arch/power/insts/mem.hh"
-#include "arch/power/insts/integer.hh"
-#include "arch/power/insts/floating.hh"
 #include "arch/power/insts/condition.hh"
+#include "arch/power/insts/floating.hh"
+#include "arch/power/insts/integer.hh"
+#include "arch/power/insts/mem.hh"
 #include "arch/power/insts/misc.hh"
 #include "arch/power/insts/static_inst.hh"
 #include "arch/power/isa_traits.hh"
@@ -61,8 +61,8 @@ output decoder {{
 #include "arch/power/faults.hh"
 #include "arch/power/isa_traits.hh"
 #include "arch/power/utility.hh"
-#include "base/cprintf.hh"
 #include "base/loader/symtab.hh"
+#include "base/cprintf.hh"
 #include "cpu/thread_context.hh"
 
 using namespace PowerISA;
@@ -70,11 +70,11 @@ using std::isnan;
 }};
 
 output exec {{
+#include <cmath>
+
 #include "arch/power/faults.hh"
 #include "arch/power/isa_traits.hh"
 #include "arch/power/utility.hh"
-
-#include <cmath>
 #if defined(linux)
 #include <fenv.h>
 #endif

diff --git a/src/arch/power/linux/linux.cc b/src/arch/power/linux/linux.cc
index 113f3e48e2174a3650f091192c9a29e9c7961fa2..b614c0dcb568b5814d30362eaf8e2f8e1ecda42b 100644 (file)
--- a/src/arch/power/linux/linux.cc
+++ b/src/arch/power/linux/linux.cc
@@ -29,10 +29,10 @@
  * Authors: Timothy M. Jones
  */
 
-#include "arch/power/linux/linux.hh"
-
 #include <fcntl.h>
 
+#include "arch/power/linux/linux.hh"
+
 // open(2) flags translation table
 OpenFlagTransTable PowerLinux::openFlagTable[] = {
 #ifdef _MSC_VER

diff --git a/src/arch/power/linux/process.cc b/src/arch/power/linux/process.cc
index c2587d5e7e9a2aed1240f4f8ffec1cc4bbe627b8..1c1b2827f9f08c0f23da5cdf4b576f27f147b73b 100644 (file)
--- a/src/arch/power/linux/process.cc
+++ b/src/arch/power/linux/process.cc
@@ -35,11 +35,9 @@
 #include "arch/power/linux/linux.hh"
 #include "arch/power/linux/process.hh"
 #include "arch/power/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"
 #include "sim/system.hh"

diff --git a/src/arch/power/linux/process.hh b/src/arch/power/linux/process.hh
index bef7e8dae1159946ccffa01a97c05d49efcea3f8..c4600129e10e0d848e85551ca27d3744d5ea5733 100644 (file)
--- a/src/arch/power/linux/process.hh
+++ b/src/arch/power/linux/process.hh
@@ -35,7 +35,6 @@
 
 #include "arch/power/process.hh"
 
-
 /// A process with emulated PPC/Linux syscalls.
 class PowerLinuxProcess : public PowerLiveProcess
 {

diff --git a/src/arch/power/process.hh b/src/arch/power/process.hh
index 473b7e02841c46f7a2c28920a356abfe910af0ab..e02a30abd2699c48ff120d27045dd17502f9714b 100644 (file)
--- a/src/arch/power/process.hh
+++ b/src/arch/power/process.hh
@@ -35,6 +35,7 @@
 
 #include <string>
 #include <vector>
+
 #include "sim/process.hh"
 
 class LiveProcess;

diff --git a/src/arch/power/tlb.hh b/src/arch/power/tlb.hh
index c4e3fadaab20a9f76efd0d452ca59f9d409e8fd4..590477b6a8c014e6130ecac1940fe2682c2e1ee0 100644 (file)
--- a/src/arch/power/tlb.hh
+++ b/src/arch/power/tlb.hh
@@ -40,9 +40,9 @@
 #include <map>
 
 #include "arch/power/isa_traits.hh"
+#include "arch/power/pagetable.hh"
 #include "arch/power/utility.hh"
 #include "arch/power/vtophys.hh"
-#include "arch/power/pagetable.hh"
 #include "base/statistics.hh"
 #include "mem/request.hh"
 #include "params/PowerTLB.hh"

diff --git a/src/arch/power/vtophys.hh b/src/arch/power/vtophys.hh
index 8b88c92151c670a7b5936f14e88abb20f680cc35..7371f38a6b23ab8ccbb76a52f7c40c9521dd6a50 100644 (file)
--- a/src/arch/power/vtophys.hh
+++ b/src/arch/power/vtophys.hh
@@ -39,7 +39,6 @@
 #include "arch/power/isa_traits.hh"
 #include "arch/power/utility.hh"
 
-
 class ThreadContext;
 class FunctionalPort;
 

diff --git a/src/arch/sparc/isa.hh b/src/arch/sparc/isa.hh
index 660f0c49d7010686c5abace394d15c601d60b6ce..f00068bbcd3f5097f156d5a9d997d26645f27cab 100644 (file)
--- a/src/arch/sparc/isa.hh
+++ b/src/arch/sparc/isa.hh
@@ -31,14 +31,14 @@
 #ifndef __ARCH_SPARC_ISA_HH__
 #define __ARCH_SPARC_ISA_HH__
 
+#include <ostream>
+#include <string>
+
 #include "arch/sparc/registers.hh"
 #include "arch/sparc/types.hh"
 #include "config/full_system.hh"
 #include "cpu/cpuevent.hh"
 
-#include <string>
-#include <ostream>
-
 class Checkpoint;
 class EventManager;
 class ThreadContext;

diff --git a/src/arch/sparc/isa/includes.isa b/src/arch/sparc/isa/includes.isa
index bc9273ad37f9397b04d7b8b8901ab5e6d843b90e..8ef753d2e6dd1c59d5138a83525267ed9a61f9e7 100644 (file)
--- a/src/arch/sparc/isa/includes.isa
+++ b/src/arch/sparc/isa/includes.isa
@@ -35,8 +35,8 @@
 
 output header {{
 #include <cstring>
-#include <sstream>
 #include <iostream>
+#include <sstream>
 
 #include "arch/sparc/faults.hh"
 #include "arch/sparc/isa_traits.hh"
@@ -49,14 +49,14 @@ output header {{
 }};
 
 output decoder {{
-#include "base/cprintf.hh"
+#include <algorithm>
+
 #include "base/loader/symtab.hh"
+#include "base/cprintf.hh"
+#include "base/fenv.hh"
 #include "cpu/thread_context.hh"  // for Jump::branchTarget()
 #include "mem/packet.hh"
 
-#include "base/fenv.hh"
-#include <algorithm>
-
 using namespace SparcISA;
 }};
 
@@ -67,16 +67,16 @@ output exec {{
 #include "sim/pseudo_inst.hh"
 #endif
 
+#include <cmath>
 #include <limits>
 
-#include <cmath>
 #include "arch/sparc/asi.hh"
 #include "base/bigint.hh"
 #include "cpu/base.hh"
 #include "cpu/exetrace.hh"
-#include "sim/sim_exit.hh"
 #include "mem/packet.hh"
 #include "mem/packet_access.hh"
+#include "sim/sim_exit.hh"
 
 using namespace SparcISA;
 using namespace std;

diff --git a/src/arch/sparc/isa_traits.hh b/src/arch/sparc/isa_traits.hh
index 719127641c88c1abbe085d5c286b53945afb5c3a..6992cfee1d3d7dc51bff31ec70fc5cefeeba9226 100644 (file)
--- a/src/arch/sparc/isa_traits.hh
+++ b/src/arch/sparc/isa_traits.hh
@@ -32,8 +32,8 @@
 #ifndef __ARCH_SPARC_ISA_TRAITS_HH__
 #define __ARCH_SPARC_ISA_TRAITS_HH__
 
-#include "arch/sparc/types.hh"
 #include "arch/sparc/sparc_traits.hh"
+#include "arch/sparc/types.hh"
 #include "base/types.hh"
 #include "config/full_system.hh"
 

diff --git a/src/arch/sparc/linux/linux.cc b/src/arch/sparc/linux/linux.cc
index 102e5af3bb0f61b5515a44ab778d136f91f1dd67..6f8a057501293da3ee12fa3e721e89dd64ae21fb 100644 (file)
--- a/src/arch/sparc/linux/linux.cc
+++ b/src/arch/sparc/linux/linux.cc
@@ -28,9 +28,10 @@
  * Authors: Gabe Black
  */
 
-#include "arch/sparc/linux/linux.hh"
 #include <fcntl.h>
 
+#include "arch/sparc/linux/linux.hh"
+
 // open(2) flags translation table
 OpenFlagTransTable SparcLinux::openFlagTable[] = {
 #ifdef _MSC_VER

diff --git a/src/arch/sparc/linux/process.cc b/src/arch/sparc/linux/process.cc
index 2c9fe2ac003ee636332de069ff226338c7359dda..ce60940606380655263efad775fb23f082710446 100644 (file)
--- a/src/arch/sparc/linux/process.cc
+++ b/src/arch/sparc/linux/process.cc
@@ -30,14 +30,12 @@
  *          Ali Saidi
  */
 
-#include "arch/sparc/isa_traits.hh"
 #include "arch/sparc/linux/process.hh"
+#include "arch/sparc/isa_traits.hh"
 #include "arch/sparc/registers.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/sparc/locked_mem.hh b/src/arch/sparc/locked_mem.hh
index 291b2f422ba8d4ac6f24c3bf3c3fd06cee1a5174..556fbbdd99fbdc7d81ef09fac6ef766872918b14 100644 (file)
--- a/src/arch/sparc/locked_mem.hh
+++ b/src/arch/sparc/locked_mem.hh
@@ -39,7 +39,6 @@
 
 #include "mem/request.hh"
 
-
 namespace SparcISA
 {
 template <class XC>

diff --git a/src/arch/sparc/mmapped_ipr.hh b/src/arch/sparc/mmapped_ipr.hh
index 777242e7cb35e8b26aa8142d04b2c768a5cfa221..28e3ec259cdc79279667a48d85c9c1dd878aacec 100644 (file)
--- a/src/arch/sparc/mmapped_ipr.hh
+++ b/src/arch/sparc/mmapped_ipr.hh
@@ -37,11 +37,10 @@
  * ISA-specific helper functions for memory mapped IPR accesses.
  */
 
+#include "arch/sparc/tlb.hh"
 #include "config/full_system.hh"
 #include "cpu/thread_context.hh"
 #include "mem/packet.hh"
-#include "arch/sparc/tlb.hh"
-
 
 namespace SparcISA
 {

diff --git a/src/arch/sparc/nativetrace.cc b/src/arch/sparc/nativetrace.cc
index 7d8b96dc1eef7fb0bf4f7630edf22f6dee9f3b5d..8987aa518a513b656af74e075a518e8bd06255ab 100644 (file)
--- a/src/arch/sparc/nativetrace.cc
+++ b/src/arch/sparc/nativetrace.cc
@@ -29,8 +29,8 @@
  */
 
 #include "arch/sparc/isa_traits.hh"
-#include "arch/sparc/registers.hh"
 #include "arch/sparc/nativetrace.hh"
+#include "arch/sparc/registers.hh"
 #include "cpu/thread_context.hh"
 #include "params/SparcNativeTrace.hh"
 #include "sim/byteswap.hh"

diff --git a/src/arch/sparc/process.cc b/src/arch/sparc/process.cc
index ac42ccf642680c35605556cf3c0d70c28075c22c..bd3db92b65394a93bfad2e801cdacb6e1337dae3 100644 (file)
--- a/src/arch/sparc/process.cc
+++ b/src/arch/sparc/process.cc
@@ -32,16 +32,16 @@
 #include "arch/sparc/asi.hh"
 #include "arch/sparc/handlers.hh"
 #include "arch/sparc/isa_traits.hh"
-#include "arch/sparc/registers.hh"
 #include "arch/sparc/process.hh"
+#include "arch/sparc/registers.hh"
 #include "arch/sparc/types.hh"
-#include "base/loader/object_file.hh"
 #include "base/loader/elf_object.hh"
+#include "base/loader/object_file.hh"
 #include "base/misc.hh"
 #include "cpu/thread_context.hh"
 #include "mem/page_table.hh"
-#include "sim/process_impl.hh"
 #include "mem/translating_port.hh"
+#include "sim/process_impl.hh"
 #include "sim/system.hh"
 
 using namespace std;

diff --git a/src/arch/sparc/process.hh b/src/arch/sparc/process.hh
index 4ad8bb80406a4744835bf29a8242e6325c26fa15..a9a4247fcf72fdf4eb4f68dc2cf5b824c07e4a29 100644 (file)
--- a/src/arch/sparc/process.hh
+++ b/src/arch/sparc/process.hh
@@ -34,6 +34,7 @@
 
 #include <string>
 #include <vector>
+
 #include "sim/byteswap.hh"
 #include "sim/process.hh"
 

diff --git a/src/arch/sparc/remote_gdb.cc b/src/arch/sparc/remote_gdb.cc
index 932123548eb06622cc0fcf1511fcdc28d628a15a..86c28723760d710039348b6918b07528c8c6de7b 100644 (file)
--- a/src/arch/sparc/remote_gdb.cc
+++ b/src/arch/sparc/remote_gdb.cc
@@ -117,19 +117,19 @@
  */
 
 #include <sys/signal.h>
+#include <unistd.h>
 
 #include <string>
-#include <unistd.h>
 
-#include "arch/vtophys.hh"
 #include "arch/sparc/remote_gdb.hh"
+#include "arch/vtophys.hh"
 #include "base/intmath.hh"
 #include "base/remote_gdb.hh"
 #include "base/socket.hh"
 #include "base/trace.hh"
 #include "config/full_system.hh"
-#include "cpu/thread_context.hh"
 #include "cpu/static_inst.hh"
+#include "cpu/thread_context.hh"
 #include "mem/page_table.hh"
 #include "mem/physical.hh"
 #include "mem/port.hh"

diff --git a/src/arch/sparc/remote_gdb.hh b/src/arch/sparc/remote_gdb.hh
index 06f6b3896592b9ae90feaf8ff02bd5ef0f06d401..6ada8bdca5cdd326e340303a17052bb06f6f42e3 100644 (file)
--- a/src/arch/sparc/remote_gdb.hh
+++ b/src/arch/sparc/remote_gdb.hh
@@ -34,9 +34,9 @@
 #include <map>
 
 #include "arch/sparc/types.hh"
+#include "base/pollevent.hh"
 #include "base/remote_gdb.hh"
 #include "cpu/pc_event.hh"
-#include "base/pollevent.hh"
 
 class System;
 class ThreadContext;

diff --git a/src/arch/sparc/solaris/process.cc b/src/arch/sparc/solaris/process.cc
index 24abd86879685678a94013ffd8202573c73bcc1a..e47377d423447b84e45ae5e3a6e9463c0e067203 100644 (file)
--- a/src/arch/sparc/solaris/process.cc
+++ b/src/arch/sparc/solaris/process.cc
@@ -28,14 +28,12 @@
  * Authors: Ali Saidi
  */
 
-#include "arch/sparc/isa_traits.hh"
 #include "arch/sparc/solaris/process.hh"
+#include "arch/sparc/isa_traits.hh"
 #include "arch/sparc/registers.hh"
-
 #include "base/trace.hh"
 #include "cpu/thread_context.hh"
 #include "kern/solaris/solaris.hh"
-
 #include "sim/process.hh"
 #include "sim/syscall_emul.hh"
 

diff --git a/src/arch/sparc/solaris/solaris.cc b/src/arch/sparc/solaris/solaris.cc
index 3cc910005a15d88d44bd5a7669a0900a4f63c48c..5474d8b17afbbd95edcb18b9f2f3b8d9c3056c3f 100644 (file)
--- a/src/arch/sparc/solaris/solaris.cc
+++ b/src/arch/sparc/solaris/solaris.cc
@@ -28,10 +28,10 @@
  * Authors: Ali Saidi
  */
 
-#include "arch/sparc/solaris/solaris.hh"
-
 #include <fcntl.h>
 
+#include "arch/sparc/solaris/solaris.hh"
+
 // open(2) flags translation table
 OpenFlagTransTable SparcSolaris::openFlagTable[] = {
 #ifdef _MSC_VER

diff --git a/src/arch/sparc/system.cc b/src/arch/sparc/system.cc
index e4ee3cacb95e6785b30d4e640fb8fcf527363f8c..9988702d225c4500fc82a9170158ffaca2385231 100644 (file)
--- a/src/arch/sparc/system.cc
+++ b/src/arch/sparc/system.cc
@@ -37,7 +37,6 @@
 #include "params/SparcSystem.hh"
 #include "sim/byteswap.hh"
 
-
 using namespace BigEndianGuest;
 
 SparcSystem::SparcSystem(Params *p)

diff --git a/src/arch/sparc/tlb.cc b/src/arch/sparc/tlb.cc
index 8aa0071684fc5de7c21241a6b875c614da880a38..8742cfd32e0879279dea528df9eefec88ec6c3ae 100644 (file)
--- a/src/arch/sparc/tlb.cc
+++ b/src/arch/sparc/tlb.cc
@@ -36,8 +36,8 @@
 #include "arch/sparc/tlb.hh"
 #include "base/bitfield.hh"
 #include "base/trace.hh"
-#include "cpu/thread_context.hh"
 #include "cpu/base.hh"
+#include "cpu/thread_context.hh"
 #include "mem/packet_access.hh"
 #include "mem/request.hh"
 #include "sim/system.hh"

diff --git a/src/arch/sparc/tlb_map.hh b/src/arch/sparc/tlb_map.hh
index 133443d5b4d13e740a60c0eb742dbde77a58fe2c..5541ff7e9360f0ffa98783ead5976972b3b6a9bb 100644 (file)
--- a/src/arch/sparc/tlb_map.hh
+++ b/src/arch/sparc/tlb_map.hh
@@ -31,9 +31,10 @@
 #ifndef __ARCH_SPARC_TLB_MAP_HH__
 #define __ARCH_SPARC_TLB_MAP_HH__
 
-#include "arch/sparc/pagetable.hh"
 #include <map>
 
+#include "arch/sparc/pagetable.hh"
+
 namespace SparcISA
 {
 

diff --git a/src/arch/sparc/types.hh b/src/arch/sparc/types.hh
index acc4e4a649f1266d5b503c106819ea407f6df446..7d0a7617ccf98326b948548eb857ccc230f1192b 100644 (file)
--- a/src/arch/sparc/types.hh
+++ b/src/arch/sparc/types.hh
@@ -31,9 +31,9 @@
 #ifndef __ARCH_SPARC_TYPES_HH__
 #define __ARCH_SPARC_TYPES_HH__
 
+#include "arch/generic/types.hh"
 #include "base/bigint.hh"
 #include "base/types.hh"
-#include "arch/generic/types.hh"
 
 namespace SparcISA
 {

diff --git a/src/arch/sparc/utility.hh b/src/arch/sparc/utility.hh
index d69b42d01dd8e2eb356993949097a5ae49966c54..b702e683865fe16e4faf66c7d6ba6906e90686d5 100644 (file)
--- a/src/arch/sparc/utility.hh
+++ b/src/arch/sparc/utility.hh
@@ -34,8 +34,8 @@
 #include "arch/sparc/isa_traits.hh"
 #include "arch/sparc/registers.hh"
 #include "arch/sparc/tlb.hh"
-#include "base/misc.hh"
 #include "base/bitfield.hh"
+#include "base/misc.hh"
 #include "cpu/static_inst.hh"
 #include "cpu/thread_context.hh"
 #include "sim/fault_fwd.hh"

diff --git a/src/arch/sparc/vtophys.cc b/src/arch/sparc/vtophys.cc
index 36b2557e707e776e6d0a311f66787244aa9d689f..c8f35fe8b9f91ab08ae1699f853ffb30f895188e 100644 (file)
--- a/src/arch/sparc/vtophys.cc
+++ b/src/arch/sparc/vtophys.cc
@@ -30,10 +30,10 @@
 
 #include <string>
 
-#include "arch/sparc/vtophys.hh"
 #include "arch/sparc/tlb.hh"
-#include "base/compiler.hh"
+#include "arch/sparc/vtophys.hh"
 #include "base/chunk_generator.hh"
+#include "base/compiler.hh"
 #include "base/trace.hh"
 #include "cpu/thread_context.hh"
 #include "mem/vport.hh"

diff --git a/src/arch/x86/bios/acpi.cc b/src/arch/x86/bios/acpi.cc
index 8d39236d42f3baebf1b19d23fbad274855b31a0c..4382a3d6bb7e0d95a4ebd37825183a26fa11ae64 100644 (file)
--- a/src/arch/x86/bios/acpi.cc
+++ b/src/arch/x86/bios/acpi.cc
@@ -39,14 +39,12 @@
 
 #include "arch/x86/bios/acpi.hh"
 #include "mem/port.hh"
-#include "sim/byteswap.hh"
-#include "sim/sim_object.hh"
-
 #include "params/X86ACPIRSDP.hh"
-
-#include "params/X86ACPISysDescTable.hh"
 #include "params/X86ACPIRSDT.hh"
+#include "params/X86ACPISysDescTable.hh"
 #include "params/X86ACPIXSDT.hh"
+#include "sim/byteswap.hh"
+#include "sim/sim_object.hh"
 
 using namespace std;
 

diff --git a/src/arch/x86/bios/intelmp.hh b/src/arch/x86/bios/intelmp.hh
index 64c1e18c9d014c2edaa438d6e0e2a7a1d9ba9ad5..117466b48725bc01818202b6af2cc8a2ebef30f6 100644 (file)
--- a/src/arch/x86/bios/intelmp.hh
+++ b/src/arch/x86/bios/intelmp.hh
@@ -44,13 +44,12 @@
 #include <vector>
 
 #include "base/bitfield.hh"
-#include "sim/sim_object.hh"
-
 #include "enums/X86IntelMPAddressType.hh"
 #include "enums/X86IntelMPInterruptType.hh"
 #include "enums/X86IntelMPPolarity.hh"
 #include "enums/X86IntelMPRangeList.hh"
 #include "enums/X86IntelMPTriggerMode.hh"
+#include "sim/sim_object.hh"
 
 class FunctionalPort;
 

diff --git a/src/arch/x86/emulenv.hh b/src/arch/x86/emulenv.hh
index a745fb53917fa09e64ad73df37bfec099ee0a7a4..ac707d808e0681a6d827147d7e0155680b164225 100644 (file)
--- a/src/arch/x86/emulenv.hh
+++ b/src/arch/x86/emulenv.hh
@@ -40,9 +40,9 @@
 #ifndef __ARCH_X86_EMULENV_HH__
 #define __ARCH_X86_EMULENV_HH__
 
-#include "arch/x86/registers.hh"
 #include "arch/x86/regs/int.hh"
 #include "arch/x86/regs/segment.hh"
+#include "arch/x86/registers.hh"
 #include "arch/x86/types.hh"
 
 namespace X86ISA

diff --git a/src/arch/x86/faults.hh b/src/arch/x86/faults.hh
index 7682953c1e763e9baa2f44c005d06d5245a25fa1..2e8889404b66283d7c5270e2ecc5427e315332c9 100644 (file)
--- a/src/arch/x86/faults.hh
+++ b/src/arch/x86/faults.hh
@@ -40,13 +40,13 @@
 #ifndef __ARCH_X86_FAULTS_HH__
 #define __ARCH_X86_FAULTS_HH__
 
+#include <string>
+
 #include "base/bitunion.hh"
 #include "base/misc.hh"
 #include "sim/faults.hh"
 #include "sim/tlb.hh"
 
-#include <string>
-
 namespace X86ISA
 {
     // Base class for all x86 "faults" where faults is in the m5 sense

diff --git a/src/arch/x86/insts/badmicroop.cc b/src/arch/x86/insts/badmicroop.cc
index ef493f250d50685345bedb812163dae6bd9d9263..d03a5eba83a0e16037f7eed1400a26d4d8e7a2e5 100644 (file)
--- a/src/arch/x86/insts/badmicroop.cc
+++ b/src/arch/x86/insts/badmicroop.cc
@@ -38,8 +38,8 @@
  */
 
 #include "arch/x86/insts/badmicroop.hh"
-#include "arch/x86/isa_traits.hh"
 #include "arch/x86/decoder.hh"
+#include "arch/x86/isa_traits.hh"
 
 namespace X86ISA
 {

diff --git a/src/arch/x86/insts/macroop.hh b/src/arch/x86/insts/macroop.hh
index 4f4176b770986a8407fd81811e22febd04bd7092..d12ff0d8f5003b40ad8b2075bbfda7b89eebff44 100644 (file)
--- a/src/arch/x86/insts/macroop.hh
+++ b/src/arch/x86/insts/macroop.hh
@@ -40,10 +40,10 @@
 #ifndef __ARCH_X86_INSTS_MACROOP_HH__
 #define __ARCH_X86_INSTS_MACROOP_HH__
 
-#include "arch/x86/emulenv.hh"
 #include "arch/x86/insts/badmicroop.hh"
-#include "arch/x86/types.hh"
 #include "arch/x86/insts/static_inst.hh"
+#include "arch/x86/emulenv.hh"
+#include "arch/x86/types.hh"
 
 namespace X86ISA
 {

diff --git a/src/arch/x86/insts/microfpop.cc b/src/arch/x86/insts/microfpop.cc
index 94194974a8d2d6be9cb08fd8a441a09c085cf3f9..000cbf635e214206ec7beed9391de7a584e794f3 100644 (file)
--- a/src/arch/x86/insts/microfpop.cc
+++ b/src/arch/x86/insts/microfpop.cc
@@ -37,9 +37,10 @@
  * Authors: Gabe Black
  */
 
+#include <string>
+
 #include "arch/x86/insts/microfpop.hh"
 #include "arch/x86/regs/misc.hh"
-#include <string>
 
 namespace X86ISA
 {

diff --git a/src/arch/x86/insts/microldstop.cc b/src/arch/x86/insts/microldstop.cc
index 6d09a4baf8ae74062a1d56bbc2be989f68895841..4fc0ec8e360e342b38bcd00418142efc9599fd50 100644 (file)
--- a/src/arch/x86/insts/microldstop.cc
+++ b/src/arch/x86/insts/microldstop.cc
@@ -37,9 +37,10 @@
  * Authors: Gabe Black
  */
 
-#include "arch/x86/insts/microldstop.hh"
 #include <string>
 
+#include "arch/x86/insts/microldstop.hh"
+
 namespace X86ISA
 {
     std::string LdStOp::generateDisassembly(Addr pc,

diff --git a/src/arch/x86/insts/micromediaop.cc b/src/arch/x86/insts/micromediaop.cc
index 2ed5df184593ba51ed1621a0c227b4f4b2a838e0..fa4d3a4734343ff966a69f037e2dc05aa3abcf8f 100644 (file)
--- a/src/arch/x86/insts/micromediaop.cc
+++ b/src/arch/x86/insts/micromediaop.cc
@@ -28,9 +28,10 @@
  * Authors: Gabe Black
  */
 
+#include <string>
+
 #include "arch/x86/insts/micromediaop.hh"
 #include "arch/x86/regs/misc.hh"
-#include <string>
 
 namespace X86ISA
 {

diff --git a/src/arch/x86/interrupts.cc b/src/arch/x86/interrupts.cc
index 837c802ecd8b1441bd3439bbcbd08cef967fda58..c45b0c344a44a33088996bef9d76223866b0efd5 100644 (file)
--- a/src/arch/x86/interrupts.cc
+++ b/src/arch/x86/interrupts.cc
@@ -37,9 +37,9 @@
  * Authors: Gabe Black
  */
 
+#include "arch/x86/regs/apic.hh"
 #include "arch/x86/interrupts.hh"
 #include "arch/x86/intmessage.hh"
-#include "arch/x86/regs/apic.hh"
 #include "cpu/base.hh"
 #include "dev/x86/i82094aa.hh"
 #include "dev/x86/pc.hh"

diff --git a/src/arch/x86/interrupts.hh b/src/arch/x86/interrupts.hh
index e45610ec7dffa98d69144461bf729d2404e56c71..f5d86219b7360041578ab6f453176c509b3434d3 100644 (file)
--- a/src/arch/x86/interrupts.hh
+++ b/src/arch/x86/interrupts.hh
@@ -40,13 +40,13 @@
 #ifndef __ARCH_X86_INTERRUPTS_HH__
 #define __ARCH_X86_INTERRUPTS_HH__
 
+#include "arch/x86/regs/apic.hh"
 #include "arch/x86/faults.hh"
 #include "arch/x86/intmessage.hh"
-#include "arch/x86/regs/apic.hh"
 #include "base/bitfield.hh"
 #include "cpu/thread_context.hh"
-#include "dev/io_device.hh"
 #include "dev/x86/intdev.hh"
+#include "dev/io_device.hh"
 #include "params/X86LocalApic.hh"
 #include "sim/eventq.hh"
 

diff --git a/src/arch/x86/isa.hh b/src/arch/x86/isa.hh
index c6dea887691d0fd3c739a8f6009a29cacb038f58..463a249a45bd26645aea922ae86447ffd29ea5fa 100644 (file)
--- a/src/arch/x86/isa.hh
+++ b/src/arch/x86/isa.hh
@@ -31,14 +31,14 @@
 #ifndef __ARCH_X86_ISA_HH__
 #define __ARCH_X86_ISA_HH__
 
-#include "arch/x86/registers.hh"
+#include <iostream>
+#include <string>
+
 #include "arch/x86/regs/float.hh"
 #include "arch/x86/regs/misc.hh"
+#include "arch/x86/registers.hh"
 #include "base/types.hh"
 
-#include <string>
-#include <iostream>
-
 class Checkpoint;
 class EventManager;
 class ThreadContext;

diff --git a/src/arch/x86/isa/includes.isa b/src/arch/x86/isa/includes.isa
index 674e69e982e7acde8b4c9cf55e4258d96291c548..6f4c4008e0e1e6eed04fe008a1d4d6e1a5bd0181 100644 (file)
--- a/src/arch/x86/isa/includes.isa
+++ b/src/arch/x86/isa/includes.isa
@@ -50,17 +50,17 @@ let {{
 
 output header {{
 #include <cstring>
-#include <sstream>
 #include <iostream>
+#include <sstream>
 
 #include "arch/generic/debugfaults.hh"
-#include "arch/x86/emulenv.hh"
 #include "arch/x86/insts/macroop.hh"
 #include "arch/x86/insts/microfpop.hh"
 #include "arch/x86/insts/microldstop.hh"
 #include "arch/x86/insts/micromediaop.hh"
 #include "arch/x86/insts/microregop.hh"
 #include "arch/x86/insts/static_inst.hh"
+#include "arch/x86/emulenv.hh"
 #include "arch/x86/isa_traits.hh"
 #include "arch/x86/registers.hh"
 #include "arch/x86/types.hh"
@@ -73,14 +73,14 @@ using X86ISA::InstRegIndex;
 }};
 
 output decoder {{
-#include "arch/x86/faults.hh"
-#include "arch/x86/microcode_rom.hh"
 #include "arch/x86/regs/float.hh"
 #include "arch/x86/regs/misc.hh"
 #include "arch/x86/regs/segment.hh"
+#include "arch/x86/faults.hh"
+#include "arch/x86/microcode_rom.hh"
 #include "arch/x86/tlb.hh"
-#include "base/cprintf.hh"
 #include "base/loader/symtab.hh"
+#include "base/cprintf.hh"
 #include "base/misc.hh"
 #include "cpu/thread_context.hh"  // for Jump::branchTarget()
 #include "mem/packet.hh"
@@ -106,23 +106,23 @@ output exec {{
 #include "sim/pseudo_inst.hh"
 #endif
 
+#include <cmath>
 #include <limits>
 
-#include <cmath>
+#include "arch/x86/regs/misc.hh"
 #include "arch/x86/cpuid.hh"
 #include "arch/x86/faults.hh"
-#include "arch/x86/regs/misc.hh"
 #include "arch/x86/tlb.hh"
 #include "base/bigint.hh"
 #include "base/compiler.hh"
 #include "base/condcodes.hh"
 #include "cpu/base.hh"
 #include "cpu/exetrace.hh"
-#include "sim/sim_exit.hh"
 #include "mem/packet.hh"
 #include "mem/packet_access.hh"
 #include "mem/request.hh"
 #include "sim/pseudo_inst.hh"
+#include "sim/sim_exit.hh"
 
 using namespace X86ISA;
 using namespace std;

diff --git a/src/arch/x86/linux/linux.cc b/src/arch/x86/linux/linux.cc
index 0d9d7b676676eaac28b8039fb8917f1a3287e969..590af0e40f9e29797f8eb1a88a73d15464cde458 100644 (file)
--- a/src/arch/x86/linux/linux.cc
+++ b/src/arch/x86/linux/linux.cc
@@ -37,9 +37,10 @@
  * Authors: Gabe Black
  */
 
-#include "arch/x86/linux/linux.hh"
 #include <fcntl.h>
 
+#include "arch/x86/linux/linux.hh"
+
 // open(2) flags translation table
 OpenFlagTransTable X86Linux64::openFlagTable[] = {
 #ifdef _MSC_VER

diff --git a/src/arch/x86/linux/process.cc b/src/arch/x86/linux/process.cc
index 4f79674247fb13e8875321ec9e3176dbf2e93088..2e665072bb1369f9a5b6820a82300a12e7dec1da 100644 (file)
--- a/src/arch/x86/linux/process.cc
+++ b/src/arch/x86/linux/process.cc
@@ -37,14 +37,12 @@
  * Authors: Gabe Black
  */
 
-#include "arch/x86/isa_traits.hh"
 #include "arch/x86/linux/process.hh"
+#include "arch/x86/isa_traits.hh"
 #include "arch/x86/registers.hh"
-
 #include "base/trace.hh"
 #include "cpu/thread_context.hh"
 #include "kern/linux/linux.hh"
-
 #include "sim/process.hh"
 
 using namespace std;

diff --git a/src/arch/x86/linux/process.hh b/src/arch/x86/linux/process.hh
index 20012d96037fd01084de4ecfb7dd1b1ba70dab21..789c2925aee288ed28394cd8735f09165367228d 100644 (file)
--- a/src/arch/x86/linux/process.hh
+++ b/src/arch/x86/linux/process.hh
@@ -40,9 +40,9 @@
 #ifndef __X86_LINUX_PROCESS_HH__
 #define __X86_LINUX_PROCESS_HH__
 
-#include "sim/process.hh"
 #include "arch/x86/linux/linux.hh"
 #include "arch/x86/process.hh"
+#include "sim/process.hh"
 
 namespace X86ISA {
 

diff --git a/src/arch/x86/linux/syscalls.cc b/src/arch/x86/linux/syscalls.cc
index 87cddba4d4a531809246d7867cd25396c6d6f613..5ccb143946cba433384beb78fa96bd6a89a9d75c 100644 (file)
--- a/src/arch/x86/linux/syscalls.cc
+++ b/src/arch/x86/linux/syscalls.cc
@@ -37,8 +37,8 @@
  * Authors: Gabe Black
  */
 
-#include "arch/x86/linux/process.hh"
 #include "arch/x86/linux/linux.hh"
+#include "arch/x86/linux/process.hh"
 #include "arch/x86/regs/misc.hh"
 #include "kern/linux/linux.hh"
 #include "sim/syscall_emul.hh"

diff --git a/src/arch/x86/linux/system.cc b/src/arch/x86/linux/system.cc
index f750019a88808123803f1e92c45e6436551cb4d0..104f9337272f750b38e0fa1df2cb0857c6d1fdc1 100644 (file)
--- a/src/arch/x86/linux/system.cc
+++ b/src/arch/x86/linux/system.cc
@@ -37,9 +37,9 @@
  * Authors: Gabe Black
  */
 
-#include "arch/x86/isa_traits.hh"
 #include "arch/x86/linux/system.hh"
 #include "arch/x86/regs/int.hh"
+#include "arch/x86/isa_traits.hh"
 #include "arch/vtophys.hh"
 #include "base/trace.hh"
 #include "cpu/thread_context.hh"
@@ -47,7 +47,6 @@
 #include "params/LinuxX86System.hh"
 #include "sim/byteswap.hh"
 
-
 using namespace LittleEndianGuest;
 using namespace X86ISA;
 

diff --git a/src/arch/x86/linux/system.hh b/src/arch/x86/linux/system.hh
index ae7e93f3daa8b9c48ce6e55d1e5f075a80ed360b..e8adba9f20864143cc29c65dc7507453c5d81ee7 100644 (file)
--- a/src/arch/x86/linux/system.hh
+++ b/src/arch/x86/linux/system.hh
@@ -43,9 +43,9 @@
 #include <string>
 #include <vector>
 
-#include "params/LinuxX86System.hh"
 #include "arch/x86/bios/e820.hh"
 #include "arch/x86/system.hh"
+#include "params/LinuxX86System.hh"
 
 class LinuxX86System : public X86System
 {

diff --git a/src/arch/x86/microcode_rom.hh b/src/arch/x86/microcode_rom.hh
index 84c503bb9f2e26d30e7e369f28a90470cf509223..4a35e06a35bf5e3e458dd1ab03013170c03bb1da 100644 (file)
--- a/src/arch/x86/microcode_rom.hh
+++ b/src/arch/x86/microcode_rom.hh
@@ -31,8 +31,8 @@
 #ifndef __ARCH_X86_MICROCODE_ROM_HH__
 #define __ARCH_X86_MICROCODE_ROM_HH__
 
-#include "arch/x86/emulenv.hh"
 #include "arch/x86/insts/badmicroop.hh"
+#include "arch/x86/emulenv.hh"
 #include "cpu/static_inst.hh"
 
 namespace X86ISAInst

diff --git a/src/arch/x86/nativetrace.cc b/src/arch/x86/nativetrace.cc
index d1d75387d396bef0cf83b872780b4ec5af4efb2a..3dd5890bc79fb100e5019b7afff84ef0d03ee3ad 100644 (file)
--- a/src/arch/x86/nativetrace.cc
+++ b/src/arch/x86/nativetrace.cc
@@ -28,10 +28,10 @@
  * Authors: Gabe Black
  */
 
-#include "arch/x86/isa_traits.hh"
-#include "arch/x86/nativetrace.hh"
 #include "arch/x86/regs/float.hh"
 #include "arch/x86/regs/int.hh"
+#include "arch/x86/isa_traits.hh"
+#include "arch/x86/nativetrace.hh"
 #include "cpu/thread_context.hh"
 #include "params/X86NativeTrace.hh"
 #include "sim/byteswap.hh"

diff --git a/src/arch/x86/pagetable_walker.cc b/src/arch/x86/pagetable_walker.cc
index 234ea5961ac032d7c9d9a2705739e30a00d57cfd..835cc69ad406109207c2d9988c34939fd2616eba 100644 (file)
--- a/src/arch/x86/pagetable_walker.cc
+++ b/src/arch/x86/pagetable_walker.cc
@@ -42,8 +42,8 @@
 #include "arch/x86/tlb.hh"
 #include "arch/x86/vtophys.hh"
 #include "base/bitfield.hh"
-#include "cpu/thread_context.hh"
 #include "cpu/base.hh"
+#include "cpu/thread_context.hh"
 #include "mem/packet_access.hh"
 #include "mem/request.hh"
 #include "sim/system.hh"

diff --git a/src/arch/x86/pagetable_walker.hh b/src/arch/x86/pagetable_walker.hh
index 007c577ae9f2d522edabf0172054f66264ea2015..b0edc434f7d92020449bfe658f246095a1c66c06 100644 (file)
--- a/src/arch/x86/pagetable_walker.hh
+++ b/src/arch/x86/pagetable_walker.hh
@@ -44,8 +44,8 @@
 
 #include "arch/x86/pagetable.hh"
 #include "arch/x86/tlb.hh"
-#include "base/types.hh"
 #include "base/fast_alloc.hh"
+#include "base/types.hh"
 #include "mem/mem_object.hh"
 #include "mem/packet.hh"
 #include "params/X86PagetableWalker.hh"

diff --git a/src/arch/x86/predecoder.hh b/src/arch/x86/predecoder.hh
index 5c67e28e19acf28498f88635649abfbf8052c011..f0d9cda8174ba5cce2ec8079545768911011e8d5 100644 (file)
--- a/src/arch/x86/predecoder.hh
+++ b/src/arch/x86/predecoder.hh
@@ -42,8 +42,8 @@
 
 #include <cassert>
 
-#include "arch/x86/types.hh"
 #include "arch/x86/regs/misc.hh"
+#include "arch/x86/types.hh"
 #include "base/bitfield.hh"
 #include "base/misc.hh"
 #include "base/trace.hh"

diff --git a/src/arch/x86/process.cc b/src/arch/x86/process.cc
index bb875686e7c98cec9a174ffffa5d3c658278f27c..693a8fabe965ccabb3bd0613e4349ad1d3995ef8 100644 (file)
--- a/src/arch/x86/process.cc
+++ b/src/arch/x86/process.cc
@@ -41,13 +41,13 @@
  *          Ali Saidi
  */
 
-#include "arch/x86/isa_traits.hh"
-#include "arch/x86/process.hh"
 #include "arch/x86/regs/misc.hh"
 #include "arch/x86/regs/segment.hh"
+#include "arch/x86/isa_traits.hh"
+#include "arch/x86/process.hh"
 #include "arch/x86/types.hh"
-#include "base/loader/object_file.hh"
 #include "base/loader/elf_object.hh"
+#include "base/loader/object_file.hh"
 #include "base/misc.hh"
 #include "base/trace.hh"
 #include "cpu/thread_context.hh"

diff --git a/src/arch/x86/process.hh b/src/arch/x86/process.hh
index 34275b2d30672d171018b0f0f3998b72ec27ae4e..98e17715ade897a423d0a004f226451e9f61178c 100644 (file)
--- a/src/arch/x86/process.hh
+++ b/src/arch/x86/process.hh
@@ -42,6 +42,7 @@
 
 #include <string>
 #include <vector>
+
 #include "sim/process.hh"
 
 class SyscallDesc;

diff --git a/src/arch/x86/registers.hh b/src/arch/x86/registers.hh
index 5882132e5712fabdec54c4247384d9612df0ccc7..c3bda5a19523959b927dab3795bb12b605aabb9e 100644 (file)
--- a/src/arch/x86/registers.hh
+++ b/src/arch/x86/registers.hh
@@ -40,9 +40,9 @@
 #ifndef __ARCH_X86_REGISTERS_HH__
 #define __ARCH_X86_REGISTERS_HH__
 
-#include "arch/x86/max_inst_regs.hh"
 #include "arch/x86/regs/int.hh"
 #include "arch/x86/regs/misc.hh"
+#include "arch/x86/max_inst_regs.hh"
 #include "arch/x86/x86_traits.hh"
 
 namespace X86ISA

diff --git a/src/arch/x86/remote_gdb.cc b/src/arch/x86/remote_gdb.cc
index 9985374d0d5dc80c3c845b0960ff714f4638337a..8db7a6088e37a6a287abbdf05b21bc1b152ca1c2 100644 (file)
--- a/src/arch/x86/remote_gdb.cc
+++ b/src/arch/x86/remote_gdb.cc
@@ -38,12 +38,12 @@
  */
 
 #include <sys/signal.h>
+#include <unistd.h>
 
 #include <string>
-#include <unistd.h>
 
-#include "arch/vtophys.hh"
 #include "arch/x86/remote_gdb.hh"
+#include "arch/vtophys.hh"
 #include "base/remote_gdb.hh"
 #include "base/socket.hh"
 #include "base/trace.hh"

diff --git a/src/arch/x86/system.cc b/src/arch/x86/system.cc
index 20ee484fb9888fbe838acee1b5ad0ac66fe2e507..d287e3947f95d0032bfa6fc4dcb070df5168b067 100644 (file)
--- a/src/arch/x86/system.cc
+++ b/src/arch/x86/system.cc
@@ -37,22 +37,21 @@
  * Authors: Gabe Black
  */
 
-#include "arch/x86/bios/smbios.hh"
 #include "arch/x86/bios/intelmp.hh"
-#include "arch/x86/isa_traits.hh"
+#include "arch/x86/bios/smbios.hh"
 #include "arch/x86/regs/misc.hh"
+#include "arch/x86/isa_traits.hh"
 #include "arch/x86/system.hh"
 #include "arch/vtophys.hh"
-#include "base/intmath.hh"
 #include "base/loader/object_file.hh"
 #include "base/loader/symtab.hh"
+#include "base/intmath.hh"
 #include "base/trace.hh"
 #include "cpu/thread_context.hh"
 #include "mem/physical.hh"
 #include "params/X86System.hh"
 #include "sim/byteswap.hh"
 
-
 using namespace LittleEndianGuest;
 using namespace X86ISA;
 

diff --git a/src/arch/x86/tlb.cc b/src/arch/x86/tlb.cc
index ac32e86d7f3e4e2d3984082e52d1be3b07d35631..f5e73dcee93721de8b7bb3872f72bf7ff5208668 100644 (file)
--- a/src/arch/x86/tlb.cc
+++ b/src/arch/x86/tlb.cc
@@ -39,19 +39,17 @@
 
 #include <cstring>
 
-#include "config/full_system.hh"
-
-#include "arch/x86/faults.hh"
 #include "arch/x86/insts/microldstop.hh"
-#include "arch/x86/pagetable.hh"
 #include "arch/x86/regs/misc.hh"
+#include "arch/x86/faults.hh"
+#include "arch/x86/pagetable.hh"
 #include "arch/x86/tlb.hh"
 #include "arch/x86/x86_traits.hh"
 #include "base/bitfield.hh"
 #include "base/trace.hh"
 #include "config/full_system.hh"
-#include "cpu/thread_context.hh"
 #include "cpu/base.hh"
+#include "cpu/thread_context.hh"
 #include "mem/packet_access.hh"
 #include "mem/request.hh"
 

diff --git a/src/arch/x86/tlb.hh b/src/arch/x86/tlb.hh
index 965d331ba8528687a4a05d5c29369ec6855f9449..e4ea0e1b7f0a7d686d592fd9892e24ecff0d6f4a 100644 (file)
--- a/src/arch/x86/tlb.hh
+++ b/src/arch/x86/tlb.hh
@@ -41,18 +41,18 @@
 #define __ARCH_X86_TLB_HH__
 
 #include <list>
-#include <vector>
 #include <string>
+#include <vector>
 
-#include "arch/x86/pagetable.hh"
 #include "arch/x86/regs/segment.hh"
+#include "arch/x86/pagetable.hh"
 #include "config/full_system.hh"
 #include "mem/mem_object.hh"
 #include "mem/request.hh"
 #include "params/X86TLB.hh"
 #include "sim/fault_fwd.hh"
-#include "sim/tlb.hh"
 #include "sim/sim_object.hh"
+#include "sim/tlb.hh"
 
 class ThreadContext;
 class Packet;

diff --git a/src/base/cp_annotate.cc b/src/base/cp_annotate.cc
index 69b926b29921cdb8aaac09962dead62403eeec8f..118c6bf3609128d0266254efeb4bc3ff6e1edbeb 100644 (file)
--- a/src/base/cp_annotate.cc
+++ b/src/base/cp_annotate.cc
@@ -28,11 +28,11 @@
  * Authors: Ali Saidi
  */
 
-#include "arch/utility.hh"
 #include "arch/alpha/linux/threadinfo.hh"
-#include "base/cp_annotate.hh"
-#include "base/callback.hh"
+#include "arch/utility.hh"
 #include "base/loader/object_file.hh"
+#include "base/callback.hh"
+#include "base/cp_annotate.hh"
 #include "base/output.hh"
 #include "base/trace.hh"
 #include "config/the_isa.hh"

diff --git a/src/base/cp_annotate.hh b/src/base/cp_annotate.hh
index fb955a38000e3f5a2ae59bb0e426fa009bd04cc9..3e4597ba8da861f7b9cbef1914b35e35eb2a17dc 100644 (file)
--- a/src/base/cp_annotate.hh
+++ b/src/base/cp_annotate.hh
@@ -31,13 +31,13 @@
 #ifndef __BASE__CP_ANNOTATE_HH__
 #define __BASE__CP_ANNOTATE_HH__
 
-#include <string>
 #include <list>
-#include <vector>
 #include <map>
+#include <string>
+#include <vector>
 
-#include "base/hashmap.hh"
 #include "base/loader/symtab.hh"
+#include "base/hashmap.hh"
 #include "base/trace.hh"
 #include "base/types.hh"
 #include "config/cp_annotate.hh"

diff --git a/src/base/cprintf.hh b/src/base/cprintf.hh
index cd5d642c1f705b12c8922d46eed5254cf5487669..6124d8c7330f856e7512fa2a18339fdd93eb5ab3 100644 (file)
--- a/src/base/cprintf.hh
+++ b/src/base/cprintf.hh
@@ -37,8 +37,8 @@
 #include <list>
 #include <string>
 
-#include "base/varargs.hh"
 #include "base/cprintf_formats.hh"
+#include "base/varargs.hh"
 
 namespace cp {
 

diff --git a/src/base/debug.cc b/src/base/debug.cc
index de201af18ba99b38cbf1efbbb95f56dca5395380..1d7be5a9a5baf9530acf3ade1d455e6e41f60103 100644 (file)
--- a/src/base/debug.cc
+++ b/src/base/debug.cc
@@ -29,9 +29,10 @@
  */
 
 #include <sys/types.h>
-#include <signal.h>
 #include <unistd.h>
 
+#include <csignal>
+
 #include "base/cprintf.hh"
 
 void

diff --git a/src/base/fast_alloc.hh b/src/base/fast_alloc.hh
index 58043e51e6b19f99fa09e4c8085ef58e813ed296..d6dc593d4b5aa734096256a61d70717b433ff0ba 100644 (file)
--- a/src/base/fast_alloc.hh
+++ b/src/base/fast_alloc.hh
@@ -62,9 +62,9 @@
 // collapse the destructor call chain back up the inheritance
 // hierarchy.
 
-#include "config/no_fast_alloc.hh"
-#include "config/force_fast_alloc.hh"
 #include "config/fast_alloc_stats.hh"
+#include "config/force_fast_alloc.hh"
+#include "config/no_fast_alloc.hh"
 
 // By default, we want to enable FastAlloc in any build other than
 // m5.debug.  (FastAlloc's reuse policies can mask allocation bugs, so

diff --git a/src/base/fenv.c b/src/base/fenv.c
index 2ec2f796fe58d64be7a40d91f863aa3403991cb0..ed06e220da8268d429468d17410a910890ccde00 100644 (file)
--- a/src/base/fenv.c
+++ b/src/base/fenv.c
@@ -29,8 +29,8 @@
  */
 
 #include <assert.h>
-#include <stdlib.h>
 #include <fenv.h>
+#include <stdlib.h>
 
 void m5_fesetround(int rm);
 int m5_fegetround();

diff --git a/src/base/hostinfo.cc b/src/base/hostinfo.cc
index ffc2f93ffde05f361c4634a7dafaf3b8e9470b15..5ff34e6036ffc43b7157afd9644dc76fcd07cdb8 100644 (file)
--- a/src/base/hostinfo.cc
+++ b/src/base/hostinfo.cc
@@ -28,12 +28,12 @@
  * Authors: Nathan Binkert
  */
 
-#include <ctype.h>
-#include <errno.h>
-#include <math.h>
 #include <unistd.h>
 
-#include <stdio.h>
+#include <cctype>
+#include <cerrno>
+#include <cmath>
+#include <cstdio>
 #include <cstdlib>
 #include <cstring>
 #include <string>

diff --git a/src/base/inet.hh b/src/base/inet.hh
index ecb0882899de1ca87b718a50f3e43139b4eecc25..a957b8a71eefe2b58e54bf66b94fa6b95c5f0bcb 100644 (file)
--- a/src/base/inet.hh
+++ b/src/base/inet.hh
@@ -42,7 +42,6 @@
 #include "base/range.hh"
 #include "base/types.hh"
 #include "dev/etherpkt.hh"
-
 #include "dnet/os.h"
 #include "dnet/eth.h"
 #include "dnet/ip.h"

diff --git a/src/base/inifile.cc b/src/base/inifile.cc
index 24d0013c4aad31b00d2df1d31c0fb94e422353ff..4511980334122e477c0ea8b2fb08e1a862deaf34 100644 (file)
--- a/src/base/inifile.cc
+++ b/src/base/inifile.cc
@@ -31,8 +31,8 @@
 
 #include <fstream>
 #include <iostream>
-#include <vector>
 #include <string>
+#include <vector>
 
 #include "base/inifile.hh"
 #include "base/str.hh"

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

diff --git a/src/base/loader/elf_object.cc b/src/base/loader/elf_object.cc
index a550d97657d030c3490cbfdc0baa86d32159c0fc..22316c0d6b66d3d8d5959f69dd85075ed1d5f5ac 100644 (file)
--- a/src/base/loader/elf_object.cc
+++ b/src/base/loader/elf_object.cc
@@ -32,14 +32,13 @@
 #include <cassert>
 #include <string>
 
-#include "gelf.h"
-
-#include "base/bitfield.hh"
 #include "base/loader/elf_object.hh"
 #include "base/loader/symtab.hh"
+#include "base/bitfield.hh"
 #include "base/misc.hh"
 #include "base/trace.hh"
 #include "sim/byteswap.hh"
+#include "gelf.h"
 
 using namespace std;
 

diff --git a/src/base/loader/elf_object.hh b/src/base/loader/elf_object.hh
index a19e82b28f877938b6bc5c2f953f3141d671cc23..fe75927c511e573cb6d1b17b143ef5d53eab7cd1 100644 (file)
--- a/src/base/loader/elf_object.hh
+++ b/src/base/loader/elf_object.hh
@@ -31,10 +31,11 @@
 #ifndef __ELF_OBJECT_HH__
 #define __ELF_OBJECT_HH__
 
-#include "base/loader/object_file.hh"
 #include <set>
 #include <vector>
 
+#include "base/loader/object_file.hh"
+
 class ElfObject : public ObjectFile
 {
   protected:

diff --git a/src/base/loader/hex_file.cc b/src/base/loader/hex_file.cc
index 61d6c80096da2515ae242140aa458ad123b6fc45..854834b2bd64d53bbc1481632cd4d3d173fd9d51 100755 (executable)
--- a/src/base/loader/hex_file.cc
+++ b/src/base/loader/hex_file.cc
@@ -33,9 +33,9 @@
 #include <list>
 #include <string>
 
-#include "base/cprintf.hh"
 #include "base/loader/hex_file.hh"
 #include "base/loader/symtab.hh"
+#include "base/cprintf.hh"
 #include "mem/translating_port.hh"
 
 using namespace std;

diff --git a/src/base/loader/object_file.cc b/src/base/loader/object_file.cc
index 2273b6c4e9d1586c8222ef7feda91562cb7358dd..9dcbd7936961045523cd75f688a6878cf4c09819 100644 (file)
--- a/src/base/loader/object_file.cc
+++ b/src/base/loader/object_file.cc
@@ -29,24 +29,22 @@
  *          Steve Reinhardt
  */
 
-#include <list>
-#include <string>
-
-#include <sys/types.h>
 #include <sys/mman.h>
+#include <sys/types.h>
 #include <fcntl.h>
-#include <stdio.h>
 #include <unistd.h>
 
-#include "base/cprintf.hh"
-#include "base/loader/object_file.hh"
-#include "base/loader/symtab.hh"
+#include <cstdio>
+#include <list>
+#include <string>
 
-#include "base/loader/ecoff_object.hh"
 #include "base/loader/aout_object.hh"
+#include "base/loader/ecoff_object.hh"
 #include "base/loader/elf_object.hh"
+#include "base/loader/object_file.hh"
 #include "base/loader/raw_object.hh"
-
+#include "base/loader/symtab.hh"
+#include "base/cprintf.hh"
 #include "mem/translating_port.hh"
 
 using namespace std;

diff --git a/src/base/loader/symtab.cc b/src/base/loader/symtab.cc
index 7163260ec2e1a386705eef7345f85d0b8d2cc63f..2c868a9b1e08e91aeec1c28a5ab7d4cde6c46e17 100644 (file)
--- a/src/base/loader/symtab.cc
+++ b/src/base/loader/symtab.cc
@@ -28,8 +28,8 @@
  * Authors: Nathan Binkert
  */
 
-#include <iostream>
 #include <fstream>
+#include <iostream>
 #include <string>
 #include <vector>
 

diff --git a/src/base/misc.cc b/src/base/misc.cc
index 94336c647ab03a05f71aed6f4a4aa42cb57f3bda..66896103fe22bced4e8393275511d993a4c9574c 100644 (file)
--- a/src/base/misc.cc
+++ b/src/base/misc.cc
@@ -28,10 +28,11 @@
  * Authors: Nathan Binkert
  */
 
+#include <zlib.h>
+
 #include <cstdlib>
 #include <iostream>
 #include <string>
-#include <zlib.h>
 
 #include "base/cprintf.hh"
 #include "base/hostinfo.hh"

diff --git a/src/base/mysql.hh b/src/base/mysql.hh
index c9051bd2b6f30c6f53c35dddbaa620b029146405..c8ffba73363c2bd3ed7773802a8927de5149c5ef 100644 (file)
--- a/src/base/mysql.hh
+++ b/src/base/mysql.hh
@@ -33,12 +33,13 @@
 
 #define TO_BE_INCLUDED_LATER 0
 
+#include <mysql.h>
+#include <mysql_version.h>
+
 #include <cassert>
 #include <iosfwd>
-#include <mysql_version.h>
-#include <mysql.h>
-#include <string>
 #include <sstream>
+#include <string>
 
 namespace MySQL {
 

diff --git a/src/base/output.cc b/src/base/output.cc
index ea13e23d4604aaea55e17533e4cb942ed16507d0..0202471521af7e8612f8cc71763c5a7b96605942 100644 (file)
--- a/src/base/output.cc
+++ b/src/base/output.cc
@@ -28,12 +28,12 @@
  * Authors: Nathan Binkert
  */
 
-#include <errno.h>
-#include <limits.h>
-#include <stdlib.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 
+#include <cerrno>
+#include <climits>
+#include <cstdlib>
 #include <fstream>
 
 #include <gzstream.hh>

diff --git a/src/base/pollevent.cc b/src/base/pollevent.cc
index 7dcaa094d59a14926ca1c257a8846568ed832bd2..67708c1295cec9b2d464f23aab40dc7e62124224 100644 (file)
--- a/src/base/pollevent.cc
+++ b/src/base/pollevent.cc
@@ -35,9 +35,10 @@
 #endif
 
 #include <fcntl.h>
-#include <signal.h>
 #include <unistd.h>
 
+#include <csignal>
+
 #include "base/misc.hh"
 #include "base/pollevent.hh"
 #include "base/types.hh"

diff --git a/src/base/pollevent.hh b/src/base/pollevent.hh
index ecaeb94ce9b2db4bfded43e14dcc461f5d4c6c0e..b9c833c8a2a7eacabab7c74bfa15862db4899b84 100644 (file)
--- a/src/base/pollevent.hh
+++ b/src/base/pollevent.hh
@@ -31,8 +31,10 @@
 #ifndef __POLLEVENT_H__
 #define __POLLEVENT_H__
 
-#include <vector>
 #include <poll.h>
+
+#include <vector>
+
 #include "sim/core.hh"
 
 class Checkpoint;

diff --git a/src/base/range_map.hh b/src/base/range_map.hh
index 0ffc28ed995ef1b3e7526d95b8dc66ab3e86f30c..7714a00496c66ca3e3771ce879657fc895375478 100644 (file)
--- a/src/base/range_map.hh
+++ b/src/base/range_map.hh
@@ -31,10 +31,10 @@
 #ifndef __BASE_RANGE_MAP_HH__
 #define __BASE_RANGE_MAP_HH__
 
-#include "base/range.hh"
-
 #include <map>
 
+#include "base/range.hh"
+
 template <class T,class V>
 class range_map
 {

diff --git a/src/base/remote_gdb.cc b/src/base/remote_gdb.cc
index abc5f4ec01e9108dd3b8f6960ad200368b7006ee..02ee8e331fa0c8e4b971c4d7e2ca46a838b84432 100644 (file)
--- a/src/base/remote_gdb.cc
+++ b/src/base/remote_gdb.cc
@@ -117,10 +117,10 @@
  */
 
 #include <sys/signal.h>
+#include <unistd.h>
 
 #include <cstdio>
 #include <string>
-#include <unistd.h>
 
 #include "config/full_system.hh"
 
@@ -134,8 +134,8 @@
 #include "base/socket.hh"
 #include "base/trace.hh"
 #include "config/the_isa.hh"
-#include "cpu/thread_context.hh"
 #include "cpu/static_inst.hh"
+#include "cpu/thread_context.hh"
 #include "mem/port.hh"
 #include "mem/translating_port.hh"
 #include "sim/system.hh"

diff --git a/src/base/remote_gdb.hh b/src/base/remote_gdb.hh
index 92e599585f3770211485bd92537c639142819395..7c1228e592de5db3caeb1d59e2b10d87da383996 100644 (file)
--- a/src/base/remote_gdb.hh
+++ b/src/base/remote_gdb.hh
@@ -31,13 +31,14 @@
 #ifndef __REMOTE_GDB_HH__
 #define __REMOTE_GDB_HH__
 
-#include <map>
 #include <sys/signal.h>
 
+#include <map>
+
 #include "arch/types.hh"
-#include "cpu/pc_event.hh"
 #include "base/pollevent.hh"
 #include "base/socket.hh"
+#include "cpu/pc_event.hh"
 
 class System;
 class ThreadContext;

diff --git a/src/base/socket.cc b/src/base/socket.cc
index 4ad8f5c93b23ca8165a908485034c08e3b43a654..0c8903084ab4f2e310834144f8d06d25de19e15f 100644 (file)
--- a/src/base/socket.cc
+++ b/src/base/socket.cc
@@ -28,18 +28,17 @@
  * Authors: Nathan Binkert
  */
 
-#include <sys/types.h>
-#include <sys/socket.h>
-
 #include <netinet/in.h>
 #include <netinet/tcp.h>
-
-#include <errno.h>
+#include <sys/socket.h>
+#include <sys/types.h>
 #include <unistd.h>
 
-#include "base/types.hh"
+#include <cerrno>
+
 #include "base/misc.hh"
 #include "base/socket.hh"
+#include "base/types.hh"
 
 using namespace std;
 

diff --git a/src/base/statistics.cc b/src/base/statistics.cc
index 95402a2217ec0877eb94d649820d760c893627f7..5ee018b1c3910b08cba9347fe3c36aa577f407dc 100644 (file)
--- a/src/base/statistics.cc
+++ b/src/base/statistics.cc
@@ -28,8 +28,8 @@
  * Authors: Nathan Binkert
  */
 
-#include <iomanip>
 #include <fstream>
+#include <iomanip>
 #include <list>
 #include <map>
 #include <string>

diff --git a/src/base/statistics.hh b/src/base/statistics.hh
index 579a7908ecc17e94b00d710481912f30b640343f..bf2139caabd6e492b751096a0f6600f948f7c739 100644 (file)
--- a/src/base/statistics.hh
+++ b/src/base/statistics.hh
@@ -50,7 +50,7 @@
 #include <algorithm>
 #include <cassert>
 #ifdef __SUNPRO_CC
-#include <math.h>
+#include <cmath>
 #endif
 #include <cmath>
 #include <functional>
@@ -59,13 +59,13 @@
 #include <string>
 #include <vector>
 
+#include "base/stats/info.hh"
+#include "base/stats/types.hh"
+#include "base/stats/visit.hh"
 #include "base/cast.hh"
 #include "base/cprintf.hh"
 #include "base/intmath.hh"
 #include "base/refcnt.hh"
-#include "base/stats/info.hh"
-#include "base/stats/types.hh"
-#include "base/stats/visit.hh"
 #include "base/str.hh"
 #include "base/types.hh"
 

diff --git a/src/base/stats/info.hh b/src/base/stats/info.hh
index b1c05eed1052bbdf60515fab190dc31191a490bd..9c81442eee425da15a57e95481e7a1cedb9c6aeb 100644 (file)
--- a/src/base/stats/info.hh
+++ b/src/base/stats/info.hh
@@ -31,8 +31,8 @@
 #ifndef __BASE_STATS_INFO_HH__
 #define __BASE_STATS_INFO_HH__
 
-#include "base/flags.hh"
 #include "base/stats/types.hh"
+#include "base/flags.hh"
 
 namespace Stats {
 

diff --git a/src/base/stats/mysql.cc b/src/base/stats/mysql.cc
index af13582b4112a303952dfe6544b065576e132676..c08394605ec180992e1440ae7d74e98d8f11bd7c 100644 (file)
--- a/src/base/stats/mysql.cc
+++ b/src/base/stats/mysql.cc
@@ -35,13 +35,13 @@
 #include <string>
 #include <vector>
 
-#include "base/misc.hh"
-#include "base/mysql.hh"
-#include "base/statistics.hh"
 #include "base/stats/info.hh"
 #include "base/stats/mysql.hh"
 #include "base/stats/mysql_run.hh"
 #include "base/stats/types.hh"
+#include "base/misc.hh"
+#include "base/mysql.hh"
+#include "base/statistics.hh"
 #include "base/str.hh"
 #include "base/types.hh"
 #include "base/userinfo.hh"

diff --git a/src/base/stats/output.cc b/src/base/stats/output.cc
index d3cb9da614744fc212b71e6ef9bee0d0067e35c9..6e1ba1c3b5990ac104956d076e29a00ae27fd769 100644 (file)
--- a/src/base/stats/output.cc
+++ b/src/base/stats/output.cc
@@ -30,8 +30,8 @@
 
 #include <list>
 
-#include "base/statistics.hh"
 #include "base/stats/output.hh"
+#include "base/statistics.hh"
 #include "base/types.hh"
 #include "sim/eventq.hh"
 

diff --git a/src/base/stats/text.cc b/src/base/stats/text.cc
index 385b92a1a9eb59c53e007b034660909c1932b50d..05bad04bfb8280b51c59464750a1966692eef704 100644 (file)
--- a/src/base/stats/text.cc
+++ b/src/base/stats/text.cc
@@ -33,25 +33,25 @@
 #endif
 
 #if defined(__sun)
-#include <math.h>
+#include <cmath>
 #endif
 
 #include <cassert>
 #ifdef __SUNPRO_CC
-#include <math.h>
+#include <cmath>
 #endif
 #include <cmath>
+#include <fstream>
 #include <iostream>
 #include <sstream>
-#include <fstream>
 #include <string>
 
-#include "base/cast.hh"
-#include "base/misc.hh"
-#include "base/str.hh"
 #include "base/stats/info.hh"
 #include "base/stats/text.hh"
 #include "base/stats/visit.hh"
+#include "base/cast.hh"
+#include "base/misc.hh"
+#include "base/str.hh"
 
 using namespace std;
 

diff --git a/src/base/stats/text.hh b/src/base/stats/text.hh
index ab85128596fdfdc514b2ff49784bab5791df7a95..de2bf94013d01a86b6fc68e126a3ee26a9ea2f7e 100644 (file)
--- a/src/base/stats/text.hh
+++ b/src/base/stats/text.hh
@@ -34,8 +34,8 @@
 #include <iosfwd>
 #include <string>
 
-#include "base/output.hh"
 #include "base/stats/output.hh"
+#include "base/output.hh"
 
 namespace Stats {
 

diff --git a/src/base/str.hh b/src/base/str.hh
index 08953caf3e41943bb576172b9a0eba18f23d93e9..6d617df724c630577307e7cce2686575a1750c85 100644 (file)
--- a/src/base/str.hh
+++ b/src/base/str.hh
@@ -32,12 +32,11 @@
 #ifndef __STR_HH__
 #define __STR_HH__
 
+#include <cctype>
 #include <sstream>
 #include <string>
 #include <vector>
 
-#include <ctype.h>
-
 template<class> class Hash;
 template<>
 class Hash<std::string> {

diff --git a/src/base/time.hh b/src/base/time.hh
index 20b1c6d3588714da13223aa5ead5c0fcf2aec058..f2107d78f261f245bdc2b32d3ef839076f75d2e8 100644 (file)
--- a/src/base/time.hh
+++ b/src/base/time.hh
@@ -33,7 +33,6 @@
 #define __BASE_TIME_HH__
 
 #include <sys/time.h>
-
 #include <inttypes.h>
 
 #include <cmath>

diff --git a/src/base/trace.cc b/src/base/trace.cc
index 22e05e6641908fb0026959152caaad518fc1a79c..7783b6d426280d885fb364c1865a0cf6df3abdc3 100644 (file)
--- a/src/base/trace.cc
+++ b/src/base/trace.cc
@@ -29,7 +29,7 @@
  *          Steve Reinhardt
  */
 
-#include <ctype.h>
+#include <cctype>
 #include <fstream>
 #include <iostream>
 #include <list>

diff --git a/src/base/vnc/convert.cc b/src/base/vnc/convert.cc
index ea7a9b1c59a010c3e815352720fbc05515ed61e9..cd1502ce6b7868cd8a104a62dc038d31d8232165 100644 (file)
--- a/src/base/vnc/convert.cc
+++ b/src/base/vnc/convert.cc
@@ -40,8 +40,8 @@
 
 #include <cassert>
 
-#include "base/misc.hh"
 #include "base/vnc/convert.hh"
+#include "base/misc.hh"
 
 /** @file
  * This file provides conversion functions for a variety of video modes

diff --git a/src/base/vnc/vncserver.cc b/src/base/vnc/vncserver.cc
index 8936fa67b542c15e8c93b4d1ff8448bd3765f550..84e1a20e17aa555c158b7b4182b85c8eca14a3bc 100644 (file)
--- a/src/base/vnc/vncserver.cc
+++ b/src/base/vnc/vncserver.cc
@@ -42,19 +42,19 @@
  * Implementiation of a VNC server
  */
 
-#include <cstdio>
-
 #include <sys/ioctl.h>
 #include <sys/termios.h>
-#include <errno.h>
 #include <poll.h>
 #include <unistd.h>
 
+#include <cerrno>
+#include <cstdio>
+
+#include "base/vnc/vncserver.hh"
 #include "base/atomicio.hh"
 #include "base/misc.hh"
 #include "base/socket.hh"
 #include "base/trace.hh"
-#include "base/vnc/vncserver.hh"
 #include "sim/byteswap.hh"
 
 using namespace std;

diff --git a/src/base/vnc/vncserver.hh b/src/base/vnc/vncserver.hh
index 23b097b111340d58807620030052d4ed7e245908..96dbdeddaf865d960c0c3984f284cb39e7f53bad 100644 (file)
--- a/src/base/vnc/vncserver.hh
+++ b/src/base/vnc/vncserver.hh
@@ -47,13 +47,13 @@
 
 #include <iostream>
 
+#include "base/vnc/convert.hh"
 #include "base/circlebuf.hh"
 #include "base/pollevent.hh"
 #include "base/socket.hh"
-#include "base/vnc/convert.hh"
 #include "cpu/intr_control.hh"
-#include "sim/sim_object.hh"
 #include "params/VncServer.hh"
+#include "sim/sim_object.hh"
 
 /**
  * A device that expects to receive input from the vnc server should derrive

diff --git a/src/cpu/activity.cc b/src/cpu/activity.cc
index 9c9288c4d225e0bf43c8492e73fba3afcdc76205..84f88d594721493d0b9533684006cba0d5def547 100644 (file)
--- a/src/cpu/activity.cc
+++ b/src/cpu/activity.cc
@@ -30,8 +30,8 @@
 
 #include <string>
 
-#include "cpu/timebuf.hh"
 #include "cpu/activity.hh"
+#include "cpu/timebuf.hh"
 
 using namespace std;
 

diff --git a/src/cpu/activity.hh b/src/cpu/activity.hh
index 8d3469c4e0c697717d2d8100b13b62b990ba9628..f119c95cc371deedda00fb0e1d8bdb8db872c019 100644 (file)
--- a/src/cpu/activity.hh
+++ b/src/cpu/activity.hh
@@ -31,8 +31,8 @@
 #ifndef __CPU_ACTIVITY_HH__
 #define __CPU_ACTIVITY_HH__
 
-#include "cpu/timebuf.hh"
 #include "base/trace.hh"
+#include "cpu/timebuf.hh"
 
 /**
  * ActivityRecorder helper class that informs the CPU if it can switch

diff --git a/src/cpu/base.cc b/src/cpu/base.cc
index 17ae65793721ea97ee0bdd9fd1685c7262f581f8..1d249b274f4da813bec277ad640f10402a08d63d 100644 (file)
--- a/src/cpu/base.cc
+++ b/src/cpu/base.cc
@@ -32,23 +32,23 @@
  */
 
 #include <iostream>
-#include <string>
 #include <sstream>
+#include <string>
 
 #include "arch/tlb.hh"
-#include "base/cprintf.hh"
 #include "base/loader/symtab.hh"
+#include "base/cprintf.hh"
 #include "base/misc.hh"
 #include "base/output.hh"
 #include "base/trace.hh"
 #include "cpu/base.hh"
 #include "cpu/cpuevent.hh"
-#include "cpu/thread_context.hh"
 #include "cpu/profile.hh"
+#include "cpu/thread_context.hh"
 #include "params/BaseCPU.hh"
-#include "sim/sim_exit.hh"
 #include "sim/process.hh"
 #include "sim/sim_events.hh"
+#include "sim/sim_exit.hh"
 #include "sim/system.hh"
 
 // Hack

diff --git a/src/cpu/base.hh b/src/cpu/base.hh
index 8557b5bd5eca86c17cb9036c830aaec4b2ec5c42..ce02889f31a6164c967442cfa6f363866a4dca51 100644 (file)
--- a/src/cpu/base.hh
+++ b/src/cpu/base.hh
@@ -41,9 +41,9 @@
 #include "base/statistics.hh"
 #include "config/full_system.hh"
 #include "config/the_isa.hh"
+#include "mem/mem_object.hh"
 #include "sim/eventq.hh"
 #include "sim/insttracer.hh"
-#include "mem/mem_object.hh"
 
 #if FULL_SYSTEM
 #include "arch/interrupts.hh"

diff --git a/src/cpu/base_dyn_inst_impl.hh b/src/cpu/base_dyn_inst_impl.hh
index 7e4d25322b98a86e96f0707b17f42d6387c5aacf..688d5c66bd5bce81405e26440a6ff28f9c0ae9a6 100644 (file)
--- a/src/cpu/base_dyn_inst_impl.hh
+++ b/src/cpu/base_dyn_inst_impl.hh
@@ -42,8 +42,8 @@
 
 #include <iostream>
 #include <set>
-#include <string>
 #include <sstream>
+#include <string>
 
 #include "base/cprintf.hh"
 #include "base/trace.hh"

diff --git a/src/cpu/checker/cpu.cc b/src/cpu/checker/cpu.cc
index 0790577656623c287d14d7a7f6dc96e59beed6d5..0c7fe66bf91587546dfe5c5c62ffb8c80c403267 100644 (file)
--- a/src/cpu/checker/cpu.cc
+++ b/src/cpu/checker/cpu.cc
@@ -31,8 +31,8 @@
 #include <list>
 #include <string>
 
-#include "cpu/base.hh"
 #include "cpu/checker/cpu.hh"
+#include "cpu/base.hh"
 #include "cpu/simple_thread.hh"
 #include "cpu/static_inst.hh"
 #include "cpu/thread_context.hh"

diff --git a/src/cpu/checker/cpu.hh b/src/cpu/checker/cpu.hh
index efd8a47765038fd9388019a15d8dc37579582be9..1e3a17a349d6d058bcb0ec72b97c413ccabde108 100644 (file)
--- a/src/cpu/checker/cpu.hh
+++ b/src/cpu/checker/cpu.hh
@@ -32,16 +32,16 @@
 #define __CPU_CHECKER_CPU_HH__
 
 #include <list>
-#include <queue>
 #include <map>
+#include <queue>
 
 #include "arch/types.hh"
 #include "base/statistics.hh"
 #include "config/full_system.hh"
 #include "cpu/base.hh"
 #include "cpu/base_dyn_inst.hh"
-#include "cpu/simple_thread.hh"
 #include "cpu/pc_event.hh"
+#include "cpu/simple_thread.hh"
 #include "cpu/static_inst.hh"
 #include "sim/eventq.hh"
 

diff --git a/src/cpu/checker/cpu_impl.hh b/src/cpu/checker/cpu_impl.hh
index 8197d560d4230732076208b8cdfb842ca24a9d00..8694dae2108bd77be9c974dd173de3f6825eaa5c 100644 (file)
--- a/src/cpu/checker/cpu_impl.hh
+++ b/src/cpu/checker/cpu_impl.hh
@@ -33,11 +33,11 @@
 
 #include "base/refcnt.hh"
 #include "config/the_isa.hh"
-#include "cpu/base_dyn_inst.hh"
 #include "cpu/checker/cpu.hh"
+#include "cpu/base_dyn_inst.hh"
 #include "cpu/simple_thread.hh"
-#include "cpu/thread_context.hh"
 #include "cpu/static_inst.hh"
+#include "cpu/thread_context.hh"
 #include "sim/sim_object.hh"
 #include "sim/stats.hh"
 

diff --git a/src/cpu/cpuevent.hh b/src/cpu/cpuevent.hh
index 65f0e87e1c6cde7e5a4e7081b4308ad1a3d036fa..77b1d9138acfe6b264d87be09196cde66ee01e68 100644 (file)
--- a/src/cpu/cpuevent.hh
+++ b/src/cpu/cpuevent.hh
@@ -32,6 +32,7 @@
 #define __CPU_CPUEVENT_HH__
 
 #include <vector>
+
 #include "sim/eventq.hh"
 
 class ThreadContext;

diff --git a/src/cpu/exetrace.cc b/src/cpu/exetrace.cc
index 760e5bd514d6fab20d3a8c4138eea93640e59c59..ea90ba7c2264a9336c85a1a723635de51bef9d9b 100644 (file)
--- a/src/cpu/exetrace.cc
+++ b/src/cpu/exetrace.cc
@@ -36,11 +36,11 @@
 #include "arch/isa_traits.hh"
 #include "arch/utility.hh"
 #include "base/loader/symtab.hh"
+#include "config/the_isa.hh"
 #include "cpu/base.hh"
 #include "cpu/exetrace.hh"
 #include "cpu/static_inst.hh"
 #include "cpu/thread_context.hh"
-#include "config/the_isa.hh"
 #include "enums/OpClass.hh"
 
 using namespace std;

diff --git a/src/cpu/func_unit.hh b/src/cpu/func_unit.hh
index e8238ba7353074042aedff110fc487e2bbec57d0..59c5ee8a091173afa2213a2c9eae1038e74c4117 100644 (file)
--- a/src/cpu/func_unit.hh
+++ b/src/cpu/func_unit.hh
@@ -36,8 +36,8 @@
 #include <vector>
 
 #include "cpu/op_class.hh"
-#include "params/OpDesc.hh"
 #include "params/FUDesc.hh"
+#include "params/OpDesc.hh"
 #include "sim/sim_object.hh"
 
 ////////////////////////////////////////////////////////////////////////////

diff --git a/src/cpu/inorder/cpu.cc b/src/cpu/inorder/cpu.cc
index 1c2fc63334156bcd053c7e49b5ba6f16f98cd61b..f7fff05d3e00bfa821e37f467544cfd2f9cc6d96 100644 (file)
--- a/src/cpu/inorder/cpu.cc
+++ b/src/cpu/inorder/cpu.cc
@@ -34,17 +34,17 @@
 #include "arch/utility.hh"
 #include "config/full_system.hh"
 #include "config/the_isa.hh"
-#include "cpu/activity.hh"
-#include "cpu/base.hh"
-#include "cpu/exetrace.hh"
+#include "cpu/inorder/resources/resource_list.hh"
 #include "cpu/inorder/cpu.hh"
 #include "cpu/inorder/first_stage.hh"
 #include "cpu/inorder/inorder_dyn_inst.hh"
 #include "cpu/inorder/pipeline_traits.hh"
 #include "cpu/inorder/resource_pool.hh"
-#include "cpu/inorder/resources/resource_list.hh"
 #include "cpu/inorder/thread_context.hh"
 #include "cpu/inorder/thread_state.hh"
+#include "cpu/activity.hh"
+#include "cpu/base.hh"
+#include "cpu/exetrace.hh"
 #include "cpu/simple_thread.hh"
 #include "cpu/thread_context.hh"
 #include "mem/translating_port.hh"

diff --git a/src/cpu/inorder/cpu.hh b/src/cpu/inorder/cpu.hh
index 403c931b24e5fd47ff09f15a22b90b1b4a2d87fa..af2fa5ced8c13fdc690f490cc520d78cf4a8b43b 100644 (file)
--- a/src/cpu/inorder/cpu.hh
+++ b/src/cpu/inorder/cpu.hh
@@ -39,23 +39,23 @@
 #include <vector>
 
 #include "arch/isa_traits.hh"
-#include "arch/types.hh"
 #include "arch/registers.hh"
+#include "arch/types.hh"
 #include "base/statistics.hh"
-#include "cpu/timebuf.hh"
 #include "base/types.hh"
 #include "config/full_system.hh"
 #include "config/the_isa.hh"
-#include "cpu/activity.hh"
-#include "cpu/base.hh"
-#include "cpu/simple_thread.hh"
 #include "cpu/inorder/inorder_dyn_inst.hh"
-#include "cpu/inorder/pipeline_traits.hh"
 #include "cpu/inorder/pipeline_stage.hh"
-#include "cpu/inorder/thread_state.hh"
+#include "cpu/inorder/pipeline_traits.hh"
 #include "cpu/inorder/reg_dep_map.hh"
+#include "cpu/inorder/thread_state.hh"
 #include "cpu/o3/dep_graph.hh"
 #include "cpu/o3/rename_map.hh"
+#include "cpu/activity.hh"
+#include "cpu/base.hh"
+#include "cpu/simple_thread.hh"
+#include "cpu/timebuf.hh"
 #include "mem/packet.hh"
 #include "mem/port.hh"
 #include "mem/request.hh"

diff --git a/src/cpu/inorder/first_stage.cc b/src/cpu/inorder/first_stage.cc
index b656ca1c7563e45123fd462fe02714c17a702c1a..bf57681a733ae92190f58efa97296e6c5d96474d 100644 (file)
--- a/src/cpu/inorder/first_stage.cc
+++ b/src/cpu/inorder/first_stage.cc
@@ -30,10 +30,10 @@
  */
 
 #include "base/str.hh"
-#include "cpu/inorder/first_stage.hh"
 #include "cpu/inorder/resources/resource_list.hh"
-#include "cpu/inorder/resource_pool.hh"
 #include "cpu/inorder/cpu.hh"
+#include "cpu/inorder/first_stage.hh"
+#include "cpu/inorder/resource_pool.hh"
 #include "params/InOrderTrace.hh"
 
 using namespace std;

diff --git a/src/cpu/inorder/first_stage.hh b/src/cpu/inorder/first_stage.hh
index 26151075c09fc1e8149bd9b961f37d86116ab16a..5e8aecfea3f663e072c9c029c44123c233cf0938 100644 (file)
--- a/src/cpu/inorder/first_stage.hh
+++ b/src/cpu/inorder/first_stage.hh
@@ -36,12 +36,12 @@
 #include <vector>
 
 #include "base/statistics.hh"
-#include "cpu/timebuf.hh"
-#include "cpu/inorder/inorder_dyn_inst.hh"
 #include "cpu/inorder/comm.hh"
+#include "cpu/inorder/inorder_dyn_inst.hh"
 #include "cpu/inorder/params.hh"
-#include "cpu/inorder/pipeline_traits.hh"
 #include "cpu/inorder/pipeline_stage.hh"
+#include "cpu/inorder/pipeline_traits.hh"
+#include "cpu/timebuf.hh"
 
 class InOrderCPU;
 

diff --git a/src/cpu/inorder/inorder_cpu_builder.cc b/src/cpu/inorder/inorder_cpu_builder.cc
index a19137dd8be2422734a69384ec077628a1b5cc44..99729577e4d1c191d241d057e41d1882db2b9f52 100644 (file)
--- a/src/cpu/inorder/inorder_cpu_builder.cc
+++ b/src/cpu/inorder/inorder_cpu_builder.cc
@@ -31,12 +31,12 @@
 
 #include <string>
 
-#include "cpu/base.hh"
-#include "cpu/inst_seq.hh"
-#include "cpu/static_inst.hh"
 #include "cpu/inorder/cpu.hh"
 #include "cpu/inorder/inorder_dyn_inst.hh"
 #include "cpu/inorder/pipeline_traits.hh"
+#include "cpu/base.hh"
+#include "cpu/inst_seq.hh"
+#include "cpu/static_inst.hh"
 #include "params/InOrderCPU.hh"
 
 InOrderCPU *

diff --git a/src/cpu/inorder/inorder_dyn_inst.cc b/src/cpu/inorder/inorder_dyn_inst.cc
index ebd7b7cbb4407e9fc3dd4f5d878c5c46fff25c1a..90134f533b9d281a87376ab828a40ad7cfff3654 100644 (file)
--- a/src/cpu/inorder/inorder_dyn_inst.cc
+++ b/src/cpu/inorder/inorder_dyn_inst.cc
@@ -31,16 +31,16 @@
 
 #include <iostream>
 #include <set>
-#include <string>
 #include <sstream>
+#include <string>
 
 #include "arch/faults.hh"
 #include "base/cprintf.hh"
 #include "base/trace.hh"
 #include "config/the_isa.hh"
-#include "cpu/exetrace.hh"
 #include "cpu/inorder/cpu.hh"
 #include "cpu/inorder/inorder_dyn_inst.hh"
+#include "cpu/exetrace.hh"
 #include "mem/request.hh"
 
 using namespace std;

diff --git a/src/cpu/inorder/inorder_dyn_inst.hh b/src/cpu/inorder/inorder_dyn_inst.hh
index 830244ae8cc81f7a86aaf326d4d1836ee586f2a5..1fbc476e884acc007e0eed3c0eaf2c61e01600e5 100644 (file)
--- a/src/cpu/inorder/inorder_dyn_inst.hh
+++ b/src/cpu/inorder/inorder_dyn_inst.hh
@@ -47,12 +47,12 @@
 #include "base/types.hh"
 #include "config/full_system.hh"
 #include "config/the_isa.hh"
-#include "cpu/exetrace.hh"
 #include "cpu/inorder/inorder_trace.hh"
 #include "cpu/inorder/pipeline_traits.hh"
 #include "cpu/inorder/resource.hh"
 #include "cpu/inorder/resource_sked.hh"
 #include "cpu/inorder/thread_state.hh"
+#include "cpu/exetrace.hh"
 #include "cpu/inst_seq.hh"
 #include "cpu/op_class.hh"
 #include "cpu/static_inst.hh"

diff --git a/src/cpu/inorder/inorder_trace.cc b/src/cpu/inorder/inorder_trace.cc
index 75f6be63de422b8d4ab8c1a03246794af2619380..8d40451bd704ba788e4272e89ec9e1927cf19af6 100644 (file)
--- a/src/cpu/inorder/inorder_trace.cc
+++ b/src/cpu/inorder/inorder_trace.cc
@@ -32,10 +32,10 @@
 #include <iomanip>
 
 #include "config/the_isa.hh"
-#include "cpu/exetrace.hh"
 #include "cpu/inorder/inorder_trace.hh"
-#include "cpu/static_inst.hh"
 #include "cpu/inorder/pipeline_traits.hh"
+#include "cpu/exetrace.hh"
+#include "cpu/static_inst.hh"
 #include "cpu/thread_context.hh"
 #include "params/InOrderTrace.hh"
 

diff --git a/src/cpu/inorder/pipeline_stage.cc b/src/cpu/inorder/pipeline_stage.cc
index b267ac00e4b431263b556dd47f10aef500c0920d..b9e21e20fc650404c95b6bd6287a887336a25e5a 100644 (file)
--- a/src/cpu/inorder/pipeline_stage.cc
+++ b/src/cpu/inorder/pipeline_stage.cc
@@ -31,9 +31,9 @@
 
 #include "base/str.hh"
 #include "config/the_isa.hh"
+#include "cpu/inorder/cpu.hh"
 #include "cpu/inorder/pipeline_stage.hh"
 #include "cpu/inorder/resource_pool.hh"
-#include "cpu/inorder/cpu.hh"
 
 using namespace std;
 using namespace ThePipeline;

diff --git a/src/cpu/inorder/pipeline_stage.hh b/src/cpu/inorder/pipeline_stage.hh
index ec70fefc5daf3c0dba3169f471b704041f7b6e78..d0d9112c0deb3fdda21194c4e3056a1a73224dad 100644 (file)
--- a/src/cpu/inorder/pipeline_stage.hh
+++ b/src/cpu/inorder/pipeline_stage.hh
@@ -36,11 +36,11 @@
 #include <vector>
 
 #include "base/statistics.hh"
-#include "cpu/timebuf.hh"
-#include "cpu/inorder/inorder_dyn_inst.hh"
 #include "cpu/inorder/comm.hh"
-#include "params/InOrderCPU.hh"
+#include "cpu/inorder/inorder_dyn_inst.hh"
 #include "cpu/inorder/pipeline_traits.hh"
+#include "cpu/timebuf.hh"
+#include "params/InOrderCPU.hh"
 
 class InOrderCPU;
 

diff --git a/src/cpu/inorder/pipeline_traits.5stage.cc b/src/cpu/inorder/pipeline_traits.5stage.cc
index 50c30af1e3380acba7d2e7efaff57e29897f7614..f15a3cb119c9398871cfb6c5c93cc7f61c8a75f0 100644 (file)
--- a/src/cpu/inorder/pipeline_traits.5stage.cc
+++ b/src/cpu/inorder/pipeline_traits.5stage.cc
@@ -29,9 +29,9 @@
  *
  */
 
-#include "cpu/inorder/pipeline_traits.hh"
-#include "cpu/inorder/inorder_dyn_inst.hh"
 #include "cpu/inorder/resources/resource_list.hh"
+#include "cpu/inorder/inorder_dyn_inst.hh"
+#include "cpu/inorder/pipeline_traits.hh"
 
 using namespace std;
 

diff --git a/src/cpu/inorder/pipeline_traits.5stage.hh b/src/cpu/inorder/pipeline_traits.5stage.hh
index aea6eff37ca2de7cdf6721d0c0979153083946a0..5e5ef6efd491789a5eb0993bf2a85b86081c80cb 100644 (file)
--- a/src/cpu/inorder/pipeline_traits.5stage.hh
+++ b/src/cpu/inorder/pipeline_traits.5stage.hh
@@ -39,7 +39,6 @@
 #include "arch/isa_traits.hh"
 #include "cpu/inorder/params.hh"
 
-
 class InOrderDynInst;
 
 /* This Namespace contains constants, typedefs, functions and

diff --git a/src/cpu/inorder/pipeline_traits.9stage.cc b/src/cpu/inorder/pipeline_traits.9stage.cc
index d686bb3bc50ab3a189ed77b63426b2f70cd201fa..e8ff3acd41800d3e97f8fa9fbcc3fbf3f30817b4 100644 (file)
--- a/src/cpu/inorder/pipeline_traits.9stage.cc
+++ b/src/cpu/inorder/pipeline_traits.9stage.cc
@@ -29,9 +29,9 @@
  *
  */
 
-#include "cpu/inorder/pipeline_traits.hh"
-#include "cpu/inorder/inorder_dyn_inst.hh"
 #include "cpu/inorder/resources/resource_list.hh"
+#include "cpu/inorder/inorder_dyn_inst.hh"
+#include "cpu/inorder/pipeline_traits.hh"
 
 using namespace std;
 

diff --git a/src/cpu/inorder/pipeline_traits.9stage.hh b/src/cpu/inorder/pipeline_traits.9stage.hh
index 91e537366cc93d74a0ba416264a77ebda7f1bcbe..d4125baea2ee74bc3366ca237e314ca025781d06 100644 (file)
--- a/src/cpu/inorder/pipeline_traits.9stage.hh
+++ b/src/cpu/inorder/pipeline_traits.9stage.hh
@@ -33,14 +33,13 @@
 #define __CPU_INORDER_PIPELINE_IMPL_HH__
 
 #include <list>
+#include <map>
 #include <queue>
 #include <vector>
-#include <map>
 
 #include "arch/isa_traits.hh"
 #include "cpu/inorder/params.hh"
 
-
 class InOrderDynInst;
 
 /* This Namespace contains constants, typedefs, functions and

diff --git a/src/cpu/inorder/pipeline_traits.9stage.smt2.cc b/src/cpu/inorder/pipeline_traits.9stage.smt2.cc
index 9d2ed8e61c525da1b0c0681a499265f2629f330f..68c1d0eab87680bf5e9412710ce247a68e23293b 100644 (file)
--- a/src/cpu/inorder/pipeline_traits.9stage.smt2.cc
+++ b/src/cpu/inorder/pipeline_traits.9stage.smt2.cc
@@ -29,9 +29,9 @@
  *
  */
 
-#include "cpu/inorder/pipeline_traits.hh"
-#include "cpu/inorder/inorder_dyn_inst.hh"
 #include "cpu/inorder/resources/resource_list.hh"
+#include "cpu/inorder/inorder_dyn_inst.hh"
+#include "cpu/inorder/pipeline_traits.hh"
 
 using namespace std;
 

diff --git a/src/cpu/inorder/pipeline_traits.9stage.smt2.hh b/src/cpu/inorder/pipeline_traits.9stage.smt2.hh
index 22da4ea0f4ae77a9db0edb624c449141f54907f0..f620289c3e9cd79a857f32346c2149ab56040a2a 100644 (file)
--- a/src/cpu/inorder/pipeline_traits.9stage.smt2.hh
+++ b/src/cpu/inorder/pipeline_traits.9stage.smt2.hh
@@ -33,14 +33,13 @@
 #define __CPU_INORDER_PIPELINE_IMPL_HH__
 
 #include <list>
+#include <map>
 #include <queue>
 #include <vector>
-#include <map>
 
 #include "arch/isa_traits.hh"
 #include "cpu/inorder/params.hh"
 
-
 class InOrderDynInst;
 
 /* This Namespace contains constants, typedefs, functions and

diff --git a/src/cpu/inorder/pipeline_traits.hh b/src/cpu/inorder/pipeline_traits.hh
index 573c0200abbd627beff32e6dcddbbd50fbb4efe6..dd12a8f1dc6456b1fa72e27851095276309ea33a 100644 (file)
--- a/src/cpu/inorder/pipeline_traits.hh
+++ b/src/cpu/inorder/pipeline_traits.hh
@@ -38,7 +38,6 @@
 
 #include "arch/isa_traits.hh"
 #include "cpu/base.hh"
-
 #include "params/InOrderCPU.hh"
 
 class InOrderDynInst;

diff --git a/src/cpu/inorder/reg_dep_map.cc b/src/cpu/inorder/reg_dep_map.cc
index 48820b50e532252526495ab1501ef07b877691cb..8eb7a311173475d079823eb7e0adb69edd23309a 100644 (file)
--- a/src/cpu/inorder/reg_dep_map.cc
+++ b/src/cpu/inorder/reg_dep_map.cc
@@ -31,10 +31,10 @@
 
 #include "arch/isa_traits.hh"
 #include "config/the_isa.hh"
+#include "cpu/inorder/cpu.hh"
+#include "cpu/inorder/inorder_dyn_inst.hh"
 #include "cpu/inorder/pipeline_traits.hh"
 #include "cpu/inorder/reg_dep_map.hh"
-#include "cpu/inorder/inorder_dyn_inst.hh"
-#include "cpu/inorder/cpu.hh"
 
 using namespace std;
 using namespace TheISA;

diff --git a/src/cpu/inorder/resource.cc b/src/cpu/inorder/resource.cc
index 24211532ef93453f362e3e8337b6a1f49ce228b5..b72dbd14fcdb9bcb7682caec2fd08ece16b90464 100644 (file)
--- a/src/cpu/inorder/resource.cc
+++ b/src/cpu/inorder/resource.cc
@@ -29,12 +29,12 @@
  *
  */
 
-#include <vector>
 #include <list>
+#include <vector>
 
 #include "base/str.hh"
-#include "cpu/inorder/resource.hh"
 #include "cpu/inorder/cpu.hh"
+#include "cpu/inorder/resource.hh"
 using namespace std;
 
 Resource::Resource(string res_name, int res_id, int res_width,

diff --git a/src/cpu/inorder/resource.hh b/src/cpu/inorder/resource.hh
index 7899a215fe4fb05d1fb0f9d343b873c21662cbd2..0f2cde7d1c0bc6f190ed275e5b1e11297d1bac4f 100644 (file)
--- a/src/cpu/inorder/resource.hh
+++ b/src/cpu/inorder/resource.hh
@@ -32,14 +32,14 @@
 #ifndef __CPU_INORDER_RESOURCE_HH__
 #define __CPU_INORDER_RESOURCE_HH__
 
-#include <vector>
 #include <list>
 #include <string>
+#include <vector>
 
 #include "base/types.hh"
-#include "cpu/inst_seq.hh"
 #include "cpu/inorder/inorder_dyn_inst.hh"
 #include "cpu/inorder/pipeline_traits.hh"
+#include "cpu/inst_seq.hh"
 #include "sim/eventq.hh"
 #include "sim/sim_object.hh"
 

diff --git a/src/cpu/inorder/resource_pool.9stage.cc b/src/cpu/inorder/resource_pool.9stage.cc
index 746d3f33bffea67827d8e6cad75ed9e39d40621c..93b0ac4e4b1aa617ac3cf3d0e3b6d726c2a6b7fa 100644 (file)
--- a/src/cpu/inorder/resource_pool.9stage.cc
+++ b/src/cpu/inorder/resource_pool.9stage.cc
@@ -29,11 +29,11 @@
  *
  */
 
-#include "cpu/inorder/resource_pool.hh"
-#include "cpu/inorder/resources/resource_list.hh"
-
-#include <vector>
 #include <list>
+#include <vector>
+
+#include "cpu/inorder/resources/resource_list.hh"
+#include "cpu/inorder/resource_pool.hh"
 
 using namespace std;
 using namespace ThePipeline;

diff --git a/src/cpu/inorder/resource_pool.cc b/src/cpu/inorder/resource_pool.cc
index 4e2f930ab5901833bad4cd9100c527938e4cec1b..a9eb742f4ebbebe8ef5d1e6f51dd0eedd9477f75 100644 (file)
--- a/src/cpu/inorder/resource_pool.cc
+++ b/src/cpu/inorder/resource_pool.cc
@@ -29,11 +29,11 @@
  *
  */
 
-#include "cpu/inorder/resource_pool.hh"
-#include "cpu/inorder/resources/resource_list.hh"
-
-#include <vector>
 #include <list>
+#include <vector>
+
+#include "cpu/inorder/resources/resource_list.hh"
+#include "cpu/inorder/resource_pool.hh"
 
 using namespace std;
 using namespace ThePipeline;

diff --git a/src/cpu/inorder/resource_pool.hh b/src/cpu/inorder/resource_pool.hh
index fde38b4e9a8f6d1415cafdb83b67e7a57fd8d486..9d94396654e8c59317ee5f5b57b65f21c015dd18 100644 (file)
--- a/src/cpu/inorder/resource_pool.hh
+++ b/src/cpu/inorder/resource_pool.hh
@@ -32,17 +32,17 @@
 #ifndef __CPU_INORDER_RESOURCE_POOL_HH__
 #define __CPU_INORDER_RESOURCE_POOL_HH__
 
-#include <vector>
 #include <list>
 #include <string>
+#include <vector>
 
-#include "cpu/inst_seq.hh"
+#include "cpu/inorder/cpu.hh"
 #include "cpu/inorder/inorder_dyn_inst.hh"
-#include "cpu/inorder/resource.hh"
-#include "cpu/inorder/pipeline_traits.hh"
 #include "cpu/inorder/params.hh"
+#include "cpu/inorder/pipeline_traits.hh"
+#include "cpu/inorder/resource.hh"
+#include "cpu/inst_seq.hh"
 #include "params/InOrderCPU.hh"
-#include "cpu/inorder/cpu.hh"
 #include "sim/eventq.hh"
 #include "sim/sim_object.hh"
 

diff --git a/src/cpu/inorder/resource_sked.cc b/src/cpu/inorder/resource_sked.cc
index 4cf791228f491b3e087d84405210f476abdaf3d7..4435008706b9c2bfbe7c6688d51d4bfe9be1bf48 100644 (file)
--- a/src/cpu/inorder/resource_sked.cc
+++ b/src/cpu/inorder/resource_sked.cc
@@ -29,12 +29,12 @@
  *
  */
 
-#include "cpu/inorder/resource_sked.hh"
-#include "cpu/inorder/pipeline_traits.hh"
-
-#include <vector>
-#include <list>
 #include <cstdio>
+#include <list>
+#include <vector>
+
+#include "cpu/inorder/pipeline_traits.hh"
+#include "cpu/inorder/resource_sked.hh"
 
 using namespace std;
 using namespace ThePipeline;

diff --git a/src/cpu/inorder/resource_sked.hh b/src/cpu/inorder/resource_sked.hh
index bd002e161ee8dcd934677453f509d7fe53f8a9ff..6338e8e9bbfeb1e88f90b15e2326bc87e06e8258 100644 (file)
--- a/src/cpu/inorder/resource_sked.hh
+++ b/src/cpu/inorder/resource_sked.hh
@@ -32,9 +32,9 @@
 #ifndef __CPU_INORDER_RESOURCE_SKED_HH__
 #define __CPU_INORDER_RESOURCE_SKED_HH__
 
-#include <vector>
-#include <list>
 #include <cstdlib>
+#include <list>
+#include <vector>
 
 /** ScheduleEntry class represents a single function that an instruction
     wants to do at any pipeline stage. For example, if an instruction

diff --git a/src/cpu/inorder/resources/agen_unit.hh b/src/cpu/inorder/resources/agen_unit.hh
index 7c9c5fd89c88f3754fe29d95ea53b9a3f5da2906..f208ec6803e429d16c6e07855533eb6736fcdd07 100644 (file)
--- a/src/cpu/inorder/resources/agen_unit.hh
+++ b/src/cpu/inorder/resources/agen_unit.hh
@@ -32,15 +32,15 @@
 #ifndef __CPU_INORDER_AGEN_UNIT_HH__
 #define __CPU_INORDER_AGEN_UNIT_HH__
 
-#include <vector>
 #include <list>
 #include <string>
+#include <vector>
 
-#include "cpu/inorder/resource.hh"
-#include "cpu/inorder/inorder_dyn_inst.hh"
-#include "cpu/inorder/pipeline_traits.hh"
 #include "cpu/inorder/cpu.hh"
+#include "cpu/inorder/inorder_dyn_inst.hh"
 #include "cpu/inorder/params.hh"
+#include "cpu/inorder/pipeline_traits.hh"
+#include "cpu/inorder/resource.hh"
 
 class AGENUnit : public Resource {
   public:

diff --git a/src/cpu/inorder/resources/bpred_unit.hh b/src/cpu/inorder/resources/bpred_unit.hh
index 3b1c0f4efcc0758bc1bbf75fbb25f5d6cbb2d3df..33ca4a0c695bc857346e894bcbd2878fb8791d00 100644 (file)
--- a/src/cpu/inorder/resources/bpred_unit.hh
+++ b/src/cpu/inorder/resources/bpred_unit.hh
@@ -36,7 +36,6 @@
 
 #include "arch/isa_traits.hh"
 #include "base/statistics.hh"
-#include "cpu/inst_seq.hh"
 #include "cpu/inorder/inorder_dyn_inst.hh"
 #include "cpu/inorder/pipeline_traits.hh"
 #include "cpu/inorder/resource.hh"
@@ -44,6 +43,7 @@
 #include "cpu/pred/btb.hh"
 #include "cpu/pred/ras.hh"
 #include "cpu/pred/tournament.hh"
+#include "cpu/inst_seq.hh"
 #include "params/InOrderCPU.hh"
 
 /**

diff --git a/src/cpu/inorder/resources/branch_predictor.hh b/src/cpu/inorder/resources/branch_predictor.hh
index 00915fd0dead424ef328bc93b203e06e43ff1673..72b21680662dffe47916fe6494faabaea08cc828 100644 (file)
--- a/src/cpu/inorder/resources/branch_predictor.hh
+++ b/src/cpu/inorder/resources/branch_predictor.hh
@@ -32,15 +32,15 @@
 #ifndef __CPU_INORDER_BRANCH_PREDICTOR_HH__
 #define __CPU_INORDER_BRANCH_PREDICTOR_HH__
 
-#include <vector>
 #include <list>
 #include <string>
+#include <vector>
 
-#include "cpu/inorder/resource.hh"
-#include "cpu/inorder/inorder_dyn_inst.hh"
-#include "cpu/inorder/pipeline_traits.hh"
 #include "cpu/inorder/resources/bpred_unit.hh"
 #include "cpu/inorder/cpu.hh"
+#include "cpu/inorder/inorder_dyn_inst.hh"
+#include "cpu/inorder/pipeline_traits.hh"
+#include "cpu/inorder/resource.hh"
 
 class BranchPredictor : public Resource {
   public:

diff --git a/src/cpu/inorder/resources/cache_unit.cc b/src/cpu/inorder/resources/cache_unit.cc
index e98b27d62d0d6694d004c59e8b3c4bdf5c9452f8..ce4c538dae535734d14a28e241b3f2174e62bed7 100644 (file)
--- a/src/cpu/inorder/resources/cache_unit.cc
+++ b/src/cpu/inorder/resources/cache_unit.cc
@@ -29,17 +29,17 @@
  *
  */
 
-#include <vector>
 #include <list>
+#include <vector>
 
 #include "arch/isa_traits.hh"
 #include "arch/locked_mem.hh"
-#include "arch/utility.hh"
 #include "arch/predecoder.hh"
+#include "arch/utility.hh"
 #include "config/the_isa.hh"
 #include "cpu/inorder/resources/cache_unit.hh"
-#include "cpu/inorder/pipeline_traits.hh"
 #include "cpu/inorder/cpu.hh"
+#include "cpu/inorder/pipeline_traits.hh"
 #include "cpu/inorder/resource_pool.hh"
 #include "mem/request.hh"
 

diff --git a/src/cpu/inorder/resources/cache_unit.hh b/src/cpu/inorder/resources/cache_unit.hh
index 1aab099e951a0af873ff3818ed9bd4e0ad0fe524..c4a5dc0bdc39b1bd7f4ed99ec12496a324331ea8 100644 (file)
--- a/src/cpu/inorder/resources/cache_unit.hh
+++ b/src/cpu/inorder/resources/cache_unit.hh
@@ -32,9 +32,9 @@
 #ifndef __CPU_INORDER_CACHE_UNIT_HH__
 #define __CPU_INORDER_CACHE_UNIT_HH__
 
-#include <vector>
 #include <list>
 #include <string>
+#include <vector>
 
 #include "arch/predecoder.hh"
 #include "arch/tlb.hh"

diff --git a/src/cpu/inorder/resources/decode_unit.hh b/src/cpu/inorder/resources/decode_unit.hh
index 1c4dc05234839fc04df95ba2e5901f9eb52eb7b0..3742af3e250b8ae56a13044666faf6ea5b1e7809 100644 (file)
--- a/src/cpu/inorder/resources/decode_unit.hh
+++ b/src/cpu/inorder/resources/decode_unit.hh
@@ -32,15 +32,15 @@
 #ifndef __CPU_INORDER_DECODE_UNIT_HH__
 #define __CPU_INORDER_DECODE_UNIT_HH__
 
-#include <vector>
 #include <list>
 #include <string>
+#include <vector>
 
-#include "cpu/inorder/resource.hh"
+#include "cpu/inorder/cpu.hh"
 #include "cpu/inorder/inorder_dyn_inst.hh"
 #include "cpu/inorder/pipeline_traits.hh"
-#include "cpu/inorder/cpu.hh"
 #include "cpu/inorder/reg_dep_map.hh"
+#include "cpu/inorder/resource.hh"
 
 class DecodeUnit : public Resource {
   public:

diff --git a/src/cpu/inorder/resources/execution_unit.cc b/src/cpu/inorder/resources/execution_unit.cc
index 311add9f822a5ad8b06331deb21873286ba81b53..2ec3407499d5f5072a78b0cafbfe817e41527d10 100644 (file)
--- a/src/cpu/inorder/resources/execution_unit.cc
+++ b/src/cpu/inorder/resources/execution_unit.cc
@@ -29,11 +29,12 @@
  *
  */
 
-#include <vector>
 #include <list>
+#include <vector>
+
 #include "cpu/inorder/resources/execution_unit.hh"
-#include "cpu/inorder/resource_pool.hh"
 #include "cpu/inorder/cpu.hh"
+#include "cpu/inorder/resource_pool.hh"
 
 using namespace std;
 using namespace ThePipeline;

diff --git a/src/cpu/inorder/resources/execution_unit.hh b/src/cpu/inorder/resources/execution_unit.hh
index b03a6655e56fc7321b4022b8f26c4fe8d16c3748..ed645ec3bf75090b8416b49cf3c3b2f474b7b536 100644 (file)
--- a/src/cpu/inorder/resources/execution_unit.hh
+++ b/src/cpu/inorder/resources/execution_unit.hh
@@ -32,14 +32,14 @@
 #ifndef __CPU_INORDER_EXECUTION_UNIT_HH__
 #define __CPU_INORDER_EXECUTION_UNIT_HH__
 
-#include <vector>
 #include <list>
 #include <string>
+#include <vector>
 
-#include "cpu/func_unit.hh"
 #include "cpu/inorder/first_stage.hh"
-#include "cpu/inorder/resource.hh"
 #include "cpu/inorder/inorder_dyn_inst.hh"
+#include "cpu/inorder/resource.hh"
+#include "cpu/func_unit.hh"
 
 class ExecutionUnit : public Resource {
   public:

diff --git a/src/cpu/inorder/resources/fetch_seq_unit.hh b/src/cpu/inorder/resources/fetch_seq_unit.hh
index a258dc0e55570e5b6bbc1c9ecee7e5a5e18346f3..be3c59a131db35d451a374579e8731a63e87fd65 100644 (file)
--- a/src/cpu/inorder/resources/fetch_seq_unit.hh
+++ b/src/cpu/inorder/resources/fetch_seq_unit.hh
@@ -32,15 +32,15 @@
 #ifndef __CPU_INORDER_FETCH_SEQ_UNIT_HH__
 #define __CPU_INORDER_FETCH_SEQ_UNIT_HH__
 
-#include <vector>
 #include <list>
 #include <string>
+#include <vector>
 
 #include "config/the_isa.hh"
-#include "cpu/inorder/resource.hh"
+#include "cpu/inorder/cpu.hh"
 #include "cpu/inorder/inorder_dyn_inst.hh"
 #include "cpu/inorder/pipeline_traits.hh"
-#include "cpu/inorder/cpu.hh"
+#include "cpu/inorder/resource.hh"
 
 class FetchSeqUnit : public Resource {
   public:

diff --git a/src/cpu/inorder/resources/fetch_unit.cc b/src/cpu/inorder/resources/fetch_unit.cc
index d6038415e1f4d6770242ae4fb4dbd35d2badb704..899fa8c086773af9774009b5b0dd00781f7e2cb5 100644 (file)
--- a/src/cpu/inorder/resources/fetch_unit.cc
+++ b/src/cpu/inorder/resources/fetch_unit.cc
@@ -29,18 +29,18 @@
  *
  */
 
-#include <vector>
 #include <list>
+#include <vector>
 
 #include "arch/isa_traits.hh"
 #include "arch/locked_mem.hh"
-#include "arch/utility.hh"
 #include "arch/predecoder.hh"
+#include "arch/utility.hh"
 #include "config/the_isa.hh"
 #include "cpu/inorder/resources/cache_unit.hh"
 #include "cpu/inorder/resources/fetch_unit.hh"
-#include "cpu/inorder/pipeline_traits.hh"
 #include "cpu/inorder/cpu.hh"
+#include "cpu/inorder/pipeline_traits.hh"
 #include "cpu/inorder/resource_pool.hh"
 #include "mem/request.hh"
 

diff --git a/src/cpu/inorder/resources/fetch_unit.hh b/src/cpu/inorder/resources/fetch_unit.hh
index fa133b9eb194a1590b2691ee9112acd7b6e94568..3075e726dfcd999fa591d21e6f0d101e66e83356 100644 (file)
--- a/src/cpu/inorder/resources/fetch_unit.hh
+++ b/src/cpu/inorder/resources/fetch_unit.hh
@@ -32,17 +32,17 @@
 #ifndef __CPU_INORDER_FETCH_UNIT_HH__
 #define __CPU_INORDER_FETCH_UNIT_HH__
 
-#include <vector>
 #include <list>
 #include <string>
+#include <vector>
 
 #include "arch/predecoder.hh"
 #include "arch/tlb.hh"
 #include "config/the_isa.hh"
+#include "cpu/inorder/resources/cache_unit.hh"
 #include "cpu/inorder/inorder_dyn_inst.hh"
 #include "cpu/inorder/pipeline_traits.hh"
 #include "cpu/inorder/resource.hh"
-#include "cpu/inorder/resources/cache_unit.hh"
 #include "mem/packet.hh"
 #include "mem/packet_access.hh"
 #include "mem/port.hh"

diff --git a/src/cpu/inorder/resources/graduation_unit.hh b/src/cpu/inorder/resources/graduation_unit.hh
index 59631bfcbb8b4f96b682d134190f02f7dcd016ee..043e375e76260731094b6e521e074dc4eef56b37 100644 (file)
--- a/src/cpu/inorder/resources/graduation_unit.hh
+++ b/src/cpu/inorder/resources/graduation_unit.hh
@@ -32,14 +32,14 @@
 #ifndef __CPU_INORDER_GRAD_UNIT_HH__
 #define __CPU_INORDER_GRAD_UNIT_HH__
 
-#include <vector>
 #include <list>
 #include <string>
+#include <vector>
 
-#include "cpu/inorder/resource.hh"
+#include "cpu/inorder/cpu.hh"
 #include "cpu/inorder/inorder_dyn_inst.hh"
 #include "cpu/inorder/pipeline_traits.hh"
-#include "cpu/inorder/cpu.hh"
+#include "cpu/inorder/resource.hh"
 
 class GraduationUnit : public Resource {
   public:

diff --git a/src/cpu/inorder/resources/inst_buffer.cc b/src/cpu/inorder/resources/inst_buffer.cc
index 46f5cce7299bb3df7655a750fa2a8aff180acc6e..e0405879b7402259cc8e4a1530562456ca0f0b19 100644 (file)
--- a/src/cpu/inorder/resources/inst_buffer.cc
+++ b/src/cpu/inorder/resources/inst_buffer.cc
@@ -29,14 +29,14 @@
  *
  */
 
-#include <vector>
 #include <list>
+#include <vector>
 
 #include "arch/isa_traits.hh"
 #include "config/the_isa.hh"
-#include "cpu/inorder/pipeline_traits.hh"
 #include "cpu/inorder/resources/inst_buffer.hh"
 #include "cpu/inorder/cpu.hh"
+#include "cpu/inorder/pipeline_traits.hh"
 
 using namespace std;
 using namespace TheISA;

diff --git a/src/cpu/inorder/resources/inst_buffer.hh b/src/cpu/inorder/resources/inst_buffer.hh
index fcbdc20df7fcaeb84775f5bd4a94a44883d47c78..d0047e013f9bc57cdb57e0b23b3128a00e11792a 100644 (file)
--- a/src/cpu/inorder/resources/inst_buffer.hh
+++ b/src/cpu/inorder/resources/inst_buffer.hh
@@ -32,14 +32,14 @@
 #ifndef __CPU_INORDER_INST_BUFF_UNIT_HH__
 #define __CPU_INORDER_INST_BUFF_UNIT_HH__
 
-#include <vector>
 #include <list>
 #include <string>
+#include <vector>
 
-#include "cpu/inorder/resource.hh"
+#include "cpu/inorder/cpu.hh"
 #include "cpu/inorder/inorder_dyn_inst.hh"
 #include "cpu/inorder/pipeline_traits.hh"
-#include "cpu/inorder/cpu.hh"
+#include "cpu/inorder/resource.hh"
 
 class InstBuffer : public Resource {
   public:

diff --git a/src/cpu/inorder/resources/mem_dep_unit.hh b/src/cpu/inorder/resources/mem_dep_unit.hh
index 018593eaf0156fc248509d5878e255457a2508bb..387bee0b90f5b92b31430a5b9b9312b80958884f 100644 (file)
--- a/src/cpu/inorder/resources/mem_dep_unit.hh
+++ b/src/cpu/inorder/resources/mem_dep_unit.hh
@@ -32,14 +32,14 @@
 #ifndef __CPU_INORDER_MEM_DEP_UNIT_HH__
 #define __CPU_INORDER_MEM_DEP_UNIT_HH__
 
-#include <vector>
 #include <list>
 #include <string>
+#include <vector>
 
-#include "cpu/inorder/resource.hh"
+#include "cpu/inorder/cpu.hh"
 #include "cpu/inorder/inorder_dyn_inst.hh"
 #include "cpu/inorder/pipeline_traits.hh"
-#include "cpu/inorder/cpu.hh"
+#include "cpu/inorder/resource.hh"
 
 class MemDepUnit : public Resource {
   public:

diff --git a/src/cpu/inorder/resources/mult_div_unit.cc b/src/cpu/inorder/resources/mult_div_unit.cc
index ad8b2b47bc0a3b565df771809f2aee62f0384e96..8fbfc231ee3b50c300043b6c83a8812d90751706 100644 (file)
--- a/src/cpu/inorder/resources/mult_div_unit.cc
+++ b/src/cpu/inorder/resources/mult_div_unit.cc
@@ -29,11 +29,12 @@
  *
  */
 
-#include <vector>
 #include <list>
+#include <vector>
+
 #include "cpu/inorder/resources/mult_div_unit.hh"
-#include "cpu/inorder/resource_pool.hh"
 #include "cpu/inorder/cpu.hh"
+#include "cpu/inorder/resource_pool.hh"
 #include "cpu/op_class.hh"
 
 using namespace std;

diff --git a/src/cpu/inorder/resources/mult_div_unit.hh b/src/cpu/inorder/resources/mult_div_unit.hh
index d243eebea5be7b5522acc18adb854af3aa6de619..753bc64a68ea6e7bb32ddf3061639cb652b34e53 100644 (file)
--- a/src/cpu/inorder/resources/mult_div_unit.hh
+++ b/src/cpu/inorder/resources/mult_div_unit.hh
@@ -32,15 +32,15 @@
 #ifndef __CPU_INORDER_MULT_DIV_UNIT_HH__
 #define __CPU_INORDER_MULT_DIV_UNIT_HH__
 
-#include <vector>
 #include <list>
 #include <string>
+#include <vector>
 
-#include "cpu/func_unit.hh"
-#include "cpu/op_class.hh"
 #include "cpu/inorder/first_stage.hh"
-#include "cpu/inorder/resource.hh"
 #include "cpu/inorder/inorder_dyn_inst.hh"
+#include "cpu/inorder/resource.hh"
+#include "cpu/func_unit.hh"
+#include "cpu/op_class.hh"
 
 class MDUEvent;
 

diff --git a/src/cpu/inorder/resources/resource_list.hh b/src/cpu/inorder/resources/resource_list.hh
index 5568ad4700a65b16fb924f12f5946472c548b62d..ae6b4ecaf95c87fdb4746fc5959668a21798989b 100644 (file)
--- a/src/cpu/inorder/resources/resource_list.hh
+++ b/src/cpu/inorder/resources/resource_list.hh
@@ -32,17 +32,17 @@
 #ifndef CPU_INORDER_RESOURCE_LIST_HH
 #define CPU_INORDER_RESOURCE_LIST_HH
 
+#include "cpu/inorder/resources/agen_unit.hh"
+#include "cpu/inorder/resources/branch_predictor.hh"
 #include "cpu/inorder/resources/cache_unit.hh"
-#include "cpu/inorder/resources/fetch_unit.hh"
-#include "cpu/inorder/resources/execution_unit.hh"
-#include "cpu/inorder/resources/use_def.hh"
-#include "cpu/inorder/resources/inst_buffer.hh"
 #include "cpu/inorder/resources/decode_unit.hh"
-#include "cpu/inorder/resources/graduation_unit.hh"
-#include "cpu/inorder/resources/tlb_unit.hh"
+#include "cpu/inorder/resources/execution_unit.hh"
 #include "cpu/inorder/resources/fetch_seq_unit.hh"
-#include "cpu/inorder/resources/branch_predictor.hh"
-#include "cpu/inorder/resources/agen_unit.hh"
+#include "cpu/inorder/resources/fetch_unit.hh"
+#include "cpu/inorder/resources/graduation_unit.hh"
+#include "cpu/inorder/resources/inst_buffer.hh"
 #include "cpu/inorder/resources/mult_div_unit.hh"
+#include "cpu/inorder/resources/tlb_unit.hh"
+#include "cpu/inorder/resources/use_def.hh"
 
 #endif

diff --git a/src/cpu/inorder/resources/tlb_unit.cc b/src/cpu/inorder/resources/tlb_unit.cc
index 9a0c9fe3297efd0ff80a59ef35f02ac6c3dd6e11..c07f6ae5fe21c743c7195159368ea84773bf198a 100644 (file)
--- a/src/cpu/inorder/resources/tlb_unit.cc
+++ b/src/cpu/inorder/resources/tlb_unit.cc
@@ -29,15 +29,15 @@
  *
  */
 
-#include <vector>
 #include <list>
+#include <vector>
 
 #include "arch/isa_traits.hh"
 #include "config/the_isa.hh"
-#include "cpu/inorder/pipeline_traits.hh"
-#include "cpu/inorder/first_stage.hh"
 #include "cpu/inorder/resources/tlb_unit.hh"
 #include "cpu/inorder/cpu.hh"
+#include "cpu/inorder/first_stage.hh"
+#include "cpu/inorder/pipeline_traits.hh"
 
 using namespace std;
 using namespace TheISA;

diff --git a/src/cpu/inorder/resources/tlb_unit.hh b/src/cpu/inorder/resources/tlb_unit.hh
index 904ac3eba2d49081ca86d5688ae1292dc4b221ca..caccb5a9f8286e85060152f6065472a401c86682 100644 (file)
--- a/src/cpu/inorder/resources/tlb_unit.hh
+++ b/src/cpu/inorder/resources/tlb_unit.hh
@@ -32,15 +32,15 @@
 #ifndef __CPU_INORDER_TLB_UNIT_HH__
 #define __CPU_INORDER_TLB_UNIT_HH__
 
-#include <vector>
 #include <list>
 #include <string>
+#include <vector>
 
 #include "config/the_isa.hh"
 #include "cpu/inorder/resources/inst_buffer.hh"
+#include "cpu/inorder/cpu.hh"
 #include "cpu/inorder/inorder_dyn_inst.hh"
 #include "cpu/inorder/pipeline_traits.hh"
-#include "cpu/inorder/cpu.hh"
 
 class TLBUnit : public Resource
 {

diff --git a/src/cpu/inorder/resources/use_def.cc b/src/cpu/inorder/resources/use_def.cc
index c687024ce012c388dbef5eff6cc08ec40c9628f1..8a00ab7043e86ffc32741f30be6e0fc5b61e2bc0 100644 (file)
--- a/src/cpu/inorder/resources/use_def.cc
+++ b/src/cpu/inorder/resources/use_def.cc
@@ -29,14 +29,14 @@
  *
  */
 
-#include <vector>
 #include <list>
+#include <vector>
 
 #include "arch/isa_traits.hh"
 #include "config/the_isa.hh"
-#include "cpu/inorder/pipeline_traits.hh"
 #include "cpu/inorder/resources/use_def.hh"
 #include "cpu/inorder/cpu.hh"
+#include "cpu/inorder/pipeline_traits.hh"
 
 using namespace std;
 using namespace TheISA;

diff --git a/src/cpu/inorder/resources/use_def.hh b/src/cpu/inorder/resources/use_def.hh
index 21770cec6d89c75a7be911d6813e0d32853a78b7..bd423d01a4fbc64afb3b1c4edd327802a8e9e9f6 100644 (file)
--- a/src/cpu/inorder/resources/use_def.hh
+++ b/src/cpu/inorder/resources/use_def.hh
@@ -32,16 +32,16 @@
 #ifndef __CPU_INORDER_USE_DEF_UNIT_HH__
 #define __CPU_INORDER_USE_DEF_UNIT_HH__
 
-#include <vector>
 #include <list>
 #include <string>
+#include <vector>
 
-#include "cpu/func_unit.hh"
 #include "cpu/inorder/first_stage.hh"
-#include "cpu/inorder/resource.hh"
 #include "cpu/inorder/inorder_dyn_inst.hh"
 #include "cpu/inorder/pipeline_traits.hh"
 #include "cpu/inorder/reg_dep_map.hh"
+#include "cpu/inorder/resource.hh"
+#include "cpu/func_unit.hh"
 
 class UseDefUnit : public Resource {
   public:

diff --git a/src/cpu/inorder/thread_context.cc b/src/cpu/inorder/thread_context.cc
index bbccf626a1417c674f30af0592b3e09cde9e9934..636bcee227bf515d0b90eb073eadad1acc55c42c 100644 (file)
--- a/src/cpu/inorder/thread_context.cc
+++ b/src/cpu/inorder/thread_context.cc
@@ -31,8 +31,8 @@
 
 #include "arch/isa_traits.hh"
 #include "config/the_isa.hh"
-#include "cpu/exetrace.hh"
 #include "cpu/inorder/thread_context.hh"
+#include "cpu/exetrace.hh"
 
 using namespace TheISA;
 

diff --git a/src/cpu/inorder/thread_context.hh b/src/cpu/inorder/thread_context.hh
index 21f1e58358b72813b7ed8da7b5ff7f7c03513c45..d178fd1d5a779e1e41788b0b6211ecd6bb2d0343 100644 (file)
--- a/src/cpu/inorder/thread_context.hh
+++ b/src/cpu/inorder/thread_context.hh
@@ -33,10 +33,10 @@
 #define __CPU_INORDER_THREAD_CONTEXT_HH__
 
 #include "config/the_isa.hh"
+#include "cpu/inorder/cpu.hh"
+#include "cpu/inorder/thread_state.hh"
 #include "cpu/exetrace.hh"
 #include "cpu/thread_context.hh"
-#include "cpu/inorder/thread_state.hh"
-#include "cpu/inorder/cpu.hh"
 
 class TranslatingPort;
 

diff --git a/src/cpu/inorder/thread_state.cc b/src/cpu/inorder/thread_state.cc
index b3a54efb1053962c7fca058dd3fca9ae3c275628..b17f05c7d9ab321a3cfa8680ac31eb5ee78ce553 100644 (file)
--- a/src/cpu/inorder/thread_state.cc
+++ b/src/cpu/inorder/thread_state.cc
@@ -30,9 +30,9 @@
  */
 
 #include "arch/isa_traits.hh"
-#include "cpu/exetrace.hh"
-#include "cpu/inorder/thread_state.hh"
 #include "cpu/inorder/cpu.hh"
+#include "cpu/inorder/thread_state.hh"
+#include "cpu/exetrace.hh"
 
 using namespace TheISA;
 

diff --git a/src/cpu/intr_control.cc b/src/cpu/intr_control.cc
index de7f9245e4d77cfd0ff9b8228f2b6778bf668fed..085dbe9ac1796ef8042f55d26727f7d5ae815ead 100644 (file)
--- a/src/cpu/intr_control.cc
+++ b/src/cpu/intr_control.cc
@@ -34,8 +34,8 @@
 
 #include "base/trace.hh"
 #include "cpu/base.hh"
-#include "cpu/thread_context.hh"
 #include "cpu/intr_control.hh"
+#include "cpu/thread_context.hh"
 #include "sim/sim_object.hh"
 
 using namespace std;

diff --git a/src/cpu/intr_control.hh b/src/cpu/intr_control.hh
index 2a63cf608cbfd476ec95e2a6e25d33b32f8b641c..ee7b3ea7f5c51452c77bff62046517d1468c555d 100644 (file)
--- a/src/cpu/intr_control.hh
+++ b/src/cpu/intr_control.hh
@@ -33,13 +33,13 @@
 #define __INTR_CONTROL_HH__
 
 #include <vector>
+
 #include "base/misc.hh"
 #include "cpu/base.hh"
 #include "params/IntrControl.hh"
 #include "sim/sim_object.hh"
 #include "sim/system.hh"
 
-
 class IntrControl : public SimObject
 {
   public:

diff --git a/src/cpu/nativetrace.hh b/src/cpu/nativetrace.hh
index cc388d6bf18c480f02d122364d89ae3603664449..9869853c4c338acfb4c5aac8d289d83c83441858 100644 (file)
--- a/src/cpu/nativetrace.hh
+++ b/src/cpu/nativetrace.hh
@@ -31,9 +31,10 @@
 #ifndef __CPU_NATIVETRACE_HH__
 #define __CPU_NATIVETRACE_HH__
 
-#include <errno.h>
 #include <unistd.h>
 
+#include <cerrno>
+
 #include "base/socket.hh"
 #include "base/trace.hh"
 #include "base/types.hh"

diff --git a/src/cpu/o3/base_dyn_inst.cc b/src/cpu/o3/base_dyn_inst.cc
index 510109d8a9744ba6ae029d658de02594066089e7..5cf01f230e844d4eb0e03586e18081bbb3b70357 100644 (file)
--- a/src/cpu/o3/base_dyn_inst.cc
+++ b/src/cpu/o3/base_dyn_inst.cc
@@ -28,9 +28,9 @@
  * Authors: Kevin Lim
  */
 
-#include "cpu/base_dyn_inst_impl.hh"
 #include "cpu/o3/cpu.hh"
 #include "cpu/o3/isa_specific.hh"
+#include "cpu/base_dyn_inst_impl.hh"
 
 // Explicit instantiation
 template class BaseDynInst<O3CPUImpl>;

diff --git a/src/cpu/o3/bpred_unit.hh b/src/cpu/o3/bpred_unit.hh
index 58b1147c931b5452bb9714d4544a88bc681f497a..84f2dc8c1487098a684b795e1d4feb8154b94619 100644 (file)
--- a/src/cpu/o3/bpred_unit.hh
+++ b/src/cpu/o3/bpred_unit.hh
@@ -35,11 +35,11 @@
 
 #include "base/statistics.hh"
 #include "base/types.hh"
-#include "cpu/inst_seq.hh"
 #include "cpu/pred/2bit_local.hh"
 #include "cpu/pred/btb.hh"
 #include "cpu/pred/ras.hh"
 #include "cpu/pred/tournament.hh"
+#include "cpu/inst_seq.hh"
 
 class DerivO3CPUParams;
 

diff --git a/src/cpu/o3/bpred_unit_impl.hh b/src/cpu/o3/bpred_unit_impl.hh
index 14d47df9fb7bde6da4792bfa71acb9243b9efc04..44e6f42305216cadd056108c33b0354a5c5b4756 100644 (file)
--- a/src/cpu/o3/bpred_unit_impl.hh
+++ b/src/cpu/o3/bpred_unit_impl.hh
@@ -30,9 +30,9 @@
 
 #include <algorithm>
 
+#include "arch/isa_traits.hh"
 #include "arch/types.hh"
 #include "arch/utility.hh"
-#include "arch/isa_traits.hh"
 #include "base/trace.hh"
 #include "base/traceflags.hh"
 #include "config/the_isa.hh"

diff --git a/src/cpu/o3/checker_builder.cc b/src/cpu/o3/checker_builder.cc
index b9afb3f9fec2a9519617a4f0a847502a0d167c2d..5d0bd2ed28e0c654a11f9634fa0c670ed0141dea 100644 (file)
--- a/src/cpu/o3/checker_builder.cc
+++ b/src/cpu/o3/checker_builder.cc
@@ -31,9 +31,9 @@
 #include <string>
 
 #include "cpu/checker/cpu_impl.hh"
-#include "cpu/inst_seq.hh"
 #include "cpu/o3/alpha/dyn_inst.hh"
 #include "cpu/o3/alpha/impl.hh"
+#include "cpu/inst_seq.hh"
 #include "params/O3Checker.hh"
 #include "sim/process.hh"
 #include "sim/sim_object.hh"

diff --git a/src/cpu/o3/commit.cc b/src/cpu/o3/commit.cc
index 637d59f526ed79338637b4cd6ccea8356e77da23..8e3ec0635f10ed2d3ea3fe6f9b987b0775f96c90 100644 (file)
--- a/src/cpu/o3/commit.cc
+++ b/src/cpu/o3/commit.cc
@@ -28,7 +28,7 @@
  * Authors: Kevin Lim
  */
 
-#include "cpu/o3/isa_specific.hh"
 #include "cpu/o3/commit_impl.hh"
+#include "cpu/o3/isa_specific.hh"
 
 template class DefaultCommit<O3CPUImpl>;

diff --git a/src/cpu/o3/commit.hh b/src/cpu/o3/commit.hh
index ff7b53440485872db50060a9b5b3b29298b9a491..2de381aeb5d76500acdd4340e82ad296d20a79dd 100644 (file)
--- a/src/cpu/o3/commit.hh
+++ b/src/cpu/o3/commit.hh
@@ -45,9 +45,9 @@
 #define __CPU_O3_COMMIT_HH__
 
 #include "base/statistics.hh"
-#include "cpu/timebuf.hh"
 #include "cpu/exetrace.hh"
 #include "cpu/inst_seq.hh"
+#include "cpu/timebuf.hh"
 
 class DerivO3CPUParams;
 

diff --git a/src/cpu/o3/commit_impl.hh b/src/cpu/o3/commit_impl.hh
index e35c1bf2975bb4dd5f1e5abcd12a72318f227726..a48e5f046f0f3b8d1763a87c953dc51b04ed48c4 100644 (file)
--- a/src/cpu/o3/commit_impl.hh
+++ b/src/cpu/o3/commit_impl.hh
@@ -45,15 +45,15 @@
 #include <string>
 
 #include "arch/utility.hh"
-#include "base/cp_annotate.hh"
 #include "base/loader/symtab.hh"
-#include "cpu/timebuf.hh"
+#include "base/cp_annotate.hh"
 #include "config/full_system.hh"
 #include "config/the_isa.hh"
 #include "config/use_checker.hh"
-#include "cpu/exetrace.hh"
 #include "cpu/o3/commit.hh"
 #include "cpu/o3/thread_state.hh"
+#include "cpu/exetrace.hh"
+#include "cpu/timebuf.hh"
 #include "params/DerivO3CPU.hh"
 
 #if USE_CHECKER

diff --git a/src/cpu/o3/cpu.cc b/src/cpu/o3/cpu.cc
index 4088f23995b73de23dc110121345b29d979b93da..565c68f7a0188e2ed3b9107b6327688e806766de 100644 (file)
--- a/src/cpu/o3/cpu.cc
+++ b/src/cpu/o3/cpu.cc
@@ -34,12 +34,12 @@
 #include "config/full_system.hh"
 #include "config/the_isa.hh"
 #include "config/use_checker.hh"
+#include "cpu/o3/cpu.hh"
+#include "cpu/o3/isa_specific.hh"
+#include "cpu/o3/thread_context.hh"
 #include "cpu/activity.hh"
 #include "cpu/simple_thread.hh"
 #include "cpu/thread_context.hh"
-#include "cpu/o3/isa_specific.hh"
-#include "cpu/o3/cpu.hh"
-#include "cpu/o3/thread_context.hh"
 #include "enums/MemoryMode.hh"
 #include "sim/core.hh"
 #include "sim/stat_control.hh"

diff --git a/src/cpu/o3/cpu.hh b/src/cpu/o3/cpu.hh
index 69289996be3db8ce7f360ee97435351cfb60b099..7e9c33717152f3af1f736dc3cb5f962054a18daf 100644 (file)
--- a/src/cpu/o3/cpu.hh
+++ b/src/cpu/o3/cpu.hh
@@ -42,21 +42,20 @@
 
 #include "arch/types.hh"
 #include "base/statistics.hh"
-#include "cpu/timebuf.hh"
 #include "config/full_system.hh"
 #include "config/the_isa.hh"
 #include "config/use_checker.hh"
-#include "cpu/activity.hh"
-#include "cpu/base.hh"
-#include "cpu/simple_thread.hh"
 #include "cpu/o3/comm.hh"
 #include "cpu/o3/cpu_policy.hh"
 #include "cpu/o3/scoreboard.hh"
 #include "cpu/o3/thread_state.hh"
+#include "cpu/activity.hh"
+#include "cpu/base.hh"
+#include "cpu/simple_thread.hh"
+#include "cpu/timebuf.hh"
 //#include "cpu/o3/thread_context.hh"
-#include "sim/process.hh"
-
 #include "params/DerivO3CPU.hh"
+#include "sim/process.hh"
 
 template <class>
 class Checker;

diff --git a/src/cpu/o3/cpu_policy.hh b/src/cpu/o3/cpu_policy.hh
index c06c9a20123bf610f3a01c64a2e4e09112f8d09b..ed0c311330a02e50ecb0e3368ac565171abb9661 100644 (file)
--- a/src/cpu/o3/cpu_policy.hh
+++ b/src/cpu/o3/cpu_policy.hh
@@ -32,24 +32,22 @@
 #define __CPU_O3_CPU_POLICY_HH__
 
 #include "cpu/o3/bpred_unit.hh"
+#include "cpu/o3/comm.hh"
+#include "cpu/o3/commit.hh"
+#include "cpu/o3/decode.hh"
+#include "cpu/o3/fetch.hh"
 #include "cpu/o3/free_list.hh"
+#include "cpu/o3/iew.hh"
 #include "cpu/o3/inst_queue.hh"
 #include "cpu/o3/lsq.hh"
 #include "cpu/o3/lsq_unit.hh"
 #include "cpu/o3/mem_dep_unit.hh"
 #include "cpu/o3/regfile.hh"
+#include "cpu/o3/rename.hh"
 #include "cpu/o3/rename_map.hh"
 #include "cpu/o3/rob.hh"
 #include "cpu/o3/store_set.hh"
 
-#include "cpu/o3/commit.hh"
-#include "cpu/o3/decode.hh"
-#include "cpu/o3/fetch.hh"
-#include "cpu/o3/iew.hh"
-#include "cpu/o3/rename.hh"
-
-#include "cpu/o3/comm.hh"
-
 /**
  * Struct that defines the key classes to be used by the CPU.  All
  * classes use the typedefs defined here to determine what are the

diff --git a/src/cpu/o3/decode.cc b/src/cpu/o3/decode.cc
index 896e38331c24d7412c121d1438b5462f1ad8396c..9722a4fcda5a20801a1cccb7edaff2bd79a4933a 100644 (file)
--- a/src/cpu/o3/decode.cc
+++ b/src/cpu/o3/decode.cc
@@ -28,7 +28,7 @@
  * Authors: Kevin Lim
  */
 
-#include "cpu/o3/isa_specific.hh"
 #include "cpu/o3/decode_impl.hh"
+#include "cpu/o3/isa_specific.hh"
 
 template class DefaultDecode<O3CPUImpl>;

diff --git a/src/cpu/o3/dyn_inst.hh b/src/cpu/o3/dyn_inst.hh
index 487c284e65b6aafeb4c7538e8e04f1cb96b3c58f..2e434ea02e8aee521102aafb8cbbf4bd9e20ccc1 100644 (file)
--- a/src/cpu/o3/dyn_inst.hh
+++ b/src/cpu/o3/dyn_inst.hh
@@ -45,10 +45,10 @@
 
 #include "arch/isa_traits.hh"
 #include "config/the_isa.hh"
-#include "cpu/base_dyn_inst.hh"
-#include "cpu/inst_seq.hh"
 #include "cpu/o3/cpu.hh"
 #include "cpu/o3/isa_specific.hh"
+#include "cpu/base_dyn_inst.hh"
+#include "cpu/inst_seq.hh"
 
 class Packet;
 

diff --git a/src/cpu/o3/fetch.cc b/src/cpu/o3/fetch.cc
index d809b07e4736f6a28865f318ad37f31932e0bae0..fb08b0957cb303c96aa520fc0698cccc4d36dfae 100644 (file)
--- a/src/cpu/o3/fetch.cc
+++ b/src/cpu/o3/fetch.cc
@@ -28,7 +28,7 @@
  * Authors: Kevin Lim
  */
 
-#include "cpu/o3/isa_specific.hh"
 #include "cpu/o3/fetch_impl.hh"
+#include "cpu/o3/isa_specific.hh"
 
 template class DefaultFetch<O3CPUImpl>;

diff --git a/src/cpu/o3/fetch.hh b/src/cpu/o3/fetch.hh
index 4a4ac09021f26406fec8a6be36a265ce0a71c3cd..53f0f631e87cae17638b763994cc28137446c1cc 100644 (file)
--- a/src/cpu/o3/fetch.hh
+++ b/src/cpu/o3/fetch.hh
@@ -44,12 +44,12 @@
 #ifndef __CPU_O3_FETCH_HH__
 #define __CPU_O3_FETCH_HH__
 
-#include "arch/utility.hh"
 #include "arch/predecoder.hh"
+#include "arch/utility.hh"
 #include "base/statistics.hh"
-#include "cpu/timebuf.hh"
 #include "config/the_isa.hh"
 #include "cpu/pc_event.hh"
+#include "cpu/timebuf.hh"
 #include "cpu/translation.hh"
 #include "mem/packet.hh"
 #include "mem/port.hh"

diff --git a/src/cpu/o3/fetch_impl.hh b/src/cpu/o3/fetch_impl.hh
index c611f0e493f60e95b49fea2763f5a57253b5f429..806cf79162f3935ca0873d9c6c6855d58ffd9229 100644 (file)
--- a/src/cpu/o3/fetch_impl.hh
+++ b/src/cpu/o3/fetch_impl.hh
@@ -50,8 +50,8 @@
 #include "config/the_isa.hh"
 #include "config/use_checker.hh"
 #include "cpu/checker/cpu.hh"
-#include "cpu/exetrace.hh"
 #include "cpu/o3/fetch.hh"
+#include "cpu/exetrace.hh"
 #include "mem/packet.hh"
 #include "mem/request.hh"
 #include "params/DerivO3CPU.hh"

diff --git a/src/cpu/o3/free_list.cc b/src/cpu/o3/free_list.cc
index 1144238f45de87ce62f70e75782662e91562d79c..88020a0a2de56e948708ce5456ee1622efb17248 100644 (file)
--- a/src/cpu/o3/free_list.cc
+++ b/src/cpu/o3/free_list.cc
@@ -29,7 +29,6 @@
  */
 
 #include "base/trace.hh"
-
 #include "cpu/o3/free_list.hh"
 
 SimpleFreeList::SimpleFreeList(ThreadID activeThreads,

diff --git a/src/cpu/o3/fu_pool.hh b/src/cpu/o3/fu_pool.hh
index 20d742cc8749956ee387d2adaeadd23d9107b6f9..ea4b53e1aba5f6816b63078bcdebfa7da2d1b14a 100644 (file)
--- a/src/cpu/o3/fu_pool.hh
+++ b/src/cpu/o3/fu_pool.hh
@@ -36,8 +36,8 @@
 #include <string>
 #include <vector>
 
-#include "cpu/sched_list.hh"
 #include "cpu/op_class.hh"
+#include "cpu/sched_list.hh"
 #include "params/FUPool.hh"
 #include "sim/sim_object.hh"
 

diff --git a/src/cpu/o3/iew.cc b/src/cpu/o3/iew.cc
index f99be7fe0a8ed3ab51ba193fe91c297750d6a7c5..9bf2db4d0fe8e35b0313784b61306d887b5a389e 100644 (file)
--- a/src/cpu/o3/iew.cc
+++ b/src/cpu/o3/iew.cc
@@ -28,8 +28,8 @@
  * Authors: Kevin Lim
  */
 
-#include "cpu/o3/isa_specific.hh"
 #include "cpu/o3/iew_impl.hh"
 #include "cpu/o3/inst_queue.hh"
+#include "cpu/o3/isa_specific.hh"
 
 template class DefaultIEW<O3CPUImpl>;

diff --git a/src/cpu/o3/iew.hh b/src/cpu/o3/iew.hh
index 6599964b6f1576b347ec8133bba35b7f518929fc..d157b43836939bd992be84247136a064393f4482 100644 (file)
--- a/src/cpu/o3/iew.hh
+++ b/src/cpu/o3/iew.hh
@@ -46,11 +46,11 @@
 #include <queue>
 
 #include "base/statistics.hh"
-#include "cpu/timebuf.hh"
 #include "config/full_system.hh"
 #include "cpu/o3/comm.hh"
-#include "cpu/o3/scoreboard.hh"
 #include "cpu/o3/lsq.hh"
+#include "cpu/o3/scoreboard.hh"
+#include "cpu/timebuf.hh"
 
 class DerivO3CPUParams;
 class FUPool;

diff --git a/src/cpu/o3/iew_impl.hh b/src/cpu/o3/iew_impl.hh
index 8bf3c56f499ae0c5675da902597193b7034649b4..8b1bd4d00fe004c9c8326710cb8175beb995eba9 100644 (file)
--- a/src/cpu/o3/iew_impl.hh
+++ b/src/cpu/o3/iew_impl.hh
@@ -46,10 +46,10 @@
 
 #include <queue>
 
-#include "cpu/timebuf.hh"
 #include "config/the_isa.hh"
 #include "cpu/o3/fu_pool.hh"
 #include "cpu/o3/iew.hh"
+#include "cpu/timebuf.hh"
 #include "params/DerivO3CPU.hh"
 
 using namespace std;

diff --git a/src/cpu/o3/impl.hh b/src/cpu/o3/impl.hh
index ffccd4a84b1f2f85581a1bf941712a017af8d9b1..8905bdb1c0d27e13039cb80462db6abcff39b822 100644 (file)
--- a/src/cpu/o3/impl.hh
+++ b/src/cpu/o3/impl.hh
@@ -35,7 +35,6 @@
 #include "config/the_isa.hh"
 #include "cpu/o3/cpu_policy.hh"
 
-
 // Forward declarations.
 template <class Impl>
 class BaseO3DynInst;

diff --git a/src/cpu/o3/inst_queue.cc b/src/cpu/o3/inst_queue.cc
index a539066f93749bd59ac133a24dad1fe8a31d3f3d..cbc3d2e82106bcaa818a6bd4559186d224663cff 100644 (file)
--- a/src/cpu/o3/inst_queue.cc
+++ b/src/cpu/o3/inst_queue.cc
@@ -28,8 +28,8 @@
  * Authors: Kevin Lim
  */
 
-#include "cpu/o3/isa_specific.hh"
 #include "cpu/o3/inst_queue_impl.hh"
+#include "cpu/o3/isa_specific.hh"
 
 // Force instantiation of InstructionQueue.
 template class InstructionQueue<O3CPUImpl>;

diff --git a/src/cpu/o3/inst_queue.hh b/src/cpu/o3/inst_queue.hh
index 64df357438874feb1e70a7c0bcabd681968bf7fc..eb35fd2853be4668e7629af84e4e31281bead34b 100644 (file)
--- a/src/cpu/o3/inst_queue.hh
+++ b/src/cpu/o3/inst_queue.hh
@@ -49,11 +49,11 @@
 #include <vector>
 
 #include "base/statistics.hh"
-#include "cpu/timebuf.hh"
 #include "base/types.hh"
-#include "cpu/inst_seq.hh"
 #include "cpu/o3/dep_graph.hh"
+#include "cpu/inst_seq.hh"
 #include "cpu/op_class.hh"
+#include "cpu/timebuf.hh"
 #include "sim/eventq.hh"
 
 class DerivO3CPUParams;

diff --git a/src/cpu/o3/isa_specific.hh b/src/cpu/o3/isa_specific.hh
index e9347af91eb4ede7a3cd4f63e06cfe40aa1c391c..9bae3fd15ea6a2eaf58d81854364da8060098128 100755 (executable)
--- a/src/cpu/o3/isa_specific.hh
+++ b/src/cpu/o3/isa_specific.hh
@@ -28,7 +28,6 @@
  * Authors: Korey Sewell
  */
 
-#include "cpu/base.hh"
-
-#include "cpu/o3/impl.hh"
 #include "cpu/o3/dyn_inst.hh"
+#include "cpu/o3/impl.hh"
+#include "cpu/base.hh"

diff --git a/src/cpu/o3/lsq.hh b/src/cpu/o3/lsq.hh
index 0ad5d51c2795ad163a24dc0491786c761248e7a0..14917bc167ea48e659466c011807e8b9942c3e6a 100644 (file)
--- a/src/cpu/o3/lsq.hh
+++ b/src/cpu/o3/lsq.hh
@@ -35,8 +35,8 @@
 #include <queue>
 
 #include "config/full_system.hh"
-#include "cpu/inst_seq.hh"
 #include "cpu/o3/lsq_unit.hh"
+#include "cpu/inst_seq.hh"
 #include "mem/port.hh"
 #include "sim/sim_object.hh"
 

diff --git a/src/cpu/o3/lsq_unit.hh b/src/cpu/o3/lsq_unit.hh
index bdc524dec57e83a0f7d3a45609d34042b23714fa..36c2ff8c847af102acf3f3b9bbdde2d4b61b7497 100644 (file)
--- a/src/cpu/o3/lsq_unit.hh
+++ b/src/cpu/o3/lsq_unit.hh
@@ -39,10 +39,10 @@
 
 #include "arch/faults.hh"
 #include "arch/locked_mem.hh"
-#include "config/full_system.hh"
-#include "config/the_isa.hh"
 #include "base/fast_alloc.hh"
 #include "base/hashmap.hh"
+#include "config/full_system.hh"
+#include "config/the_isa.hh"
 #include "cpu/inst_seq.hh"
 #include "mem/packet.hh"
 #include "mem/port.hh"

diff --git a/src/cpu/o3/lsq_unit_impl.hh b/src/cpu/o3/lsq_unit_impl.hh
index 70b87ff26e7c5ce4512490d99fd137877400f55b..6a366d056ac0f0f4b16a92cb82a707ea3b594014 100644 (file)
--- a/src/cpu/o3/lsq_unit_impl.hh
+++ b/src/cpu/o3/lsq_unit_impl.hh
@@ -42,11 +42,11 @@
  */
 
 #include "arch/locked_mem.hh"
+#include "base/str.hh"
 #include "config/the_isa.hh"
 #include "config/use_checker.hh"
 #include "cpu/o3/lsq.hh"
 #include "cpu/o3/lsq_unit.hh"
-#include "base/str.hh"
 #include "mem/packet.hh"
 #include "mem/request.hh"
 

diff --git a/src/cpu/o3/mem_dep_unit.cc b/src/cpu/o3/mem_dep_unit.cc
index 6a14dcbff4960abc51551a182c8516b3c8dc93d3..ac0db47849ec8f9a05c41173b7a76fa96f81e840 100644 (file)
--- a/src/cpu/o3/mem_dep_unit.cc
+++ b/src/cpu/o3/mem_dep_unit.cc
@@ -29,8 +29,8 @@
  */
 
 #include "cpu/o3/isa_specific.hh"
-#include "cpu/o3/store_set.hh"
 #include "cpu/o3/mem_dep_unit_impl.hh"
+#include "cpu/o3/store_set.hh"
 
 // Force instantation of memory dependency unit using store sets and
 // O3CPUImpl.

diff --git a/src/cpu/o3/rename.hh b/src/cpu/o3/rename.hh
index 90128311101df833328d1d8ba039df496c791724..e2472a62d9bbfa2c8c4b73a596497b369bfb38d3 100644 (file)
--- a/src/cpu/o3/rename.hh
+++ b/src/cpu/o3/rename.hh
@@ -34,8 +34,8 @@
 #include <list>
 
 #include "base/statistics.hh"
-#include "cpu/timebuf.hh"
 #include "config/the_isa.hh"
+#include "cpu/timebuf.hh"
 
 class DerivO3CPUParams;
 

diff --git a/src/cpu/o3/scoreboard.hh b/src/cpu/o3/scoreboard.hh
index b1c2bd0269e2cb197727dba2f6205b9cc37648da..4789e21816fc004002437e9d87c2c8cbe662f765 100644 (file)
--- a/src/cpu/o3/scoreboard.hh
+++ b/src/cpu/o3/scoreboard.hh
@@ -35,6 +35,7 @@
 #include <iostream>
 #include <utility>
 #include <vector>
+
 #include "base/trace.hh"
 #include "base/traceflags.hh"
 #include "cpu/o3/comm.hh"

diff --git a/src/cpu/o3/thread_context.cc b/src/cpu/o3/thread_context.cc
index 0d8c676431ed652eda6721d2446ab179fc258ec8..7ca716dd17ec6e41454f6cb661c612238cac098b 100755 (executable)
--- a/src/cpu/o3/thread_context.cc
+++ b/src/cpu/o3/thread_context.cc
@@ -28,9 +28,9 @@
  * Authors: Kevin Lim
  */
 
+#include "cpu/o3/impl.hh"
 #include "cpu/o3/thread_context.hh"
 #include "cpu/o3/thread_context_impl.hh"
-#include "cpu/o3/impl.hh"
 
 template class O3ThreadContext<O3CPUImpl>;
 

diff --git a/src/cpu/o3/thread_context.hh b/src/cpu/o3/thread_context.hh
index 4e559000b2148f52922681eb2af5e99bec349f9a..ef0fdbb4d8b2772fd5f3f63368eecebd6b74ebda 100755 (executable)
--- a/src/cpu/o3/thread_context.hh
+++ b/src/cpu/o3/thread_context.hh
@@ -32,8 +32,8 @@
 #define __CPU_O3_THREAD_CONTEXT_HH__
 
 #include "config/the_isa.hh"
-#include "cpu/thread_context.hh"
 #include "cpu/o3/isa_specific.hh"
+#include "cpu/thread_context.hh"
 
 class EndQuiesceEvent;
 namespace Kernel {

diff --git a/src/cpu/ozone/back_end.hh b/src/cpu/ozone/back_end.hh
index 95e079d0d15737741f530f7e757d5c447a19d5ee..90a336d1b0001d02639eecedfe889a9f59f867f5 100644 (file)
--- a/src/cpu/ozone/back_end.hh
+++ b/src/cpu/ozone/back_end.hh
@@ -35,13 +35,13 @@
 #include <queue>
 #include <string>
 
-#include "sim/faults.hh"
-#include "cpu/timebuf.hh"
-#include "cpu/inst_seq.hh"
 #include "cpu/ozone/rename_table.hh"
 #include "cpu/ozone/thread_state.hh"
+#include "cpu/inst_seq.hh"
+#include "cpu/timebuf.hh"
 #include "mem/request.hh"
 #include "sim/eventq.hh"
+#include "sim/faults.hh"
 
 class ThreadContext;
 

diff --git a/src/cpu/ozone/back_end_impl.hh b/src/cpu/ozone/back_end_impl.hh
index fbb363a96d2172b820d9b021cc547d3fe01a0f5f..169f328adb2f2e7056e7e4979db907f2cef0c707 100644 (file)
--- a/src/cpu/ozone/back_end_impl.hh
+++ b/src/cpu/ozone/back_end_impl.hh
@@ -28,8 +28,8 @@
  * Authors: Kevin Lim
  */
 
-#include "encumbered/cpu/full/op_class.hh"
 #include "cpu/ozone/back_end.hh"
+#include "encumbered/cpu/full/op_class.hh"
 
 template <class Impl>
 BackEnd<Impl>::InstQueue::InstQueue(Params *params)

diff --git a/src/cpu/ozone/base_dyn_inst.cc b/src/cpu/ozone/base_dyn_inst.cc
index e0570fd1626591bf15b31730d7248bec517e2b4d..9fdb9d22eba5b8557315194c57e279234b5ab8dd 100644 (file)
--- a/src/cpu/ozone/base_dyn_inst.cc
+++ b/src/cpu/ozone/base_dyn_inst.cc
@@ -28,8 +28,8 @@
  * Authors: Kevin Lim
  */
 
-#include "cpu/base_dyn_inst_impl.hh"
 #include "cpu/ozone/ozone_impl.hh"
+#include "cpu/base_dyn_inst_impl.hh"
 
 // Explicit instantiation
 template class BaseDynInst<OzoneImpl>;

diff --git a/src/cpu/ozone/checker_builder.cc b/src/cpu/ozone/checker_builder.cc
index 37b9f951a2a4c2bd8842e9c08fd17b58fcc8ec7b..6baa95658e038ea7cfebed2e4ae0b29520d5bb20 100644 (file)
--- a/src/cpu/ozone/checker_builder.cc
+++ b/src/cpu/ozone/checker_builder.cc
@@ -31,9 +31,9 @@
 #include <string>
 
 #include "cpu/checker/cpu_impl.hh"
-#include "cpu/inst_seq.hh"
 #include "cpu/ozone/dyn_inst.hh"
 #include "cpu/ozone/ozone_impl.hh"
+#include "cpu/inst_seq.hh"
 #include "params/OzoneChecker.hh"
 #include "sim/process.hh"
 #include "sim/sim_object.hh"

diff --git a/src/cpu/ozone/cpu.hh b/src/cpu/ozone/cpu.hh
index 1b196feb435d4fc170eb7c0674f80094e2e18041..1867a4c51252b6ba53583db657267539aa00cbc4 100644 (file)
--- a/src/cpu/ozone/cpu.hh
+++ b/src/cpu/ozone/cpu.hh
@@ -34,16 +34,16 @@
 #include <set>
 
 #include "base/statistics.hh"
-#include "cpu/timebuf.hh"
 #include "config/full_system.hh"
 #include "config/the_isa.hh"
-#include "cpu/base.hh"
-#include "cpu/thread_context.hh"
-#include "cpu/inst_seq.hh"
 #include "cpu/ozone/rename_table.hh"
 #include "cpu/ozone/thread_state.hh"
+#include "cpu/base.hh"
+#include "cpu/inst_seq.hh"
 #include "cpu/pc_event.hh"
 #include "cpu/static_inst.hh"
+#include "cpu/thread_context.hh"
+#include "cpu/timebuf.hh"
 #include "mem/page_table.hh"
 #include "sim/eventq.hh"
 

diff --git a/src/cpu/ozone/cpu_builder.cc b/src/cpu/ozone/cpu_builder.cc
index 9cac3a5244669e5eb1c256aee0c3ecd960d045c9..63b7eb6ffa867c5666d629f685545b29b8e995f5 100644 (file)
--- a/src/cpu/ozone/cpu_builder.cc
+++ b/src/cpu/ozone/cpu_builder.cc
@@ -31,10 +31,10 @@
 #include <string>
 
 #include "cpu/checker/cpu.hh"
-#include "cpu/inst_seq.hh"
 #include "cpu/ozone/cpu.hh"
 #include "cpu/ozone/ozone_impl.hh"
 #include "cpu/ozone/simple_params.hh"
+#include "cpu/inst_seq.hh"
 #include "params/DerivOzoneCPU.hh"
 #include "sim/process.hh"
 #include "sim/sim_object.hh"

diff --git a/src/cpu/ozone/cpu_impl.hh b/src/cpu/ozone/cpu_impl.hh
index dd6c3dcf1b8efbc17d6e3eb2254f14dbad3abcc8..bb6e96ecc099592b851e3ba9c9411912a9ec30a2 100644 (file)
--- a/src/cpu/ozone/cpu_impl.hh
+++ b/src/cpu/ozone/cpu_impl.hh
@@ -29,28 +29,27 @@
  *          Nathan Binkert
  */
 
-#include "config/full_system.hh"
-#include "config/use_checker.hh"
-
 #include "arch/isa_traits.hh" // For MachInst
 #include "base/trace.hh"
+#include "config/full_system.hh"
 #include "config/the_isa.hh"
+#include "config/use_checker.hh"
+#include "cpu/ozone/cpu.hh"
 #include "cpu/base.hh"
-#include "cpu/simple_thread.hh"
-#include "cpu/thread_context.hh"
 #include "cpu/exetrace.hh"
-#include "cpu/ozone/cpu.hh"
 #include "cpu/quiesce_event.hh"
+#include "cpu/simple_thread.hh"
 #include "cpu/static_inst.hh"
+#include "cpu/thread_context.hh"
 #include "sim/sim_object.hh"
 #include "sim/stats.hh"
 
 #if FULL_SYSTEM
-#include "arch/faults.hh"
 #include "arch/alpha/osfpal.hh"
+#include "arch/faults.hh"
+#include "arch/kernel_stats.hh"
 #include "arch/tlb.hh"
 #include "arch/types.hh"
-#include "arch/kernel_stats.hh"
 #include "arch/vtophys.hh"
 #include "base/callback.hh"
 #include "cpu/profile.hh"

diff --git a/src/cpu/ozone/dyn_inst.hh b/src/cpu/ozone/dyn_inst.hh
index cca72ef18fcc4023b18a023e5cd8391b535543a3..c1853b1ed848549aeb7d4aacde5f6eabc64c56cb 100644 (file)
--- a/src/cpu/ozone/dyn_inst.hh
+++ b/src/cpu/ozone/dyn_inst.hh
@@ -31,17 +31,17 @@
 #ifndef __CPU_OZONE_DYN_INST_HH__
 #define __CPU_OZONE_DYN_INST_HH__
 
+#include <list>
+#include <vector>
+
 #include "arch/isa_traits.hh"
 #include "arch/types.hh"
 #include "config/full_system.hh"
 #include "config/the_isa.hh"
-#include "cpu/base_dyn_inst.hh"
-#include "cpu/inst_seq.hh"
 #include "cpu/ozone/cpu.hh"   // MUST include this
 #include "cpu/ozone/ozone_impl.hh"
-
-#include <list>
-#include <vector>
+#include "cpu/base_dyn_inst.hh"
+#include "cpu/inst_seq.hh"
 
 template <class Impl>
 class OzoneDynInst : public BaseDynInst<Impl>

diff --git a/src/cpu/ozone/dyn_inst_impl.hh b/src/cpu/ozone/dyn_inst_impl.hh
index bfefb9428cab4b7bf5f5698c1cf190f601bd8e22..002b39fa26d9c4275d37f7651e4508c7c53fada0 100644 (file)
--- a/src/cpu/ozone/dyn_inst_impl.hh
+++ b/src/cpu/ozone/dyn_inst_impl.hh
@@ -28,10 +28,10 @@
  * Authors: Kevin Lim
  */
 
-#include "sim/faults.hh"
 #include "config/full_system.hh"
 #include "config/the_isa.hh"
 #include "cpu/ozone/dyn_inst.hh"
+#include "sim/faults.hh"
 
 #if FULL_SYSTEM
 #include "kern/kernel_stats.hh"

diff --git a/src/cpu/ozone/ea_list.cc b/src/cpu/ozone/ea_list.cc
index 5ef2407002581e845cdf289b5e9b0bdf0b4cc285..4fc6c0a5f13253270b26cbc86033edf6134f577c 100644 (file)
--- a/src/cpu/ozone/ea_list.cc
+++ b/src/cpu/ozone/ea_list.cc
@@ -30,8 +30,8 @@
  */
 
 #include "arch/isa_traits.hh"
-#include "cpu/inst_seq.hh"
 #include "cpu/ooo_cpu/ea_list.hh"
+#include "cpu/inst_seq.hh"
 
 void
 EAList::addAddr(const InstSeqNum &new_sn, const Addr &new_ea)

diff --git a/src/cpu/ozone/front_end.hh b/src/cpu/ozone/front_end.hh
index 7f400e82a82335a5f5587e56aa71b1f3844010bf..1d200ef7da9451267e4149b145c3c15d17631001 100644 (file)
--- a/src/cpu/ozone/front_end.hh
+++ b/src/cpu/ozone/front_end.hh
@@ -34,11 +34,11 @@
 #include <deque>
 
 #include "arch/utility.hh"
-#include "cpu/timebuf.hh"
 #include "config/the_isa.hh"
-#include "cpu/inst_seq.hh"
 #include "cpu/o3/bpred_unit.hh"
 #include "cpu/ozone/rename_table.hh"
+#include "cpu/inst_seq.hh"
+#include "cpu/timebuf.hh"
 #include "mem/port.hh"
 #include "mem/request.hh"
 #include "sim/eventq.hh"

diff --git a/src/cpu/ozone/front_end_impl.hh b/src/cpu/ozone/front_end_impl.hh
index d7ed0b77aee05cbac6c3153a33ad08a913dc15c2..5d8919d4e9563a2b351e357e08fdbc61f607cbcd 100644 (file)
--- a/src/cpu/ozone/front_end_impl.hh
+++ b/src/cpu/ozone/front_end_impl.hh
@@ -28,18 +28,18 @@
  * Authors: Kevin Lim
  */
 
-#include "sim/faults.hh"
 #include "arch/isa_traits.hh"
 #include "arch/utility.hh"
 #include "base/statistics.hh"
 #include "config/the_isa.hh"
 #include "config/use_checker.hh"
-#include "cpu/thread_context.hh"
-#include "cpu/exetrace.hh"
 #include "cpu/ozone/front_end.hh"
+#include "cpu/exetrace.hh"
+#include "cpu/thread_context.hh"
 #include "mem/mem_object.hh"
 #include "mem/packet.hh"
 #include "mem/request.hh"
+#include "sim/faults.hh"
 
 #if USE_CHECKER
 #include "cpu/checker/cpu.hh"

diff --git a/src/cpu/ozone/inorder_back_end.hh b/src/cpu/ozone/inorder_back_end.hh
index fcdc2a38a051a0fc5b0af76a44f1644061eae261..5c2f9c28f37030fc87c2c31d1f455ffc293de5c3 100644 (file)
--- a/src/cpu/ozone/inorder_back_end.hh
+++ b/src/cpu/ozone/inorder_back_end.hh
@@ -33,14 +33,14 @@
 
 #include <list>
 
-#include "sim/faults.hh"
-#include "cpu/timebuf.hh"
-#include "cpu/thread_context.hh"
-#include "cpu/inst_seq.hh"
 #include "cpu/ozone/rename_table.hh"
 #include "cpu/ozone/thread_state.hh"
+#include "cpu/inst_seq.hh"
+#include "cpu/thread_context.hh"
+#include "cpu/timebuf.hh"
 #include "mem/request.hh"
 #include "sim/eventq.hh"
+#include "sim/faults.hh"
 
 template <class Impl>
 class InorderBackEnd

diff --git a/src/cpu/ozone/inorder_back_end_impl.hh b/src/cpu/ozone/inorder_back_end_impl.hh
index b48e8f6924e15fee6f66befaf1a244b66b9b57c0..13c066fd243458108fd9bb344400a2fb8a71f918 100644 (file)
--- a/src/cpu/ozone/inorder_back_end_impl.hh
+++ b/src/cpu/ozone/inorder_back_end_impl.hh
@@ -28,11 +28,11 @@
  * Authors: Kevin Lim
  */
 
-#include "sim/faults.hh"
 #include "arch/types.hh"
 #include "config/the_isa.hh"
 #include "cpu/ozone/inorder_back_end.hh"
 #include "cpu/ozone/thread_state.hh"
+#include "sim/faults.hh"
 
 template <class Impl>
 InorderBackEnd<Impl>::InorderBackEnd(Params *params)

diff --git a/src/cpu/ozone/inst_queue.cc b/src/cpu/ozone/inst_queue.cc
index 7ce5d67ad42862ee77ca6f3429b609b6f187fa2e..5fd41d7c6aae5b11d4437a171de5489b51cfd93b 100644 (file)
--- a/src/cpu/ozone/inst_queue.cc
+++ b/src/cpu/ozone/inst_queue.cc
@@ -29,9 +29,9 @@
  */
 
 #include "cpu/ozone/dyn_inst.hh"
+#include "cpu/ozone/inst_queue_impl.hh"
 #include "cpu/ozone/ozone_impl.hh"
 #include "cpu/ozone/simple_impl.hh"
-#include "cpu/ozone/inst_queue_impl.hh"
 
 // Force instantiation of InstructionQueue.
 template class InstQueue<SimpleImpl>;

diff --git a/src/cpu/ozone/inst_queue.hh b/src/cpu/ozone/inst_queue.hh
index fb302f01e105cb665550864d9fb93b0ef6aacf6a..ef207e792c0e5b27aa12fa1b91e9385d7f497cbc 100644 (file)
--- a/src/cpu/ozone/inst_queue.hh
+++ b/src/cpu/ozone/inst_queue.hh
@@ -37,9 +37,9 @@
 #include <vector>
 
 #include "base/statistics.hh"
-#include "cpu/timebuf.hh"
 #include "base/types.hh"
 #include "cpu/inst_seq.hh"
+#include "cpu/timebuf.hh"
 
 class FUPool;
 class MemInterface;

diff --git a/src/cpu/ozone/inst_queue_impl.hh b/src/cpu/ozone/inst_queue_impl.hh
index 0068f29775e8c4b8cfecac966ae8c582130bd1d8..f2f88760beaaff8136775a1e72db35a609fc9d65 100644 (file)
--- a/src/cpu/ozone/inst_queue_impl.hh
+++ b/src/cpu/ozone/inst_queue_impl.hh
@@ -38,9 +38,8 @@
 
 #include <vector>
 
-#include "sim/core.hh"
-
 #include "cpu/ozone/inst_queue.hh"
+#include "sim/core.hh"
 #if 0
 template <class Impl>
 InstQueue<Impl>::FUCompletion::FUCompletion(DynInstPtr &_inst,

diff --git a/src/cpu/ozone/lsq_unit.cc b/src/cpu/ozone/lsq_unit.cc
index e37971dba2c7d757d22eb7debb43b0adbc0b53c7..b473513aee197f35552581d9cb475e5c0a790117 100644 (file)
--- a/src/cpu/ozone/lsq_unit.cc
+++ b/src/cpu/ozone/lsq_unit.cc
@@ -28,8 +28,8 @@
  * Authors: Kevin Lim
  */
 
-#include "cpu/ozone/ozone_impl.hh"
 #include "cpu/ozone/lsq_unit_impl.hh"
+#include "cpu/ozone/ozone_impl.hh"
 
 // Force the instantiation of LDSTQ for all the implementations we care about.
 template class OzoneLSQ<OzoneImpl>;

diff --git a/src/cpu/ozone/lsq_unit.hh b/src/cpu/ozone/lsq_unit.hh
index 0216c501301e731bff6ff9e6b4fb5eaadce6b84c..1d8328610ba8e13c0c60cd1ba73d228226bddb43 100644 (file)
--- a/src/cpu/ozone/lsq_unit.hh
+++ b/src/cpu/ozone/lsq_unit.hh
@@ -31,15 +31,15 @@
 #ifndef __CPU_OZONE_LSQ_UNIT_HH__
 #define __CPU_OZONE_LSQ_UNIT_HH__
 
+#include <algorithm>
 #include <map>
 #include <queue>
-#include <algorithm>
 
 #include "arch/faults.hh"
 #include "arch/types.hh"
+#include "base/hashmap.hh"
 #include "config/full_system.hh"
 #include "config/the_isa.hh"
-#include "base/hashmap.hh"
 #include "cpu/inst_seq.hh"
 #include "mem/mem_interface.hh"
 //#include "mem/page_table.hh"

diff --git a/src/cpu/ozone/lw_back_end.hh b/src/cpu/ozone/lw_back_end.hh
index 4c6eb5fb62168fb2f220fb66bc34b59ee0ffdf32..adb4f276a55c2d52b47450c3cbca9541dd9c44d8 100644 (file)
--- a/src/cpu/ozone/lw_back_end.hh
+++ b/src/cpu/ozone/lw_back_end.hh
@@ -36,13 +36,13 @@
 #include <set>
 #include <string>
 
-#include "sim/faults.hh"
-#include "cpu/timebuf.hh"
-#include "cpu/inst_seq.hh"
 #include "cpu/ozone/rename_table.hh"
 #include "cpu/ozone/thread_state.hh"
+#include "cpu/inst_seq.hh"
+#include "cpu/timebuf.hh"
 #include "mem/request.hh"
 #include "sim/eventq.hh"
+#include "sim/faults.hh"
 
 template <class>
 class Checker;

diff --git a/src/cpu/ozone/lw_lsq.cc b/src/cpu/ozone/lw_lsq.cc
index 8674e83a0bb6849c053f62df3c7354e309de86b2..79dc0db3100427d1caad67b38683c3b2f4ece1f5 100644 (file)
--- a/src/cpu/ozone/lw_lsq.cc
+++ b/src/cpu/ozone/lw_lsq.cc
@@ -28,8 +28,8 @@
  * Authors: Kevin Lim
  */
 
-#include "cpu/ozone/ozone_impl.hh"
 #include "cpu/ozone/lw_lsq_impl.hh"
+#include "cpu/ozone/ozone_impl.hh"
 
 // Force the instantiation of LDSTQ for all the implementations we care about.
 template class OzoneLWLSQ<OzoneImpl>;

diff --git a/src/cpu/ozone/lw_lsq.hh b/src/cpu/ozone/lw_lsq.hh
index 9605f175e56e12b7cdaef835d88e8dd04f8094b6..4817622f5497bc2efb80952f81de5b9685f901ca 100644 (file)
--- a/src/cpu/ozone/lw_lsq.hh
+++ b/src/cpu/ozone/lw_lsq.hh
@@ -31,17 +31,17 @@
 #ifndef __CPU_OZONE_LW_LSQ_HH__
 #define __CPU_OZONE_LW_LSQ_HH__
 
+#include <algorithm>
 #include <list>
 #include <map>
 #include <queue>
-#include <algorithm>
 
 #include "arch/faults.hh"
 #include "arch/types.hh"
-#include "config/full_system.hh"
-#include "config/the_isa.hh"
 #include "base/fast_alloc.hh"
 #include "base/hashmap.hh"
+#include "config/full_system.hh"
+#include "config/the_isa.hh"
 #include "cpu/inst_seq.hh"
 #include "mem/packet.hh"
 #include "mem/port.hh"

diff --git a/src/cpu/ozone/lw_lsq_impl.hh b/src/cpu/ozone/lw_lsq_impl.hh
index 0c4e4b9c748a7522ac1c6a73e401909facdd26d1..3bee831760c0c2d12c727e47cd6663322f6d5b45 100644 (file)
--- a/src/cpu/ozone/lw_lsq_impl.hh
+++ b/src/cpu/ozone/lw_lsq_impl.hh
@@ -32,8 +32,8 @@
 #include "base/str.hh"
 #include "config/the_isa.hh"
 #include "config/use_checker.hh"
-#include "cpu/ozone/lw_lsq.hh"
 #include "cpu/checker/cpu.hh"
+#include "cpu/ozone/lw_lsq.hh"
 
 template<class Impl>
 OzoneLWLSQ<Impl>::WritebackEvent::WritebackEvent(DynInstPtr &_inst, PacketPtr _pkt,

diff --git a/src/cpu/ozone/ozone_base_dyn_inst.cc b/src/cpu/ozone/ozone_base_dyn_inst.cc
index 5a3a69dff8d0eacc9252534d56952ccc9690eb9a..0bcd31760259d20b6697c07d67fa272d4f970c80 100644 (file)
--- a/src/cpu/ozone/ozone_base_dyn_inst.cc
+++ b/src/cpu/ozone/ozone_base_dyn_inst.cc
@@ -28,8 +28,8 @@
  * Authors: Kevin Lim
  */
 
-#include "cpu/base_dyn_inst_impl.hh"
 #include "cpu/ozone/ozone_impl.hh"
+#include "cpu/base_dyn_inst_impl.hh"
 
 // Explicit instantiation
 template class BaseDynInst<OzoneImpl>;

diff --git a/src/cpu/ozone/ozone_impl.hh b/src/cpu/ozone/ozone_impl.hh
index 2271cd68ab2fedad748b66c7eedf0a8a2224e408..294aecfae674db86f34eb106f1fdef9b7fbce277 100644 (file)
--- a/src/cpu/ozone/ozone_impl.hh
+++ b/src/cpu/ozone/ozone_impl.hh
@@ -32,12 +32,12 @@
 #define __CPU_OZONE_OZONE_IMPL_HH__
 
 #include "cpu/o3/bpred_unit.hh"
+#include "cpu/ozone/dyn_inst.hh"
 #include "cpu/ozone/front_end.hh"
 #include "cpu/ozone/inst_queue.hh"
-#include "cpu/ozone/lw_lsq.hh"
 #include "cpu/ozone/lw_back_end.hh"
+#include "cpu/ozone/lw_lsq.hh"
 #include "cpu/ozone/null_predictor.hh"
-#include "cpu/ozone/dyn_inst.hh"
 #include "cpu/ozone/simple_params.hh"
 
 template <class Impl>

diff --git a/src/cpu/ozone/rename_table.cc b/src/cpu/ozone/rename_table.cc
index a44054b6e88df2284730d50004dccf6fea9bcd32..4e5505ff26c23d6f91138ade066cf58d481fb6f0 100644 (file)
--- a/src/cpu/ozone/rename_table.cc
+++ b/src/cpu/ozone/rename_table.cc
@@ -28,8 +28,8 @@
  * Authors: Kevin Lim
  */
 
-#include "cpu/ozone/rename_table_impl.hh"
 #include "cpu/ozone/ozone_impl.hh"
+#include "cpu/ozone/rename_table_impl.hh"
 //#include "cpu/ozone/simple_impl.hh"
 
 template class RenameTable<OzoneImpl>;

diff --git a/src/cpu/ozone/simple_base_dyn_inst.cc b/src/cpu/ozone/simple_base_dyn_inst.cc
index fdaeaf57e57c2e4ca4fedc4a3630f902b69df25c..c2ac1185acb7d439d62b1124f4c71a2ecfe37438 100644 (file)
--- a/src/cpu/ozone/simple_base_dyn_inst.cc
+++ b/src/cpu/ozone/simple_base_dyn_inst.cc
@@ -28,8 +28,8 @@
  * Authors: Kevin Lim
  */
 
-#include "cpu/base_dyn_inst_impl.hh"
 #include "cpu/ozone/simple_impl.hh"
+#include "cpu/base_dyn_inst_impl.hh"
 
 // Explicit instantiation
 template class BaseDynInst<SimpleImpl>;

diff --git a/src/cpu/ozone/simple_cpu_builder.cc b/src/cpu/ozone/simple_cpu_builder.cc
index 2fc7c10d0188da01a6fde7e88fd3f35b34a67070..f4446ede383104c219fd363cfa9fbc45ed6f1b03 100644 (file)
--- a/src/cpu/ozone/simple_cpu_builder.cc
+++ b/src/cpu/ozone/simple_cpu_builder.cc
@@ -31,10 +31,10 @@
 #include <string>
 
 #include "cpu/checker/cpu.hh"
-#include "cpu/inst_seq.hh"
 #include "cpu/ozone/cpu_impl.hh"
 #include "cpu/ozone/simple_impl.hh"
 #include "cpu/ozone/simple_params.hh"
+#include "cpu/inst_seq.hh"
 #include "mem/cache/base.hh"
 #include "sim/SimpleOzoneCPU.hh"
 #include "sim/process.hh"

diff --git a/src/cpu/ozone/simple_impl.hh b/src/cpu/ozone/simple_impl.hh
index 42002180b177c101b860f6be9cb6048a4cb14014..c18395515fcebe0902b560513f6a42d07f61545f 100644 (file)
--- a/src/cpu/ozone/simple_impl.hh
+++ b/src/cpu/ozone/simple_impl.hh
@@ -33,10 +33,10 @@
 
 #include "cpu/o3/bpred_unit.hh"
 #include "cpu/ozone/cpu.hh"
+#include "cpu/ozone/dyn_inst.hh"
 #include "cpu/ozone/front_end.hh"
 #include "cpu/ozone/inorder_back_end.hh"
 #include "cpu/ozone/null_predictor.hh"
-#include "cpu/ozone/dyn_inst.hh"
 #include "cpu/ozone/simple_params.hh"
 
 //template <class Impl>

diff --git a/src/cpu/pc_event.cc b/src/cpu/pc_event.cc
index 09bd6681915106d6055c2b0167cfe9561c5a3d6a..40432ed93a2d0330924c7f34e66b580ee39b7e2a 100644 (file)
--- a/src/cpu/pc_event.cc
+++ b/src/cpu/pc_event.cc
@@ -38,8 +38,8 @@
 #include "base/trace.hh"
 #include "config/full_system.hh"
 #include "cpu/base.hh"
-#include "cpu/thread_context.hh"
 #include "cpu/pc_event.hh"
+#include "cpu/thread_context.hh"
 #include "sim/core.hh"
 #include "sim/system.hh"
 

diff --git a/src/cpu/profile.cc b/src/cpu/profile.cc
index 4f04615e97939bb9a3f5612b32f511eb09d9ad1f..79ae22ca1054d7f4cdb3556564a3754ba0937d10 100644 (file)
--- a/src/cpu/profile.cc
+++ b/src/cpu/profile.cc
@@ -30,14 +30,14 @@
 
 #include <string>
 
+#include "base/loader/symtab.hh"
 #include "base/bitfield.hh"
 #include "base/callback.hh"
 #include "base/statistics.hh"
 #include "base/trace.hh"
-#include "base/loader/symtab.hh"
 #include "cpu/base.hh"
-#include "cpu/thread_context.hh"
 #include "cpu/profile.hh"
+#include "cpu/thread_context.hh"
 
 using namespace std;
 

diff --git a/src/cpu/profile.hh b/src/cpu/profile.hh
index dd856b5a79b8c487000f10c59b62b4cbbf2a4020..8fb0e3a8e3308714ea4a11ea4c4d0b3baf372f0d 100644 (file)
--- a/src/cpu/profile.hh
+++ b/src/cpu/profile.hh
@@ -34,9 +34,9 @@
 #include <map>
 
 #include "arch/stacktrace.hh"
+#include "base/types.hh"
 #include "config/the_isa.hh"
 #include "cpu/static_inst.hh"
-#include "base/types.hh"
 
 class ThreadContext;
 

diff --git a/src/cpu/quiesce_event.cc b/src/cpu/quiesce_event.cc
index 38ffb74e4a64b7f1c8599165c1e7eb159073b42e..79068985bea9e293311b471e740f91dab29c2066 100644 (file)
--- a/src/cpu/quiesce_event.cc
+++ b/src/cpu/quiesce_event.cc
@@ -29,8 +29,8 @@
  */
 
 #include "cpu/base.hh"
-#include "cpu/thread_context.hh"
 #include "cpu/quiesce_event.hh"
+#include "cpu/thread_context.hh"
 
 EndQuiesceEvent::EndQuiesceEvent(ThreadContext *_tc)
     : tc(_tc)

diff --git a/src/cpu/sched_list.hh b/src/cpu/sched_list.hh
index 56ee2f8ece01e83e696468762c9391fe4057271d..4d3b0dd718f9a406845d8c16dd5001b6312081a4 100644 (file)
--- a/src/cpu/sched_list.hh
+++ b/src/cpu/sched_list.hh
@@ -32,10 +32,10 @@
 #define SCHED_LIST_HH
 
 #include <list>
+
 #include "base/intmath.hh"
 #include "base/misc.hh"
 
-
 //  Any types you use this class for must be covered here...
 namespace {
     void ClearEntry(int &i) { i = 0; };

diff --git a/src/cpu/simple/atomic.cc b/src/cpu/simple/atomic.cc
index 6aa0eb64e8e154f657f62afd17e1e36fe3fd29ad..c5730e1379cd5e92e3a85651ce80077f938b064f 100644 (file)
--- a/src/cpu/simple/atomic.cc
+++ b/src/cpu/simple/atomic.cc
@@ -33,8 +33,8 @@
 #include "arch/utility.hh"
 #include "base/bigint.hh"
 #include "config/the_isa.hh"
-#include "cpu/exetrace.hh"
 #include "cpu/simple/atomic.hh"
+#include "cpu/exetrace.hh"
 #include "mem/packet.hh"
 #include "mem/packet_access.hh"
 #include "params/AtomicSimpleCPU.hh"

diff --git a/src/cpu/simple/base.cc b/src/cpu/simple/base.cc
index 8d7a1b11951a322d15b1ffc80b0b6d35fcf2b104..46452030922bb3551e30162abf6049f9c5f76d10 100644 (file)
--- a/src/cpu/simple/base.cc
+++ b/src/cpu/simple/base.cc
@@ -42,20 +42,20 @@
 
 #include "arch/faults.hh"
 #include "arch/utility.hh"
+#include "base/loader/symtab.hh"
 #include "base/cp_annotate.hh"
 #include "base/cprintf.hh"
 #include "base/inifile.hh"
-#include "base/loader/symtab.hh"
 #include "base/misc.hh"
 #include "base/pollevent.hh"
 #include "base/range.hh"
 #include "base/trace.hh"
 #include "base/types.hh"
 #include "config/the_isa.hh"
+#include "cpu/simple/base.hh"
 #include "cpu/base.hh"
 #include "cpu/exetrace.hh"
 #include "cpu/profile.hh"
-#include "cpu/simple/base.hh"
 #include "cpu/simple_thread.hh"
 #include "cpu/smt.hh"
 #include "cpu/static_inst.hh"

diff --git a/src/cpu/simple/base.hh b/src/cpu/simple/base.hh
index 628432d7667c53360a3b701679488bcbe510a027..2696cc395e2e57dda53e3bc1f77f049086132ea8 100644 (file)
--- a/src/cpu/simple/base.hh
+++ b/src/cpu/simple/base.hh
@@ -38,8 +38,8 @@
 #include "config/full_system.hh"
 #include "config/the_isa.hh"
 #include "cpu/base.hh"
-#include "cpu/simple_thread.hh"
 #include "cpu/pc_event.hh"
+#include "cpu/simple_thread.hh"
 #include "cpu/static_inst.hh"
 #include "mem/packet.hh"
 #include "mem/port.hh"

diff --git a/src/cpu/simple/timing.cc b/src/cpu/simple/timing.cc
index aca48e5d4550edce98d5f39123fc5ac603f02da3..52d4b06d20843dcc0eb2322e303150b31fe4b583 100644 (file)
--- a/src/cpu/simple/timing.cc
+++ b/src/cpu/simple/timing.cc
@@ -45,8 +45,8 @@
 #include "arch/utility.hh"
 #include "base/bigint.hh"
 #include "config/the_isa.hh"
-#include "cpu/exetrace.hh"
 #include "cpu/simple/timing.hh"
+#include "cpu/exetrace.hh"
 #include "mem/packet.hh"
 #include "mem/packet_access.hh"
 #include "params/TimingSimpleCPU.hh"

diff --git a/src/cpu/simple/timing.hh b/src/cpu/simple/timing.hh
index a7a3eb7c3c0c965d732f450ce6be2b91dc088f4b..778506703d197125745ebb8d064f0b6797260289 100644 (file)
--- a/src/cpu/simple/timing.hh
+++ b/src/cpu/simple/timing.hh
@@ -33,7 +33,6 @@
 
 #include "cpu/simple/base.hh"
 #include "cpu/translation.hh"
-
 #include "params/TimingSimpleCPU.hh"
 
 class TimingSimpleCPU : public BaseSimpleCPU

diff --git a/src/cpu/simple_thread.hh b/src/cpu/simple_thread.hh
index 48077a9b92bdf39070ea19bd4cb84bfafeaa5285..5420519e41be942eeafdc5645d1f6b7944de0ae7 100644 (file)
--- a/src/cpu/simple_thread.hh
+++ b/src/cpu/simple_thread.hh
@@ -66,8 +66,8 @@ namespace TheISA {
 
 #else // !FULL_SYSTEM
 
-#include "sim/process.hh"
 #include "mem/page_table.hh"
+#include "sim/process.hh"
 class TranslatingPort;
 
 #endif // FULL_SYSTEM

diff --git a/src/cpu/static_inst.cc b/src/cpu/static_inst.cc
index f1ec05802e87c54c72fc6aa1d915cc38d5deedd9..df59d1fc317024ba8f652a31e9284b94d3f39164 100644 (file)
--- a/src/cpu/static_inst.cc
+++ b/src/cpu/static_inst.cc
@@ -30,6 +30,7 @@
  */
 
 #include <iostream>
+
 #include "cpu/static_inst.hh"
 #include "sim/core.hh"
 

diff --git a/src/cpu/static_inst.hh b/src/cpu/static_inst.hh
index 20483c499de45dbb5728544c33149181d499b8df..c41ac38a6920c15c1b8acdcb856e2f27946e7abf 100644 (file)
--- a/src/cpu/static_inst.hh
+++ b/src/cpu/static_inst.hh
@@ -35,13 +35,13 @@
 #include <string>
 
 #include "arch/isa_traits.hh"
-#include "arch/types.hh"
 #include "arch/registers.hh"
-#include "config/the_isa.hh"
+#include "arch/types.hh"
 #include "base/hashmap.hh"
 #include "base/misc.hh"
 #include "base/refcnt.hh"
 #include "base/types.hh"
+#include "config/the_isa.hh"
 #include "cpu/op_class.hh"
 #include "sim/fault_fwd.hh"
 

diff --git a/src/cpu/testers/directedtest/InvalidateGenerator.cc b/src/cpu/testers/directedtest/InvalidateGenerator.cc
index 724702d6117180d86e8e0089882fdb8a47a8046e..3b5aa55e51c1ad3245f9d02de62bd3b658c9a131 100644 (file)
--- a/src/cpu/testers/directedtest/InvalidateGenerator.cc
+++ b/src/cpu/testers/directedtest/InvalidateGenerator.cc
@@ -27,9 +27,9 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "cpu/testers/directedtest/RubyDirectedTester.hh"
 #include "cpu/testers/directedtest/DirectedGenerator.hh"
 #include "cpu/testers/directedtest/InvalidateGenerator.hh"
+#include "cpu/testers/directedtest/RubyDirectedTester.hh"
 
 InvalidateGenerator::InvalidateGenerator(const Params *p)
     : DirectedGenerator(p)

diff --git a/src/cpu/testers/directedtest/InvalidateGenerator.hh b/src/cpu/testers/directedtest/InvalidateGenerator.hh
index ab68c859fdea2cc9fc097864529b2d769e0cc5d8..14c47b70bce9084f5ee1a3222d29f4377c26e7c7 100644 (file)
--- a/src/cpu/testers/directedtest/InvalidateGenerator.hh
+++ b/src/cpu/testers/directedtest/InvalidateGenerator.hh
@@ -35,8 +35,8 @@
 #ifndef __CPU_DIRECTEDTEST_INVALIDATEGENERATOR_HH__
 #define __CPU_DIRECTEDTEST_INVALIDATEGENERATOR_HH__
 
-#include "cpu/testers/directedtest/RubyDirectedTester.hh"
 #include "cpu/testers/directedtest/DirectedGenerator.hh"
+#include "cpu/testers/directedtest/RubyDirectedTester.hh"
 #include "mem/protocol/InvalidateGeneratorStatus.hh"
 #include "params/InvalidateGenerator.hh"
 

diff --git a/src/cpu/testers/directedtest/RubyDirectedTester.hh b/src/cpu/testers/directedtest/RubyDirectedTester.hh
index bd3989c04b314ad77e7375ae6527616ba77e5912..163c206d808c209e1eee98399bb29cfd22a64b71 100644 (file)
--- a/src/cpu/testers/directedtest/RubyDirectedTester.hh
+++ b/src/cpu/testers/directedtest/RubyDirectedTester.hh
@@ -31,15 +31,15 @@
 #define __CPU_DIRECTEDTEST_RUBYDIRECTEDTESTER_HH__
 
 #include <iostream>
-#include <vector>
 #include <string>
+#include <vector>
 
-#include "mem/mem_object.hh"
-#include "mem/packet.hh"
 #include "mem/ruby/common/DataBlock.hh"
 #include "mem/ruby/common/Global.hh"
 #include "mem/ruby/common/SubBlock.hh"
 #include "mem/ruby/system/RubyPort.hh"
+#include "mem/mem_object.hh"
+#include "mem/packet.hh"
 #include "params/RubyDirectedTester.hh"
 
 class DirectedGenerator;

diff --git a/src/cpu/testers/memtest/memtest.cc b/src/cpu/testers/memtest/memtest.cc
index 9440bfec20f2037886c7dfbe3f897455731f0f67..758a25ea284248a906f9816670824aa714595190 100644 (file)
--- a/src/cpu/testers/memtest/memtest.cc
+++ b/src/cpu/testers/memtest/memtest.cc
@@ -40,8 +40,8 @@
 #include "base/statistics.hh"
 #include "cpu/testers/memtest/memtest.hh"
 #include "mem/mem_object.hh"
-#include "mem/port.hh"
 #include "mem/packet.hh"
+#include "mem/port.hh"
 #include "mem/request.hh"
 #include "sim/sim_events.hh"
 #include "sim/stats.hh"

diff --git a/src/cpu/testers/memtest/memtest.hh b/src/cpu/testers/memtest/memtest.hh
index bb71da355dc9b750350df61965119ac4ea6173c0..4e489de5c69201e4fbb43977e21a2497e5e18502 100644 (file)
--- a/src/cpu/testers/memtest/memtest.hh
+++ b/src/cpu/testers/memtest/memtest.hh
@@ -34,15 +34,15 @@
 
 #include <set>
 
-#include "base/statistics.hh"
 #include "base/fast_alloc.hh"
+#include "base/statistics.hh"
+#include "mem/mem_object.hh"
+#include "mem/port.hh"
 #include "params/MemTest.hh"
 #include "sim/eventq.hh"
 #include "sim/sim_exit.hh"
 #include "sim/sim_object.hh"
 #include "sim/stats.hh"
-#include "mem/mem_object.hh"
-#include "mem/port.hh"
 
 class Packet;
 class MemTest : public MemObject

diff --git a/src/cpu/testers/networktest/networktest.cc b/src/cpu/testers/networktest/networktest.cc
index 73d9364b79c42c08930db97afd85c52c1c4ff97f..1c15557436c40862facdcca7fcb5c912e5c85930 100644 (file)
--- a/src/cpu/testers/networktest/networktest.cc
+++ b/src/cpu/testers/networktest/networktest.cc
@@ -28,18 +28,18 @@
  * Authors: Tushar Krishna
  */
 
+#include <cmath>
 #include <iomanip>
 #include <set>
 #include <string>
 #include <vector>
-#include <cmath>
 
 #include "base/misc.hh"
 #include "base/statistics.hh"
 #include "cpu/testers/networktest/networktest.hh"
 #include "mem/mem_object.hh"
-#include "mem/port.hh"
 #include "mem/packet.hh"
+#include "mem/port.hh"
 #include "mem/request.hh"
 #include "sim/sim_events.hh"
 #include "sim/stats.hh"

diff --git a/src/cpu/testers/networktest/networktest.hh b/src/cpu/testers/networktest/networktest.hh
index 923f47df27915c8d18132fb35e1a44340f752bc1..96daa5af2f767939c002d8b400e427473410b5dc 100644 (file)
--- a/src/cpu/testers/networktest/networktest.hh
+++ b/src/cpu/testers/networktest/networktest.hh
@@ -33,15 +33,15 @@
 
 #include <set>
 
-#include "base/statistics.hh"
 #include "base/fast_alloc.hh"
+#include "base/statistics.hh"
+#include "mem/mem_object.hh"
+#include "mem/port.hh"
 #include "params/NetworkTest.hh"
 #include "sim/eventq.hh"
 #include "sim/sim_exit.hh"
 #include "sim/sim_object.hh"
 #include "sim/stats.hh"
-#include "mem/mem_object.hh"
-#include "mem/port.hh"
 
 class Packet;
 class NetworkTest : public MemObject

diff --git a/src/cpu/testers/rubytest/CheckTable.cc b/src/cpu/testers/rubytest/CheckTable.cc
index af7467148d09c0fbf13db02a51c3656b97e3f318..c2aa68a539d2eeca080214bd97e5c5b8b781d26b 100644 (file)
--- a/src/cpu/testers/rubytest/CheckTable.cc
+++ b/src/cpu/testers/rubytest/CheckTable.cc
@@ -30,7 +30,6 @@
 #include "base/intmath.hh"
 #include "cpu/testers/rubytest/Check.hh"
 #include "cpu/testers/rubytest/CheckTable.hh"
-#include "cpu/testers/rubytest/CheckTable.hh"
 
 CheckTable::CheckTable(int _num_cpu_sequencers, RubyTester* _tester)
     : m_num_cpu_sequencers(_num_cpu_sequencers), m_tester_ptr(_tester)

diff --git a/src/cpu/testers/rubytest/RubyTester.hh b/src/cpu/testers/rubytest/RubyTester.hh
index 4ea5bda7342fd173bc53e05b9fec7db519145f7c..1c0147c7e8f895b6641abd68ec3c2f7052d38474 100644 (file)
--- a/src/cpu/testers/rubytest/RubyTester.hh
+++ b/src/cpu/testers/rubytest/RubyTester.hh
@@ -31,15 +31,15 @@
 #define __CPU_RUBYTEST_RUBYTESTER_HH__
 
 #include <iostream>
-#include <vector>
 #include <string>
+#include <vector>
 
 #include "cpu/testers/rubytest/CheckTable.hh"
-#include "mem/mem_object.hh"
-#include "mem/packet.hh"
 #include "mem/ruby/common/Global.hh"
 #include "mem/ruby/common/SubBlock.hh"
 #include "mem/ruby/system/RubyPort.hh"
+#include "mem/mem_object.hh"
+#include "mem/packet.hh"
 #include "params/RubyTester.hh"
 
 class RubyTester : public MemObject

diff --git a/src/cpu/thread_context.hh b/src/cpu/thread_context.hh
index 1c70ef59a0fe3d70f1b7c3a5c2becd2d5a0410f6..0f7228f0c3b2fe87442911aa5ff04c9cbe3a1094 100644 (file)
--- a/src/cpu/thread_context.hh
+++ b/src/cpu/thread_context.hh
@@ -31,8 +31,8 @@
 #ifndef __CPU_THREAD_CONTEXT_HH__
 #define __CPU_THREAD_CONTEXT_HH__
 
-#include <string>
 #include <iostream>
+#include <string>
 
 #include "arch/registers.hh"
 #include "arch/types.hh"

diff --git a/src/cpu/thread_state.hh b/src/cpu/thread_state.hh
index e0edc466e3150ac754e1dfca3c7c84752b4bd2a3..8245798521539bdf9687c4f703018905c04d9e88 100644 (file)
--- a/src/cpu/thread_state.hh
+++ b/src/cpu/thread_state.hh
@@ -33,9 +33,9 @@
 
 #include "arch/types.hh"
 #include "config/the_isa.hh"
+#include "cpu/base.hh"
 #include "cpu/profile.hh"
 #include "cpu/thread_context.hh"
-#include "cpu/base.hh"
 
 #if !FULL_SYSTEM
 #include "mem/mem_object.hh"

diff --git a/src/cpu/trace/opt_cpu.cc b/src/cpu/trace/opt_cpu.cc
index 10e71db7b1fec9d80f3b55145dd667cfb7acc8b5..b3a6d761b278622c475b218539325d5aeb5bddd4 100644 (file)
--- a/src/cpu/trace/opt_cpu.cc
+++ b/src/cpu/trace/opt_cpu.cc
@@ -36,8 +36,8 @@
 
 #include <algorithm> // For heap functions.
 
-#include "cpu/trace/opt_cpu.hh"
 #include "cpu/trace/reader/mem_trace_reader.hh"
+#include "cpu/trace/opt_cpu.hh"
 #include "params/OptCPU.hh"
 #include "sim/sim_events.hh"
 

diff --git a/src/cpu/trace/reader/ibm_reader.hh b/src/cpu/trace/reader/ibm_reader.hh
index a72f62e03042fd01d129b5d4ab9e25784802a01c..048c5dbda241884329e3c91785dbb6c5c44b1fe8 100644 (file)
--- a/src/cpu/trace/reader/ibm_reader.hh
+++ b/src/cpu/trace/reader/ibm_reader.hh
@@ -36,7 +36,8 @@
 #ifndef __IBM_READER_HH__
 #define __IBM_READER_HH__
 
-#include <stdio.h>
+#include <cstdio>
+
 #include "cpu/trace/reader/mem_trace_reader.hh"
 #include "mem/mem_req.hh"
 

diff --git a/src/cpu/trace/reader/itx_reader.hh b/src/cpu/trace/reader/itx_reader.hh
index 63a4c9ac95b696763e63b75a62c9176a7509576d..8dd1c9a62dc12509537e630920aa7e7a5b091370 100644 (file)
--- a/src/cpu/trace/reader/itx_reader.hh
+++ b/src/cpu/trace/reader/itx_reader.hh
@@ -36,13 +36,12 @@
 #ifndef __ITX_READER_HH__
 #define __ITX_READER_HH__
 
-#include <stdio.h>
+#include <cstdio>
 #include <string>
 
 #include "cpu/trace/reader/mem_trace_reader.hh"
 #include "mem/mem_req.hh"
 
-
 /**
  * A memory trace reader for the Intel ITX memory trace format.
  */

diff --git a/src/cpu/trace/reader/mem_trace_reader.hh b/src/cpu/trace/reader/mem_trace_reader.hh
index 628a3ecdcf6afb435007f2d43fd78af1bd7fe5fb..ed69efd5b3d141d30013193e9adf7c4077ab9e68 100644 (file)
--- a/src/cpu/trace/reader/mem_trace_reader.hh
+++ b/src/cpu/trace/reader/mem_trace_reader.hh
@@ -35,8 +35,8 @@
 #ifndef __MEM_TRACE_READER_HH__
 #define __MEM_TRACE_READER_HH__
 
-#include "sim/sim_object.hh"
 #include "mem/mem_req.hh" // For MemReqPtr
+#include "sim/sim_object.hh"
 
 /**
  * Pure virtual base class for memory trace readers.

diff --git a/src/cpu/trace/trace_cpu.cc b/src/cpu/trace/trace_cpu.cc
index 70aa1f042a3afd322b018c5dfc036f07a9f5f46e..85f269121e76e9c22c11ca06f1e1199ad8bb779f 100644 (file)
--- a/src/cpu/trace/trace_cpu.cc
+++ b/src/cpu/trace/trace_cpu.cc
@@ -36,8 +36,8 @@
 
 #include <algorithm> // For min
 
-#include "cpu/trace/trace_cpu.hh"
 #include "cpu/trace/reader/mem_trace_reader.hh"
+#include "cpu/trace/trace_cpu.hh"
 #include "mem/base_mem.hh" // For PARAM constructor
 #include "mem/mem_interface.hh"
 #include "params/TraceCPU.hh"

diff --git a/src/dev/alpha/tsunami.cc b/src/dev/alpha/tsunami.cc
index b36b5977dfa3111effc7b8cfe5b4b9f549c7ee86..34aab6ed02f718a93cf24366fa1f6029ebb33caf 100644 (file)
--- a/src/dev/alpha/tsunami.cc
+++ b/src/dev/alpha/tsunami.cc
@@ -38,10 +38,10 @@
 
 #include "config/the_isa.hh"
 #include "cpu/intr_control.hh"
+#include "dev/alpha/tsunami.hh"
 #include "dev/alpha/tsunami_cchip.hh"
-#include "dev/alpha/tsunami_pchip.hh"
 #include "dev/alpha/tsunami_io.hh"
-#include "dev/alpha/tsunami.hh"
+#include "dev/alpha/tsunami_pchip.hh"
 #include "dev/terminal.hh"
 #include "sim/system.hh"
 

diff --git a/src/dev/alpha/tsunami_io.cc b/src/dev/alpha/tsunami_io.cc
index c90f06b5a97825cf6a413a5d03090cfb8dc1ae90..37456ada2733029ab47dbc4e3cef5b1d37e902a2 100644 (file)
--- a/src/dev/alpha/tsunami_io.cc
+++ b/src/dev/alpha/tsunami_io.cc
@@ -43,11 +43,11 @@
 #include "base/time.hh"
 #include "base/trace.hh"
 #include "config/the_isa.hh"
-#include "dev/rtcreg.h"
-#include "dev/alpha/tsunami_cchip.hh"
 #include "dev/alpha/tsunami.hh"
+#include "dev/alpha/tsunami_cchip.hh"
 #include "dev/alpha/tsunami_io.hh"
 #include "dev/alpha/tsunamireg.h"
+#include "dev/rtcreg.h"
 #include "mem/packet.hh"
 #include "mem/packet_access.hh"
 #include "mem/port.hh"

diff --git a/src/dev/alpha/tsunami_io.hh b/src/dev/alpha/tsunami_io.hh
index b6d63322b61b94ef01c42a76f51a2cb84818a3e5..f88cf5a6cf30d4ac618f6e0645d2b8714238ce4a 100644 (file)
--- a/src/dev/alpha/tsunami_io.hh
+++ b/src/dev/alpha/tsunami_io.hh
@@ -40,8 +40,8 @@
 #include "base/range.hh"
 #include "dev/alpha/tsunami.hh"
 #include "dev/intel_8254_timer.hh"
-#include "dev/mc146818.hh"
 #include "dev/io_device.hh"
+#include "dev/mc146818.hh"
 #include "params/TsunamiIO.hh"
 #include "sim/eventq.hh"
 

diff --git a/src/dev/alpha/tsunami_pchip.cc b/src/dev/alpha/tsunami_pchip.cc
index df980cf797fc633f6bc16dcd1a5cc4824da6c28e..e293f63335fa2e5a5dc83a5c037d4e383c41747d 100644 (file)
--- a/src/dev/alpha/tsunami_pchip.cc
+++ b/src/dev/alpha/tsunami_pchip.cc
@@ -39,9 +39,9 @@
 
 #include "base/trace.hh"
 #include "config/the_isa.hh"
+#include "dev/alpha/tsunami.hh"
 #include "dev/alpha/tsunami_pchip.hh"
 #include "dev/alpha/tsunamireg.h"
-#include "dev/alpha/tsunami.hh"
 #include "mem/packet.hh"
 #include "mem/packet_access.hh"
 #include "sim/system.hh"

diff --git a/src/dev/arm/amba_device.cc b/src/dev/arm/amba_device.cc
index 37eb77ae1b1d8f1418618a83b176a56e1ac88494..b2948b803dd8118b0e69e026eaa3b79ddc360b59 100644 (file)
--- a/src/dev/arm/amba_device.cc
+++ b/src/dev/arm/amba_device.cc
@@ -41,8 +41,8 @@
  */
 
 #include "base/trace.hh"
-#include "dev/arm/amba_fake.hh"
 #include "dev/arm/amba_device.hh"
+#include "dev/arm/amba_fake.hh"
 #include "mem/packet.hh"
 #include "mem/packet_access.hh"
 

diff --git a/src/dev/arm/amba_device.hh b/src/dev/arm/amba_device.hh
index 297a78f8278f1de7c7154a10e104e16aeb79a26c..f3db8b0ab3f8d1c69cb2716e3efff949b47338ad 100644 (file)
--- a/src/dev/arm/amba_device.hh
+++ b/src/dev/arm/amba_device.hh
@@ -50,13 +50,13 @@
 #define __DEV_ARM_AMBA_DEVICE_HH__
 
 #include "base/range.hh"
-#include "dev/io_device.hh"
 #include "dev/arm/gic.hh"
+#include "dev/io_device.hh"
 #include "mem/packet.hh"
 #include "mem/packet_access.hh"
 #include "params/AmbaDevice.hh"
-#include "params/AmbaIntDevice.hh"
 #include "params/AmbaDmaDevice.hh"
+#include "params/AmbaIntDevice.hh"
 
 namespace AmbaDev {
 

diff --git a/src/dev/arm/kmi.cc b/src/dev/arm/kmi.cc
index adf1439b3b3a0a66349072241cf4ce0d269177b3..1b8c15b83fda2ef8f970005b1eafd733fe702728 100644 (file)
--- a/src/dev/arm/kmi.cc
+++ b/src/dev/arm/kmi.cc
@@ -41,8 +41,8 @@
  *          William Wang
  */
 
-#include "base/trace.hh"
 #include "base/vnc/vncserver.hh"
+#include "base/trace.hh"
 #include "dev/arm/amba_device.hh"
 #include "dev/arm/kmi.hh"
 #include "dev/ps2.hh"

diff --git a/src/dev/arm/kmi.hh b/src/dev/arm/kmi.hh
index 1e25f8974832938de435a8288a43c966b4fdf465..dc488ccce0df72cdaf09fcdac13b35f3044ae039 100644 (file)
--- a/src/dev/arm/kmi.hh
+++ b/src/dev/arm/kmi.hh
@@ -50,8 +50,8 @@
 
 #include <list>
 
-#include "base/range.hh"
 #include "base/vnc/vncserver.hh"
+#include "base/range.hh"
 #include "dev/arm/amba_device.hh"
 #include "params/Pl050.hh"
 

diff --git a/src/dev/arm/pl111.cc b/src/dev/arm/pl111.cc
index e5da82e73cb9736dcae78b8ebe59c3fbb782bcef..410c8d3615ea35dde8158be362c6f6062c648d26 100644 (file)
--- a/src/dev/arm/pl111.cc
+++ b/src/dev/arm/pl111.cc
@@ -38,10 +38,10 @@
  *          Ali Saidi
  */
 
+#include "base/vnc/vncserver.hh"
 #include "base/bitmap.hh"
 #include "base/output.hh"
 #include "base/trace.hh"
-#include "base/vnc/vncserver.hh"
 #include "dev/arm/amba_device.hh"
 #include "dev/arm/gic.hh"
 #include "dev/arm/pl111.hh"

diff --git a/src/dev/disk_image.cc b/src/dev/disk_image.cc
index aa8c98732fa221abbaf0d31d833b54d1b4a93986..6a06e74f6ffbda1539a07f1bd45ee55112b44839 100644 (file)
--- a/src/dev/disk_image.cc
+++ b/src/dev/disk_image.cc
@@ -34,9 +34,9 @@
 
 #include <sys/types.h>
 #include <sys/uio.h>
-#include <errno.h>
 #include <unistd.h>
 
+#include <cerrno>
 #include <cstring>
 #include <fstream>
 #include <string>
@@ -45,8 +45,8 @@
 #include "base/misc.hh"
 #include "base/trace.hh"
 #include "dev/disk_image.hh"
-#include "sim/sim_exit.hh"
 #include "sim/byteswap.hh"
+#include "sim/sim_exit.hh"
 
 using namespace std;
 

diff --git a/src/dev/disk_image.hh b/src/dev/disk_image.hh
index a5c70ec82a660392d8e6625a68758012f43ef0d9..3865562a078eb1dffe4ab8cd402343fdad004026 100644 (file)
--- a/src/dev/disk_image.hh
+++ b/src/dev/disk_image.hh
@@ -38,10 +38,10 @@
 #include <fstream>
 
 #include "base/hashmap.hh"
-#include "sim/sim_object.hh"
-#include "params/DiskImage.hh"
 #include "params/CowDiskImage.hh"
+#include "params/DiskImage.hh"
 #include "params/RawDiskImage.hh"
+#include "sim/sim_object.hh"
 
 #define SectorSize (512)
 

diff --git a/src/dev/etherbus.hh b/src/dev/etherbus.hh
index 6408f7f1f18d885fec560a37f0622314a0da889a..43978b9c23e490cbef9eea1bb889f568e27fd0a5 100644 (file)
--- a/src/dev/etherbus.hh
+++ b/src/dev/etherbus.hh
@@ -35,12 +35,11 @@
 #ifndef __ETHERBUS_H__
 #define __ETHERBUS_H__
 
-#include "sim/eventq.hh"
-#include "dev/etherpkt.hh"
 #include "dev/etherobject.hh"
+#include "dev/etherpkt.hh"
 #include "params/EtherBus.hh"
+#include "sim/eventq.hh"
 #include "sim/sim_object.hh"
-#include "params/EtherBus.hh"
 
 class EtherDump;
 class EtherInt;

diff --git a/src/dev/etherdump.hh b/src/dev/etherdump.hh
index cf4213b2766edfedc068f94798d8769116018fae..cc8fa9151262a11aec534e7385756d50221472da 100644 (file)
--- a/src/dev/etherdump.hh
+++ b/src/dev/etherdump.hh
@@ -36,9 +36,10 @@
 #define __ETHERDUMP_H__
 
 #include <fstream>
+
 #include "dev/etherpkt.hh"
-#include "sim/sim_object.hh"
 #include "params/EtherDump.hh"
+#include "sim/sim_object.hh"
 
 /*
  * Simple object for creating a simple pcap style packet trace

diff --git a/src/dev/etherint.cc b/src/dev/etherint.cc
index e9f8307021f6aff00a16ae319d7981e388daa34a..fce7b28c658165dcdd6473d695bd7fa010134a7e 100644 (file)
--- a/src/dev/etherint.cc
+++ b/src/dev/etherint.cc
@@ -28,8 +28,8 @@
  * Authors: Nathan Binkert
  */
 
-#include "dev/etherint.hh"
 #include "base/misc.hh"
+#include "dev/etherint.hh"
 #include "sim/sim_object.hh"
 
 void

diff --git a/src/dev/etherlink.cc b/src/dev/etherlink.cc
index 9d8d8cfa881e5d70be827e426e9de24640c89d37..dcecfd9337e4956bbaf2c44b316a31087235781f 100644 (file)
--- a/src/dev/etherlink.cc
+++ b/src/dev/etherlink.cc
@@ -45,9 +45,9 @@
 #include "dev/etherlink.hh"
 #include "dev/etherpkt.hh"
 #include "params/EtherLink.hh"
+#include "sim/core.hh"
 #include "sim/serialize.hh"
 #include "sim/system.hh"
-#include "sim/core.hh"
 
 using namespace std;
 

diff --git a/src/dev/etherlink.hh b/src/dev/etherlink.hh
index c47948f5838a6462478c639cd8739d66138fd688..ca17b837da708b48c60ad7d94295f420ee163c61 100644 (file)
--- a/src/dev/etherlink.hh
+++ b/src/dev/etherlink.hh
@@ -40,7 +40,6 @@
 #include "dev/etherobject.hh"
 #include "dev/etherpkt.hh"
 #include "params/EtherLink.hh"
-#include "params/EtherLink.hh"
 #include "sim/eventq.hh"
 #include "sim/sim_object.hh"
 

diff --git a/src/dev/ethertap.cc b/src/dev/ethertap.cc
index 76952e5c012df9cb6a76110d162538e000eb2797..401ea8a839b145bd047c1bdd788ab574fffd6f7a 100644 (file)
--- a/src/dev/ethertap.cc
+++ b/src/dev/ethertap.cc
@@ -36,7 +36,6 @@
 #include <sys/param.h>
 #endif
 #include <netinet/in.h>
-
 #include <unistd.h>
 
 #include <deque>

diff --git a/src/dev/ethertap.hh b/src/dev/ethertap.hh
index 94957b2ce37d4b0a557263961e142a2a190e326d..2f38d57b49ad2f13305ed3557e1b5e3c7c314ea7 100644 (file)
--- a/src/dev/ethertap.hh
+++ b/src/dev/ethertap.hh
@@ -39,8 +39,8 @@
 #include <string>
 
 #include "base/pollevent.hh"
-#include "dev/etherobject.hh"
 #include "dev/etherint.hh"
+#include "dev/etherobject.hh"
 #include "dev/etherpkt.hh"
 #include "params/EtherTap.hh"
 #include "sim/eventq.hh"

diff --git a/src/dev/ide_ctrl.hh b/src/dev/ide_ctrl.hh
index 430b3fc1b1868e95a4a1249b73b33ef6f4e50a08..93291ad6633883d2e645a44331ef5d7ce2427347 100644 (file)
--- a/src/dev/ide_ctrl.hh
+++ b/src/dev/ide_ctrl.hh
@@ -38,9 +38,9 @@
 #define __IDE_CTRL_HH__
 
 #include "base/bitunion.hh"
+#include "dev/io_device.hh"
 #include "dev/pcidev.hh"
 #include "dev/pcireg.h"
-#include "dev/io_device.hh"
 #include "params/IdeController.hh"
 
 class IdeDisk;

diff --git a/src/dev/ide_disk.cc b/src/dev/ide_disk.cc
index a30811d4ec7e18961ca1eb7cd38ee02c382e3144..c6c020e5c35277ed8ff15b05c3aea4de53d83a93 100644 (file)
--- a/src/dev/ide_disk.cc
+++ b/src/dev/ide_disk.cc
@@ -39,10 +39,10 @@
 #include <string>
 
 #include "arch/isa_traits.hh"
-#include "config/the_isa.hh"
 #include "base/chunk_generator.hh"
 #include "base/cprintf.hh" // csprintf
 #include "base/trace.hh"
+#include "config/the_isa.hh"
 #include "dev/disk_image.hh"
 #include "dev/ide_ctrl.hh"
 #include "dev/ide_disk.hh"

diff --git a/src/dev/ide_disk.hh b/src/dev/ide_disk.hh
index 78a9e1fe7ba05fb943ddc47df75a4f8b4f28cb32..0595e18cf9de739034f6f8c1d781f6361806f532 100644 (file)
--- a/src/dev/ide_disk.hh
+++ b/src/dev/ide_disk.hh
@@ -41,9 +41,8 @@
 #include "dev/ide_ctrl.hh"
 #include "dev/ide_wdcreg.h"
 #include "dev/io_device.hh"
-#include "sim/eventq.hh"
 #include "params/IdeDisk.hh"
-
+#include "sim/eventq.hh"
 
 class ChunkGenerator;
 

diff --git a/src/dev/intel_8254_timer.hh b/src/dev/intel_8254_timer.hh
index 30ddc7bcae148fa59612c30b6ffb9bef104866ea..bdfdf36ccef53cc03f8eca91ccf751e893cf2dfb 100644 (file)
--- a/src/dev/intel_8254_timer.hh
+++ b/src/dev/intel_8254_timer.hh
@@ -33,8 +33,8 @@
 #ifndef __DEV_8254_HH__
 #define __DEV_8254_HH__
 
-#include <string>
 #include <iostream>
+#include <string>
 
 #include "base/bitunion.hh"
 #include "base/types.hh"

diff --git a/src/dev/io_device.cc b/src/dev/io_device.cc
index ffe8fdf06d1e7d211842fbdfec94c292244bc051..b9c47adc66e9f0d55d6b6013fd2c122740ce1e37 100644 (file)
--- a/src/dev/io_device.cc
+++ b/src/dev/io_device.cc
@@ -34,7 +34,6 @@
 #include "dev/io_device.hh"
 #include "sim/system.hh"
 
-
 PioPort::PioPort(PioDevice *dev, System *s, std::string pname)
     : SimpleTimingPort(dev->name() + pname, dev), device(dev)
 { }

diff --git a/src/dev/isa_fake.hh b/src/dev/isa_fake.hh
index 1fd2415cb91bee736afa6f401727ec9a0a7f0db8..07657ad7dfc141a4128ddd484018fba7b7b8eadb 100644 (file)
--- a/src/dev/isa_fake.hh
+++ b/src/dev/isa_fake.hh
@@ -40,8 +40,8 @@
 #include "base/range.hh"
 #include "dev/io_device.hh"
 // #include "dev/alpha/tsunami.hh"
-#include "params/IsaFake.hh"
 #include "mem/packet.hh"
+#include "params/IsaFake.hh"
 
 /**
  * IsaFake is a device that returns, BadAddr, 1 or 0 on all reads and

diff --git a/src/dev/mc146818.cc b/src/dev/mc146818.cc
index 987b1bcd338680d009d31bb2c57a9f2b42a13963..c29bb94b423f57131582cb3a599e643c9a37cf13 100644 (file)
--- a/src/dev/mc146818.cc
+++ b/src/dev/mc146818.cc
@@ -31,8 +31,8 @@
  */
 
 #include <sys/time.h>
-#include <time.h>
 
+#include <ctime>
 #include <string>
 
 #include "base/bitfield.hh"

diff --git a/src/dev/mips/malta.cc b/src/dev/mips/malta.cc
index 73dc9f11626cbcc7afd4588aa6e38ceebdabf4a7..bcf970745b248215eca59e81988219180b19922a 100755 (executable)
--- a/src/dev/mips/malta.cc
+++ b/src/dev/mips/malta.cc
@@ -39,10 +39,10 @@
 
 #include "config/the_isa.hh"
 #include "cpu/intr_control.hh"
+#include "dev/mips/malta.hh"
 #include "dev/mips/malta_cchip.hh"
-#include "dev/mips/malta_pchip.hh"
 #include "dev/mips/malta_io.hh"
-#include "dev/mips/malta.hh"
+#include "dev/mips/malta_pchip.hh"
 #include "dev/terminal.hh"
 #include "params/Malta.hh"
 #include "sim/system.hh"

diff --git a/src/dev/mips/malta_cchip.hh b/src/dev/mips/malta_cchip.hh
index 667b06b3fe1714644e3870fd883ba0decf569018..4841551c4ba71e754be5d9e33d20f68165ea7259 100755 (executable)
--- a/src/dev/mips/malta_cchip.hh
+++ b/src/dev/mips/malta_cchip.hh
@@ -36,8 +36,8 @@
 #ifndef __MALTA_CCHIP_HH__
 #define __MALTA_CCHIP_HH__
 
-#include "dev/mips/malta.hh"
 #include "base/range.hh"
+#include "dev/mips/malta.hh"
 #include "dev/io_device.hh"
 #include "params/MaltaCChip.hh"
 

diff --git a/src/dev/mips/malta_io.cc b/src/dev/mips/malta_io.cc
index a7c68a3bcb7c322b5aabb1dd4298ac9fbc6d737c..bd9288487c530b88ce298868c8068e05a42fea7f 100755 (executable)
--- a/src/dev/mips/malta_io.cc
+++ b/src/dev/mips/malta_io.cc
@@ -43,11 +43,11 @@
 #include "base/time.hh"
 #include "base/trace.hh"
 #include "config/the_isa.hh"
-#include "dev/rtcreg.h"
-#include "dev/mips/malta_cchip.hh"
 #include "dev/mips/malta.hh"
+#include "dev/mips/malta_cchip.hh"
 #include "dev/mips/malta_io.hh"
 #include "dev/mips/maltareg.h"
+#include "dev/rtcreg.h"
 #include "mem/packet.hh"
 #include "mem/packet_access.hh"
 #include "mem/port.hh"

diff --git a/src/dev/mips/malta_pchip.cc b/src/dev/mips/malta_pchip.cc
index 0354330218135edb036e37ee3d42cc8a69e6ca47..7832a31bd57e66233bcf121ad4d9e7911d7e7d2e 100755 (executable)
--- a/src/dev/mips/malta_pchip.cc
+++ b/src/dev/mips/malta_pchip.cc
@@ -39,9 +39,9 @@
 
 #include "base/trace.hh"
 #include "config/the_isa.hh"
+#include "dev/mips/malta.hh"
 #include "dev/mips/malta_pchip.hh"
 #include "dev/mips/maltareg.h"
-#include "dev/mips/malta.hh"
 #include "mem/packet.hh"
 #include "mem/packet_access.hh"
 #include "sim/system.hh"

diff --git a/src/dev/mips/malta_pchip.hh b/src/dev/mips/malta_pchip.hh
index 62cdc886e2701a581333ecfd265afb6e6c842b5b..a554e253e248c5003c5fce550db8a072836727ee 100755 (executable)
--- a/src/dev/mips/malta_pchip.hh
+++ b/src/dev/mips/malta_pchip.hh
@@ -35,8 +35,8 @@
 #ifndef __MALTA_PCHIP_HH__
 #define __MALTA_PCHIP_HH__
 
-#include "dev/mips/malta.hh"
 #include "base/range.hh"
+#include "dev/mips/malta.hh"
 #include "dev/io_device.hh"
 #include "params/MaltaPChip.hh"
 

diff --git a/src/dev/pciconfigall.hh b/src/dev/pciconfigall.hh
index fbd0223406285de3c2728386e3cecc058b54f484..b3f6d14725dac40b299a7d41c6629bd4c8a1e48a 100644 (file)
--- a/src/dev/pciconfigall.hh
+++ b/src/dev/pciconfigall.hh
@@ -37,12 +37,11 @@
 #ifndef __PCICONFIGALL_HH__
 #define __PCICONFIGALL_HH__
 
-#include "dev/pcireg.h"
 #include "base/range.hh"
 #include "dev/io_device.hh"
+#include "dev/pcireg.h"
 #include "params/PciConfigAll.hh"
 
-
 /**
  * PCI Config Space
  * All of PCI config space needs to return -1 on Tsunami, except

diff --git a/src/dev/platform.hh b/src/dev/platform.hh
index 00d90a286e8ff21189f6519c808dcf2a8416d561..a3f2398657d0654469053cde39c9cd1ed913edc3 100644 (file)
--- a/src/dev/platform.hh
+++ b/src/dev/platform.hh
@@ -40,8 +40,8 @@
 #include <bitset>
 #include <set>
 
-#include "sim/sim_object.hh"
 #include "params/Platform.hh"
+#include "sim/sim_object.hh"
 
 class PciConfigAll;
 class IntrControl;

diff --git a/src/dev/ps2.cc b/src/dev/ps2.cc
index fe90ce6bc3c5281daf78211a56668750d2888dc9..dbcdfcaec38069f7115b94a7f51ee1a135883120 100644 (file)
--- a/src/dev/ps2.cc
+++ b/src/dev/ps2.cc
@@ -38,11 +38,10 @@
  */
 
 #include <list>
-#include "x11keysym/keysym.h"
 
 #include "base/misc.hh"
 #include "dev/ps2.hh"
-
+#include "x11keysym/keysym.h"
 
 namespace Ps2 {
 

diff --git a/src/dev/simple_disk.hh b/src/dev/simple_disk.hh
index 83ba622e636c3b2cffe340e5130da5535f78ad26..1a95bd59fb76fb81838913a723e8a7bb79130048 100644 (file)
--- a/src/dev/simple_disk.hh
+++ b/src/dev/simple_disk.hh
@@ -35,8 +35,8 @@
 #ifndef __DEV_SIMPLE_DISK_HH__
 #define __DEV_SIMPLE_DISK_HH__
 
-#include "sim/sim_object.hh"
 #include "params/SimpleDisk.hh"
+#include "sim/sim_object.hh"
 
 class DiskImage;
 class System;

diff --git a/src/dev/sparc/iob.cc b/src/dev/sparc/iob.cc
index 0b03aceb6f1078cfe54fb8f086cda1d414d3e190..9bf8eca1577a6760124d8247e2c21dfde615a2bf 100644 (file)
--- a/src/dev/sparc/iob.cc
+++ b/src/dev/sparc/iob.cc
@@ -37,15 +37,15 @@
 
 #include <cstring>
 
-#include "arch/sparc/isa_traits.hh"
 #include "arch/sparc/faults.hh"
+#include "arch/sparc/isa_traits.hh"
 #include "base/bitfield.hh"
 #include "base/trace.hh"
 #include "cpu/intr_control.hh"
 #include "dev/sparc/iob.hh"
 #include "dev/platform.hh"
-#include "mem/port.hh"
 #include "mem/packet_access.hh"
+#include "mem/port.hh"
 #include "sim/faults.hh"
 #include "sim/system.hh"
 

diff --git a/src/dev/sparc/iob.hh b/src/dev/sparc/iob.hh
index b2fd6cbf62f882866b256c4ca62352a01fd410b3..7391b1ccd93e6ca86a2e6300f82ba2247981fd51 100644 (file)
--- a/src/dev/sparc/iob.hh
+++ b/src/dev/sparc/iob.hh
@@ -37,8 +37,8 @@
 #define __DEV_SPARC_IOB_HH__
 
 #include "base/range.hh"
-#include "dev/io_device.hh"
 #include "dev/disk_image.hh"
+#include "dev/io_device.hh"
 #include "params/Iob.hh"
 
 class IntrControl;

diff --git a/src/dev/sparc/mm_disk.cc b/src/dev/sparc/mm_disk.cc
index f0d51eef40ef2bde95ff15041188c1c9c3297a46..f9a91ededc9a0b8170c94ab222cf4b7b31b822a6 100644 (file)
--- a/src/dev/sparc/mm_disk.cc
+++ b/src/dev/sparc/mm_disk.cc
@@ -38,8 +38,8 @@
 #include "base/trace.hh"
 #include "dev/sparc/mm_disk.hh"
 #include "dev/platform.hh"
-#include "mem/port.hh"
 #include "mem/packet_access.hh"
+#include "mem/port.hh"
 #include "sim/byteswap.hh"
 #include "sim/system.hh"
 

diff --git a/src/dev/sparc/mm_disk.hh b/src/dev/sparc/mm_disk.hh
index 41ec0cc5945f7cb99dfa24a975c5ea83f1ea6f1c..0e43449a1406aeb2295f875f2b22379acbe6f991 100644 (file)
--- a/src/dev/sparc/mm_disk.hh
+++ b/src/dev/sparc/mm_disk.hh
@@ -37,8 +37,8 @@
 #define __DEV_SPARC_MM_DISK_HH__
 
 #include "base/range.hh"
-#include "dev/io_device.hh"
 #include "dev/disk_image.hh"
+#include "dev/io_device.hh"
 #include "params/MmDisk.hh"
 
 class MmDisk : public BasicPioDevice

diff --git a/src/dev/terminal.cc b/src/dev/terminal.cc
index fba0c61307faff21242f277fd518412e98ccc3ca..637061082bb8a4761e8185dad8a7a47073acafc5 100644 (file)
--- a/src/dev/terminal.cc
+++ b/src/dev/terminal.cc
@@ -35,13 +35,13 @@
 
 #include <sys/ioctl.h>
 #include <sys/termios.h>
-#include <errno.h>
 #include <poll.h>
 #include <unistd.h>
 
 #include <cctype>
-#include <iostream>
+#include <cerrno>
 #include <fstream>
+#include <iostream>
 #include <sstream>
 #include <string>
 

diff --git a/src/dev/terminal.hh b/src/dev/terminal.hh
index d2499b6b29f4f91e2ad3d86252a76cf08eb84abe..e2322d7c242ab56fd7cdb7878a35587f8185679c 100644 (file)
--- a/src/dev/terminal.hh
+++ b/src/dev/terminal.hh
@@ -39,11 +39,11 @@
 #include <iostream>
 
 #include "base/circlebuf.hh"
-#include "cpu/intr_control.hh"
 #include "base/pollevent.hh"
 #include "base/socket.hh"
-#include "sim/sim_object.hh"
+#include "cpu/intr_control.hh"
 #include "params/Terminal.hh"
+#include "sim/sim_object.hh"
 
 class TerminalListener;
 class Uart;

diff --git a/src/dev/x86/i8042.hh b/src/dev/x86/i8042.hh
index b14d254ca8e571b5f4796c520a128004074a24e7..be12c4e96a55a7c4d32a071189fc68b19cf44e6f 100644 (file)
--- a/src/dev/x86/i8042.hh
+++ b/src/dev/x86/i8042.hh
@@ -31,12 +31,12 @@
 #ifndef __DEV_X86_I8042_HH__
 #define __DEV_X86_I8042_HH__
 
-#include "dev/io_device.hh"
+#include <queue>
+
 #include "dev/x86/intdev.hh"
+#include "dev/io_device.hh"
 #include "params/I8042.hh"
 
-#include <queue>
-
 namespace X86ISA
 {
 

diff --git a/src/dev/x86/i82094aa.hh b/src/dev/x86/i82094aa.hh
index 8be23d2c964a7cafae467e4b391a5773e1684faa..ae0322d940a560cd56f071f32562e2d656c1aa52 100644 (file)
--- a/src/dev/x86/i82094aa.hh
+++ b/src/dev/x86/i82094aa.hh
@@ -31,14 +31,14 @@
 #ifndef __DEV_X86_I82094AA_HH__
 #define __DEV_X86_I82094AA_HH__
 
+#include <map>
+
 #include "base/bitunion.hh"
 #include "base/range_map.hh"
-#include "dev/io_device.hh"
 #include "dev/x86/intdev.hh"
+#include "dev/io_device.hh"
 #include "params/I82094AA.hh"
 
-#include <map>
-
 namespace X86ISA
 {
 

diff --git a/src/dev/x86/i8259.hh b/src/dev/x86/i8259.hh
index 2a5d5f6aa2b481d0de90fdfd9cd6f05905e5050c..eee5ec171d2b686bc4ee85e0f3043d5166bcb35a 100644 (file)
--- a/src/dev/x86/i8259.hh
+++ b/src/dev/x86/i8259.hh
@@ -31,10 +31,10 @@
 #ifndef __DEV_X86_I8259_HH__
 #define __DEV_X86_I8259_HH__
 
-#include "dev/io_device.hh"
 #include "dev/x86/intdev.hh"
-#include "params/I8259.hh"
+#include "dev/io_device.hh"
 #include "enums/X86I8259CascadeMode.hh"
+#include "params/I8259.hh"
 
 namespace X86ISA
 {

diff --git a/src/dev/x86/intdev.hh b/src/dev/x86/intdev.hh
index b26b081bffc08863d57c419b69b05c0da22cf400..1b3efdbb51f8912c8e9cd6b64006ea7f7b244832 100644 (file)
--- a/src/dev/x86/intdev.hh
+++ b/src/dev/x86/intdev.hh
@@ -32,18 +32,17 @@
 #define __DEV_X86_INTDEV_HH__
 
 #include <cassert>
+#include <list>
 #include <string>
 
-#include "arch/x86/x86_traits.hh"
 #include "arch/x86/intmessage.hh"
+#include "arch/x86/x86_traits.hh"
 #include "mem/mem_object.hh"
 #include "mem/mport.hh"
-#include "sim/sim_object.hh"
-#include "params/X86IntSourcePin.hh"
-#include "params/X86IntSinkPin.hh"
 #include "params/X86IntLine.hh"
-
-#include <list>
+#include "params/X86IntSinkPin.hh"
+#include "params/X86IntSourcePin.hh"
+#include "sim/sim_object.hh"
 
 namespace X86ISA {
 

diff --git a/src/dev/x86/pc.cc b/src/dev/x86/pc.cc
index e3449abf60e33b2f37e7f8dd9d7e6d91dbe7d406..7912a45e162c9267c30e55c5e83a952a3b2511d0 100644 (file)
--- a/src/dev/x86/pc.cc
+++ b/src/dev/x86/pc.cc
@@ -40,12 +40,12 @@
 #include "arch/x86/x86_traits.hh"
 #include "config/the_isa.hh"
 #include "cpu/intr_control.hh"
-#include "dev/terminal.hh"
 #include "dev/x86/i82094aa.hh"
 #include "dev/x86/i8254.hh"
 #include "dev/x86/i8259.hh"
 #include "dev/x86/pc.hh"
 #include "dev/x86/south_bridge.hh"
+#include "dev/terminal.hh"
 #include "sim/system.hh"
 
 using namespace std;

diff --git a/src/dev/x86/south_bridge.hh b/src/dev/x86/south_bridge.hh
index 61d6d387aa576d14a12657e3fa47603b80c363c0..b9ef17d287f4b88c5cbf311db9bedc475fec091c 100644 (file)
--- a/src/dev/x86/south_bridge.hh
+++ b/src/dev/x86/south_bridge.hh
@@ -31,8 +31,8 @@
 #ifndef __DEV_X86_SOUTH_BRIDGE_HH__
 #define __DEV_X86_SOUTH_BRIDGE_HH__
 
-#include "sim/sim_object.hh"
 #include "params/SouthBridge.hh"
+#include "sim/sim_object.hh"
 
 namespace X86ISA
 {

diff --git a/src/kern/kernel_stats.cc b/src/kern/kernel_stats.cc
index d1de00fcdc4f1d53c7b5fab0a9132de79e8354e6..09c1a6760723b2843403676bd46d0354c2c1e9a3 100644 (file)
--- a/src/kern/kernel_stats.cc
+++ b/src/kern/kernel_stats.cc
@@ -33,8 +33,8 @@
 
 #include "base/trace.hh"
 #include "cpu/thread_context.hh"
-#include "kern/kernel_stats.hh"
 #include "kern/tru64/tru64_syscalls.hh"
+#include "kern/kernel_stats.hh"
 #include "sim/system.hh"
 
 using namespace std;

diff --git a/src/kern/kernel_stats.hh b/src/kern/kernel_stats.hh
index 5395b3337f8da4fd1177ca4bd36ac995399063c7..e4ca67fcb470711b7a156dbf4edc8482fce6db74 100644 (file)
--- a/src/kern/kernel_stats.hh
+++ b/src/kern/kernel_stats.hh
@@ -35,8 +35,8 @@
 #include <string>
 
 #include "cpu/static_inst.hh"
-#include "sim/stats.hh"
 #include "sim/serialize.hh"
+#include "sim/stats.hh"
 
 class BaseCPU;
 class ThreadContext;

diff --git a/src/kern/linux/events.cc b/src/kern/linux/events.cc
index 651dae3d695e75a8f96be289608316212c550242..2133172e25439d2ee89f23c5a533cf86aea90e53 100644 (file)
--- a/src/kern/linux/events.cc
+++ b/src/kern/linux/events.cc
@@ -43,8 +43,8 @@
 
 #include <sstream>
 
-#include "base/trace.hh"
 #include "arch/utility.hh"
+#include "base/trace.hh"
 #include "cpu/thread_context.hh"
 #include "kern/linux/events.hh"
 #include "kern/linux/printk.hh"

diff --git a/src/kern/linux/printk.cc b/src/kern/linux/printk.cc
index 577245f95a75da29b4b48a47d3ec15cce8af56e4..a19d81b086cda68e31125ee8fb4e173d039febae 100644 (file)
--- a/src/kern/linux/printk.cc
+++ b/src/kern/linux/printk.cc
@@ -30,11 +30,12 @@
  */
 
 #include <sys/types.h>
+
 #include <algorithm>
 
-#include "sim/arguments.hh"
 #include "base/trace.hh"
 #include "kern/linux/printk.hh"
+#include "sim/arguments.hh"
 
 using namespace std;
 

diff --git a/src/kern/operatingsystem.cc b/src/kern/operatingsystem.cc
index 8951b8193e1c7df34540b9d6024812bdee418520..62fcdba7a72609187bbf02b46f922deb1467cb36 100644 (file)
--- a/src/kern/operatingsystem.cc
+++ b/src/kern/operatingsystem.cc
@@ -29,8 +29,8 @@
  */
 
 
-#include "kern/operatingsystem.hh"
 #include "base/misc.hh"
+#include "kern/operatingsystem.hh"
 
 int
 OperatingSystem::openSpecialFile(std::string path, LiveProcess *process, ThreadContext *tc)

diff --git a/src/kern/tru64/dump_mbuf.cc b/src/kern/tru64/dump_mbuf.cc
index 207d307920ca33742afc316b5749e7920fb7b097..fda1753d34bc0393553871b8007fd94fbaa5d987 100644 (file)
--- a/src/kern/tru64/dump_mbuf.cc
+++ b/src/kern/tru64/dump_mbuf.cc
@@ -29,12 +29,13 @@
  */
 
 #include <sys/types.h>
+
 #include <algorithm>
 
 #include "arch/isa_traits.hh"
 #include "arch/vtophys.hh"
-#include "base/cprintf.hh"
 #include "base/loader/symtab.hh"
+#include "base/cprintf.hh"
 #include "base/trace.hh"
 #include "base/types.hh"
 #include "config/the_isa.hh"

diff --git a/src/kern/tru64/printf.cc b/src/kern/tru64/printf.cc
index 921b028a553d5cf043103484ee174a45efce99d7..600e9681893cbf209e5b3caef167c3df9ce05cba 100644 (file)
--- a/src/kern/tru64/printf.cc
+++ b/src/kern/tru64/printf.cc
@@ -29,6 +29,7 @@
  */
 
 #include <sys/types.h>
+
 #include <algorithm>
 
 #include "arch/vtophys.hh"

diff --git a/src/kern/tru64/tru64.hh b/src/kern/tru64/tru64.hh
index aa3c4bb506cacc55c143160e92ff220292a4e7a0..7e7fedbc30025b1bd89165cc33901c6ce8e689d6 100644 (file)
--- a/src/kern/tru64/tru64.hh
+++ b/src/kern/tru64/tru64.hh
@@ -42,23 +42,24 @@ class Tru64 {};
 
 #else //!FULL_SYSTEM
 
-#include <sys/types.h>
 #include <sys/stat.h>
+#include <sys/types.h>
 #if defined(__OpenBSD__) || defined(__APPLE__) || defined(__FreeBSD__)
-#include <sys/param.h>
 #include <sys/mount.h>
+#include <sys/param.h>
 #else
 #include <sys/statfs.h>
 #endif
 
 #include <dirent.h>
-#include <errno.h>
 #include <fcntl.h>
-#include <string.h>     // for memset()
 #include <unistd.h>
 
-#include "config/the_isa.hh"
+#include <cerrno>
+#include <cstring>     // for memset()
+
 #include "arch/alpha/registers.hh"
+#include "config/the_isa.hh"
 #include "cpu/base.hh"
 #include "sim/core.hh"
 #include "sim/syscall_emul.hh"

diff --git a/src/kern/tru64/tru64_events.cc b/src/kern/tru64/tru64_events.cc
index 460f75dea975743461e9a727e4ad4645149dc146..7b8cf0db970e94ac31c7677cbcd8d8fde55927ee 100644 (file)
--- a/src/kern/tru64/tru64_events.cc
+++ b/src/kern/tru64/tru64_events.cc
@@ -32,12 +32,12 @@
 #include "arch/alpha/ev5.hh"
 #include "arch/isa_traits.hh"
 #include "config/the_isa.hh"
-#include "cpu/thread_context.hh"
 #include "cpu/base.hh"
-#include "kern/system_events.hh"
-#include "kern/tru64/tru64_events.hh"
+#include "cpu/thread_context.hh"
 #include "kern/tru64/dump_mbuf.hh"
 #include "kern/tru64/printf.hh"
+#include "kern/tru64/tru64_events.hh"
+#include "kern/system_events.hh"
 #include "sim/arguments.hh"
 #include "sim/system.hh"
 

diff --git a/src/mem/bridge.hh b/src/mem/bridge.hh
index 0583b29a6eb67c40040a5108fd0128ee83a6a21e..732717dd4ec84d05d09162a89230262f4630abad 100644 (file)
--- a/src/mem/bridge.hh
+++ b/src/mem/bridge.hh
@@ -37,9 +37,9 @@
 #ifndef __MEM_BRIDGE_HH__
 #define __MEM_BRIDGE_HH__
 
-#include <string>
 #include <list>
 #include <queue>
+#include <string>
 
 #include "base/fast_alloc.hh"
 #include "base/types.hh"

diff --git a/src/mem/bus.hh b/src/mem/bus.hh
index ba02e3328709d6b3d7a7ef469babbc164f98c61c..17d22ec831e74b1848a304f55101235b58156d03 100644 (file)
--- a/src/mem/bus.hh
+++ b/src/mem/bus.hh
@@ -37,9 +37,9 @@
 #ifndef __MEM_BUS_HH__
 #define __MEM_BUS_HH__
 
-#include <string>
-#include <set>
 #include <list>
+#include <set>
+#include <string>
 
 #include "base/hashmap.hh"
 #include "base/range.hh"

diff --git a/src/mem/cache/base.hh b/src/mem/cache/base.hh
index 28ddf5054d5f268f145405b406b3e930a916413b..d1ddedbd4534c436ac592e9c8c7f993b8e91303e 100644 (file)
--- a/src/mem/cache/base.hh
+++ b/src/mem/cache/base.hh
@@ -51,8 +51,8 @@
 #include "mem/cache/mshr_queue.hh"
 #include "mem/mem_object.hh"
 #include "mem/packet.hh"
-#include "mem/tport.hh"
 #include "mem/request.hh"
+#include "mem/tport.hh"
 #include "params/BaseCache.hh"
 #include "sim/eventq.hh"
 #include "sim/sim_exit.hh"

diff --git a/src/mem/cache/blk.hh b/src/mem/cache/blk.hh
index bf17a303a446c5d26f547bf89b1809eabf20f0ef..e70760edd6a27246d1ad4456a879e011b0b6ecf2 100644 (file)
--- a/src/mem/cache/blk.hh
+++ b/src/mem/cache/blk.hh
@@ -38,9 +38,9 @@
 #include <list>
 
 #include "base/printable.hh"
-#include "sim/core.hh"          // for Tick
 #include "mem/packet.hh"
 #include "mem/request.hh"
+#include "sim/core.hh"          // for Tick
 
 /**
  * Cache block status bit assignments

diff --git a/src/mem/cache/builder.cc b/src/mem/cache/builder.cc
index d4ef886f0d16b602af7d2ade2451bfe1aa76a238..e2c14ef5b85ff66df3af3ae14bed9eb3880eb326 100644 (file)
--- a/src/mem/cache/builder.cc
+++ b/src/mem/cache/builder.cc
@@ -38,9 +38,9 @@
 
 #include "config/the_isa.hh"
 #include "enums/Prefetch.hh"
-#include "mem/config/cache.hh"
 #include "mem/cache/base.hh"
 #include "mem/cache/cache.hh"
+#include "mem/config/cache.hh"
 #include "mem/bus.hh"
 #include "params/BaseCache.hh"
 
@@ -59,9 +59,8 @@
 
 //Prefetcher Headers
 #include "mem/cache/prefetch/ghb.hh"
-#include "mem/cache/prefetch/tagged.hh"
 #include "mem/cache/prefetch/stride.hh"
-
+#include "mem/cache/prefetch/tagged.hh"
 
 using namespace std;
 

diff --git a/src/mem/cache/cache.hh b/src/mem/cache/cache.hh
index e15747c3f1952f337c603ffecdbd1e29270161cd..1ed138bb5e9ee65d38d60d899acec15f0b3b58f0 100644 (file)
--- a/src/mem/cache/cache.hh
+++ b/src/mem/cache/cache.hh
@@ -40,11 +40,9 @@
 #define __CACHE_HH__
 
 #include "base/misc.hh" // fatal, panic, and warn
-
 #include "mem/cache/base.hh"
 #include "mem/cache/blk.hh"
 #include "mem/cache/mshr.hh"
-
 #include "sim/eventq.hh"
 
 //Forward decleration

diff --git a/src/mem/cache/cache_impl.hh b/src/mem/cache/cache_impl.hh
index 0b2b273f9683ba9057ade605ff75f6955efe20f9..5fb95fc063e44ecea2084f7ed4f648418b496292 100644 (file)
--- a/src/mem/cache/cache_impl.hh
+++ b/src/mem/cache/cache_impl.hh
@@ -54,10 +54,10 @@
 #include "base/misc.hh"
 #include "base/range.hh"
 #include "base/types.hh"
+#include "mem/cache/prefetch/base.hh"
 #include "mem/cache/blk.hh"
 #include "mem/cache/cache.hh"
 #include "mem/cache/mshr.hh"
-#include "mem/cache/prefetch/base.hh"
 #include "sim/sim_exit.hh"
 
 template<class TagStore>

diff --git a/src/mem/cache/mshr_queue.hh b/src/mem/cache/mshr_queue.hh
index 5a8739fc7d1203f736c292f1a0a9ce884dbc2361..89dd87fb40b10f19a99275cb0fb16942ff957074 100644 (file)
--- a/src/mem/cache/mshr_queue.hh
+++ b/src/mem/cache/mshr_queue.hh
@@ -37,8 +37,8 @@
 
 #include <vector>
 
-#include "mem/packet.hh"
 #include "mem/cache/mshr.hh"
+#include "mem/packet.hh"
 
 /**
  * A Class for maintaining a list of pending and allocated memory requests.

diff --git a/src/mem/cache/prefetch/base.cc b/src/mem/cache/prefetch/base.cc
index ad7a0c88275d6468154b0b17c0a8349a1be6dc0f..c81f02933739497547ac84417a8a5f1e2e69f08a 100644 (file)
--- a/src/mem/cache/prefetch/base.cc
+++ b/src/mem/cache/prefetch/base.cc
@@ -38,8 +38,8 @@
 #include "arch/isa_traits.hh"
 #include "base/trace.hh"
 #include "config/the_isa.hh"
-#include "mem/cache/base.hh"
 #include "mem/cache/prefetch/base.hh"
+#include "mem/cache/base.hh"
 #include "mem/request.hh"
 
 BasePrefetcher::BasePrefetcher(const BaseCacheParams *p)

diff --git a/src/mem/cache/prefetch/stride.hh b/src/mem/cache/prefetch/stride.hh
index 6ccd32b913de80a838c6081f2e64dc6b33056a3f..c78739b4e6d35731f86a8358ea7316923c87b985 100644 (file)
--- a/src/mem/cache/prefetch/stride.hh
+++ b/src/mem/cache/prefetch/stride.hh
@@ -36,7 +36,8 @@
 #ifndef __MEM_CACHE_PREFETCH_STRIDE_PREFETCHER_HH__
 #define __MEM_CACHE_PREFETCH_STRIDE_PREFETCHER_HH__
 
-#include <limits.h>
+#include <climits>
+
 #include "mem/cache/prefetch/base.hh"
 
 class StridePrefetcher : public BasePrefetcher

diff --git a/src/mem/cache/tags/base.cc b/src/mem/cache/tags/base.cc
index 41cc11b234ce71813a17ca21634a558499320ec5..d4d7542a0c414a1911a393be020b6333a11d9971 100644 (file)
--- a/src/mem/cache/tags/base.cc
+++ b/src/mem/cache/tags/base.cc
@@ -34,10 +34,9 @@
  * Definitions of BaseTags.
  */
 
+#include "cpu/smt.hh" //maxThreadsPerCPU
 #include "mem/cache/tags/base.hh"
-
 #include "mem/cache/base.hh"
-#include "cpu/smt.hh" //maxThreadsPerCPU
 #include "sim/sim_exit.hh"
 
 using namespace std;

diff --git a/src/mem/cache/tags/base.hh b/src/mem/cache/tags/base.hh
index 62ae4a0328c56c186fe95b81e006687dd0b6e2de..93856c19eb1a75c1505bd41390c297912ad22e77 100644 (file)
--- a/src/mem/cache/tags/base.hh
+++ b/src/mem/cache/tags/base.hh
@@ -38,8 +38,9 @@
 #define __BASE_TAGS_HH__
 
 #include <string>
-#include "base/statistics.hh"
+
 #include "base/callback.hh"
+#include "base/statistics.hh"
 
 class BaseCache;
 

diff --git a/src/mem/cache/tags/cacheset.hh b/src/mem/cache/tags/cacheset.hh
index 135e993aacb3e5f198760a63bebcb8c7cad95c03..a1cf937cf73f97b778315178f0a752242789b676 100644 (file)
--- a/src/mem/cache/tags/cacheset.hh
+++ b/src/mem/cache/tags/cacheset.hh
@@ -36,9 +36,9 @@
 #ifndef __CACHESET_HH__
 #define __CACHESET_HH__
 
-#include "mem/cache/blk.hh" // base class
-#include <assert.h>
+#include <cassert>
 
+#include "mem/cache/blk.hh" // base class
 
 /**
  * An associative set of cache blocks.

diff --git a/src/mem/cache/tags/fa_lru.hh b/src/mem/cache/tags/fa_lru.hh
index 94ffeaa5810d3e7b06abd8ec07c4a5c84c00b5a6..78f9ce1b47006ef475cbff5940fff1c9919be589 100644 (file)
--- a/src/mem/cache/tags/fa_lru.hh
+++ b/src/mem/cache/tags/fa_lru.hh
@@ -39,8 +39,8 @@
 #include <list>
 
 #include "base/hashmap.hh"
-#include "mem/cache/blk.hh"
 #include "mem/cache/tags/base.hh"
+#include "mem/cache/blk.hh"
 #include "mem/packet.hh"
 
 /**

diff --git a/src/mem/cache/tags/iic.cc b/src/mem/cache/tags/iic.cc
index 743c6894f4708a821af2e03c7ec29321f4514b68..d0e97de02bda142899f667cd2c44a798512d6658 100644 (file)
--- a/src/mem/cache/tags/iic.cc
+++ b/src/mem/cache/tags/iic.cc
@@ -40,8 +40,8 @@
 
 #include "base/intmath.hh"
 #include "base/trace.hh"
-#include "mem/cache/base.hh"
 #include "mem/cache/tags/iic.hh"
+#include "mem/cache/base.hh"
 #include "sim/core.hh"
 
 using namespace std;

diff --git a/src/mem/cache/tags/iic.hh b/src/mem/cache/tags/iic.hh
index 5553b8ca3f4b1164afd192a12df647efc4e2a436..0c3ea7a13ff45db232af269cacf3b5afa6039fd1 100644 (file)
--- a/src/mem/cache/tags/iic.hh
+++ b/src/mem/cache/tags/iic.hh
@@ -39,11 +39,11 @@
 #include <list>
 #include <vector>
 
-#include "mem/cache/blk.hh"
-#include "mem/cache/tags/iic_repl/repl.hh"
-#include "mem/packet.hh"
 #include "base/statistics.hh"
+#include "mem/cache/tags/iic_repl/repl.hh"
 #include "mem/cache/tags/base.hh"
+#include "mem/cache/blk.hh"
+#include "mem/packet.hh"
 
 class BaseCache; // Forward declaration
 

diff --git a/src/mem/cache/tags/iic_repl/gen.cc b/src/mem/cache/tags/iic_repl/gen.cc
index 0d1b30220294ad57bec7388a56e5d602bf1425ab..7a1e7a110c7da9aea071047152f1a68db5ffdde9 100644 (file)
--- a/src/mem/cache/tags/iic_repl/gen.cc
+++ b/src/mem/cache/tags/iic_repl/gen.cc
@@ -38,8 +38,8 @@
 
 #include "base/misc.hh"
 #include "base/types.hh"
-#include "mem/cache/tags/iic.hh"
 #include "mem/cache/tags/iic_repl/gen.hh"
+#include "mem/cache/tags/iic.hh"
 #include "params/GenRepl.hh"
 
 using namespace std;

diff --git a/src/mem/cache/tags/iic_repl/repl.hh b/src/mem/cache/tags/iic_repl/repl.hh
index c792e335076324e474e3b4b82ccf5297ed330d47..994af516458adcb3b0d14db299979f19ba40291b 100644 (file)
--- a/src/mem/cache/tags/iic_repl/repl.hh
+++ b/src/mem/cache/tags/iic_repl/repl.hh
@@ -38,8 +38,8 @@
 #ifndef __REPL_HH__
 #define __REPL_HH__
 
-#include <string>
 #include <list>
+#include <string>
 
 #include "base/types.hh"
 #include "cpu/smt.hh"

diff --git a/src/mem/cache/tags/lru.cc b/src/mem/cache/tags/lru.cc
index 25e98d2938207f6d643488cdce9195f7bbbc9b74..33517a5f579011d0dd150cb2b5a4960f91aed339 100644 (file)
--- a/src/mem/cache/tags/lru.cc
+++ b/src/mem/cache/tags/lru.cc
@@ -36,9 +36,9 @@
 #include <string>
 
 #include "base/intmath.hh"
-#include "mem/cache/base.hh"
 #include "mem/cache/tags/cacheset.hh"
 #include "mem/cache/tags/lru.hh"
+#include "mem/cache/base.hh"
 #include "sim/core.hh"
 
 using namespace std;

diff --git a/src/mem/cache/tags/lru.hh b/src/mem/cache/tags/lru.hh
index ff98110466c53c08266719b0446b72c7d1ae4c5f..4eb66b708d043d8a0e32041ef9a65c7478eb9c0e 100644 (file)
--- a/src/mem/cache/tags/lru.hh
+++ b/src/mem/cache/tags/lru.hh
@@ -40,8 +40,8 @@
 #include <cstring>
 #include <list>
 
-#include "mem/cache/blk.hh"
 #include "mem/cache/tags/base.hh"
+#include "mem/cache/blk.hh"
 #include "mem/packet.hh"
 
 class BaseCache;

diff --git a/src/mem/packet.cc b/src/mem/packet.cc
index 54769569791ad86f26d313a268864b3519a954bc..0296e7f0b7803835e90ba5977e84abd88e95bff8 100644 (file)
--- a/src/mem/packet.cc
+++ b/src/mem/packet.cc
@@ -36,8 +36,9 @@
  * between a single level of the memory heirarchy (ie L1->L2).
  */
 
-#include <iostream>
 #include <cstring>
+#include <iostream>
+
 #include "base/cprintf.hh"
 #include "base/misc.hh"
 #include "base/trace.hh"

diff --git a/src/mem/packet.hh b/src/mem/packet.hh
index 7e75dc2975bc3ee097be8b853b6a7b926e2c4ccf..5fcd9286ef661f2bbd00c8518ebc0bc93bb30bf1 100644 (file)
--- a/src/mem/packet.hh
+++ b/src/mem/packet.hh
@@ -39,9 +39,9 @@
 #ifndef __MEM_PACKET_HH__
 #define __MEM_PACKET_HH__
 
+#include <bitset>
 #include <cassert>
 #include <list>
-#include <bitset>
 
 #include "base/cast.hh"
 #include "base/compiler.hh"

diff --git a/src/mem/page_table.cc b/src/mem/page_table.cc
index 7e6eac372f295eb1e0da3deed6867d6939518dc2..861c4a805cac426a9603b6ef9620a8a6c929327d 100644 (file)
--- a/src/mem/page_table.cc
+++ b/src/mem/page_table.cc
@@ -34,9 +34,9 @@
  * @file
  * Definitions of page table.
  */
-#include <string>
-#include <map>
 #include <fstream>
+#include <map>
+#include <string>
 
 #include "base/bitfield.hh"
 #include "base/intmath.hh"

diff --git a/src/mem/physical.cc b/src/mem/physical.cc
index e7c96ab5405a5bba7b94c96abf98c689fced9a0b..fa9ec7e2370342131bf51a66d06d0b7f17c687f5 100644 (file)
--- a/src/mem/physical.cc
+++ b/src/mem/physical.cc
@@ -41,14 +41,14 @@
  *          Ali Saidi
  */
 
-#include <sys/types.h>
 #include <sys/mman.h>
+#include <sys/types.h>
 #include <sys/user.h>
-#include <errno.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <zlib.h>
 
+#include <cerrno>
 #include <cstdio>
 #include <iostream>
 #include <string>

diff --git a/src/mem/ruby/buffers/MessageBuffer.hh b/src/mem/ruby/buffers/MessageBuffer.hh
index a59b8207725e01517824cfac65199d7bfd1b2dea..dc9fb1a9ec7aa5925bd938bb1b23373b2667134a 100644 (file)
--- a/src/mem/ruby/buffers/MessageBuffer.hh
+++ b/src/mem/ruby/buffers/MessageBuffer.hh
@@ -38,15 +38,15 @@
 #include <cassert>
 #include <functional>
 #include <iostream>
-#include <vector>
 #include <string>
+#include <vector>
 
 #include "mem/ruby/buffers/MessageBufferNode.hh"
+#include "mem/ruby/common/Address.hh"
 #include "mem/ruby/common/Consumer.hh"
 #include "mem/ruby/common/Global.hh"
 #include "mem/ruby/eventqueue/RubyEventQueue.hh"
 #include "mem/ruby/slicc_interface/Message.hh"
-#include "mem/ruby/common/Address.hh"
 
 class MessageBuffer
 {

diff --git a/src/mem/ruby/common/NetDest.cc b/src/mem/ruby/common/NetDest.cc
index 657df08b2efec8341844eb64cf9b4e48dbd917a9..12eaa03219ce9ce7bf9c9b0d73b4a144beac00e1 100644 (file)
--- a/src/mem/ruby/common/NetDest.cc
+++ b/src/mem/ruby/common/NetDest.cc
@@ -26,8 +26,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "mem/ruby/common/NetDest.hh"
 #include "mem/protocol/Protocol.hh"
+#include "mem/ruby/common/NetDest.hh"
 
 NetDest::NetDest()
 {

diff --git a/src/mem/ruby/common/Set.hh b/src/mem/ruby/common/Set.hh
index a0178178a66369b6306958eae579fa98a0860abb..5481c2ec7cb9f2a75ccc303d2efe8ef4677ae56a 100644 (file)
--- a/src/mem/ruby/common/Set.hh
+++ b/src/mem/ruby/common/Set.hh
@@ -35,9 +35,9 @@
 #include <iostream>
 #include <limits>
 
-#include "mem/ruby/system/System.hh"
 #include "mem/ruby/common/Global.hh"
 #include "mem/ruby/system/NodeID.hh"
+#include "mem/ruby/system/System.hh"
 
 class Set
 {

diff --git a/src/mem/ruby/filters/GenericBloomFilter.hh b/src/mem/ruby/filters/GenericBloomFilter.hh
index 606f55d4f192633f3db6cd3577741b2c3a201986..a9d6b9ea2f7b148e91120af53f3cce7ff74c9b09 100644 (file)
--- a/src/mem/ruby/filters/GenericBloomFilter.hh
+++ b/src/mem/ruby/filters/GenericBloomFilter.hh
@@ -32,8 +32,8 @@
 #include <iostream>
 #include <string>
 
-#include "mem/ruby/common/Global.hh"
 #include "mem/ruby/common/Address.hh"
+#include "mem/ruby/common/Global.hh"
 #include "mem/ruby/filters/AbstractBloomFilter.hh"
 
 class GenericBloomFilter

diff --git a/src/mem/ruby/network/Network.cc b/src/mem/ruby/network/Network.cc
index 34ee18fea11a998f003bb2005fc24b8c4cbed1f0..3003ce7d92fd60d3da911b667ee49a4fb3a75593 100644 (file)
--- a/src/mem/ruby/network/Network.cc
+++ b/src/mem/ruby/network/Network.cc
@@ -28,8 +28,8 @@
 
 #include "base/misc.hh"
 #include "mem/protocol/MachineType.hh"
-#include "mem/ruby/network/Network.hh"
 #include "mem/ruby/network/simple/Topology.hh"
+#include "mem/ruby/network/Network.hh"
 
 Network::Network(const Params *p)
     : SimObject(p)

diff --git a/src/mem/ruby/network/garnet/BaseGarnetNetwork.hh b/src/mem/ruby/network/garnet/BaseGarnetNetwork.hh
index d012252327cc06ee4196565264a04543eaac941e..81b77ceeadd14a9f00dd5109eeb47b7bc5a26363 100644 (file)
--- a/src/mem/ruby/network/garnet/BaseGarnetNetwork.hh
+++ b/src/mem/ruby/network/garnet/BaseGarnetNetwork.hh
@@ -36,10 +36,10 @@
 #ifndef __MEM_RUBY_NETWORK_GARNET_BASEGARNETNETWORK_HH__
 #define __MEM_RUBY_NETWORK_GARNET_BASEGARNETNETWORK_HH__
 
-#include "math.h"
 #include "mem/ruby/network/garnet/NetworkHeader.hh"
 #include "mem/ruby/network/Network.hh"
 #include "params/BaseGarnetNetwork.hh"
+#include "math.h"
 
 class BaseGarnetNetwork : public Network 
 {

diff --git a/src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.cc b/src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.cc
index 5cbff7db6872143b87909fbb06d9f898286443e4..ad0c064526780cfe528e2d0f6fdfd86a3148e683 100644 (file)
--- a/src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.cc
+++ b/src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.cc
@@ -31,15 +31,15 @@
 #include <cassert>
 
 #include "base/stl_helpers.hh"
-#include "mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.hh"
 #include "mem/protocol/MachineType.hh"
-#include "mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.hh"
 #include "mem/ruby/buffers/MessageBuffer.hh"
+#include "mem/ruby/common/NetDest.hh"
+#include "mem/ruby/network/garnet/fixed-pipeline/CreditLink_d.hh"
+#include "mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.hh"
+#include "mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.hh"
+#include "mem/ruby/network/garnet/fixed-pipeline/NetworkLink_d.hh"
 #include "mem/ruby/network/garnet/fixed-pipeline/Router_d.hh"
 #include "mem/ruby/network/simple/Topology.hh"
-#include "mem/ruby/network/garnet/fixed-pipeline/NetworkLink_d.hh"
-#include "mem/ruby/network/garnet/fixed-pipeline/CreditLink_d.hh"
-#include "mem/ruby/common/NetDest.hh"
 
 using namespace std;
 using m5::stl_helpers::deletePointers;

diff --git a/src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.hh b/src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.hh
index 1fe65f18da15136e32c55247600350d6597a928c..f403660ea225fec67b02b097372738255ec60dff 100644 (file)
--- a/src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.hh
+++ b/src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.hh
@@ -34,8 +34,8 @@
 #include <iostream>
 #include <vector>
 
-#include "mem/ruby/network/garnet/NetworkHeader.hh"
 #include "mem/ruby/network/garnet/BaseGarnetNetwork.hh"
+#include "mem/ruby/network/garnet/NetworkHeader.hh"
 #include "mem/ruby/network/Network.hh"
 #include "params/GarnetNetwork_d.hh"
 

diff --git a/src/mem/ruby/network/garnet/fixed-pipeline/InputUnit_d.hh b/src/mem/ruby/network/garnet/fixed-pipeline/InputUnit_d.hh
index 81c60f7e1262d8ef3f581d02a7f0655c212b761d..de3fa9d40d81a5c725e769829f6538ffedc44565 100644 (file)
--- a/src/mem/ruby/network/garnet/fixed-pipeline/InputUnit_d.hh
+++ b/src/mem/ruby/network/garnet/fixed-pipeline/InputUnit_d.hh
@@ -34,12 +34,12 @@
 #include <iostream>
 #include <vector>
 
-#include "mem/ruby/network/garnet/NetworkHeader.hh"
-#include "mem/ruby/network/garnet/fixed-pipeline/flitBuffer_d.hh"
 #include "mem/ruby/common/Consumer.hh"
-#include "mem/ruby/network/garnet/fixed-pipeline/VirtualChannel_d.hh"
-#include "mem/ruby/network/garnet/fixed-pipeline/NetworkLink_d.hh"
 #include "mem/ruby/network/garnet/fixed-pipeline/CreditLink_d.hh"
+#include "mem/ruby/network/garnet/fixed-pipeline/NetworkLink_d.hh"
+#include "mem/ruby/network/garnet/fixed-pipeline/VirtualChannel_d.hh"
+#include "mem/ruby/network/garnet/fixed-pipeline/flitBuffer_d.hh"
+#include "mem/ruby/network/garnet/NetworkHeader.hh"
 
 class Router_d;
 

diff --git a/src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.cc b/src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.cc
index 14105a38cc9611666a852563df45846100585678..d7f275fc24f2e77a27ed7bcbb08ab944e2d25356 100644 (file)
--- a/src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.cc
+++ b/src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.cc
@@ -32,8 +32,8 @@
 #include <cmath>
 
 #include "base/stl_helpers.hh"
-#include "mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.hh"
 #include "mem/ruby/buffers/MessageBuffer.hh"
+#include "mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.hh"
 #include "mem/ruby/network/garnet/fixed-pipeline/flitBuffer_d.hh"
 #include "mem/ruby/slicc_interface/NetworkMessage.hh"
 

diff --git a/src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.hh b/src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.hh
index f1a577e4c053c1f6f195340b8f7fc2295b5f1f0c..3802082a6b3b3f70559a222444a9b4a7cfba926f 100644 (file)
--- a/src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.hh
+++ b/src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.hh
@@ -34,13 +34,13 @@
 #include <iostream>
 #include <vector>
 
-#include "mem/ruby/network/garnet/NetworkHeader.hh"
-#include "mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.hh"
 #include "mem/ruby/common/Consumer.hh"
-#include "mem/ruby/slicc_interface/Message.hh"
-#include "mem/ruby/network/garnet/fixed-pipeline/NetworkLink_d.hh"
 #include "mem/ruby/network/garnet/fixed-pipeline/CreditLink_d.hh"
+#include "mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.hh"
+#include "mem/ruby/network/garnet/fixed-pipeline/NetworkLink_d.hh"
 #include "mem/ruby/network/garnet/fixed-pipeline/OutVcState_d.hh"
+#include "mem/ruby/network/garnet/NetworkHeader.hh"
+#include "mem/ruby/slicc_interface/Message.hh"
 
 class NetworkMessage;
 class MessageBuffer;

diff --git a/src/mem/ruby/network/garnet/fixed-pipeline/NetworkLink_d.cc b/src/mem/ruby/network/garnet/fixed-pipeline/NetworkLink_d.cc
index 5182814145217546e9f8853d09fa3f32d7259ae1..72439a67bbbb6ba5b71f45fe61f7fe710705ffd2 100644 (file)
--- a/src/mem/ruby/network/garnet/fixed-pipeline/NetworkLink_d.cc
+++ b/src/mem/ruby/network/garnet/fixed-pipeline/NetworkLink_d.cc
@@ -28,8 +28,8 @@
  * Authors: Niket Agarwal
  */
 
-#include "mem/ruby/network/garnet/fixed-pipeline/NetworkLink_d.hh"
 #include "mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.hh"
+#include "mem/ruby/network/garnet/fixed-pipeline/NetworkLink_d.hh"
 
 NetworkLink_d::NetworkLink_d(int id, int link_latency, GarnetNetwork_d *net_ptr)
 {

diff --git a/src/mem/ruby/network/garnet/fixed-pipeline/NetworkLink_d.hh b/src/mem/ruby/network/garnet/fixed-pipeline/NetworkLink_d.hh
index 8024ebd9c7959b1861c70f6c550f96fcff3112a9..a46c59f41963f28c70e179f58747647bb7252563 100644 (file)
--- a/src/mem/ruby/network/garnet/fixed-pipeline/NetworkLink_d.hh
+++ b/src/mem/ruby/network/garnet/fixed-pipeline/NetworkLink_d.hh
@@ -34,9 +34,9 @@
 #include <iostream>
 #include <vector>
 
-#include "mem/ruby/network/garnet/NetworkHeader.hh"
 #include "mem/ruby/common/Consumer.hh"
 #include "mem/ruby/network/garnet/fixed-pipeline/flitBuffer_d.hh"
+#include "mem/ruby/network/garnet/NetworkHeader.hh"
 #include "mem/ruby/network/orion/NetworkPower.hh"
 
 class GarnetNetwork_d;

diff --git a/src/mem/ruby/network/garnet/fixed-pipeline/OutVcState_d.cc b/src/mem/ruby/network/garnet/fixed-pipeline/OutVcState_d.cc
index ee89ec004d395ea818454383b5dfdf02ac156d26..8a2022a4fa35b34a90bad99cda15e588e0feab76 100644 (file)
--- a/src/mem/ruby/network/garnet/fixed-pipeline/OutVcState_d.cc
+++ b/src/mem/ruby/network/garnet/fixed-pipeline/OutVcState_d.cc
@@ -28,8 +28,8 @@
  * Authors: Niket Agarwal
  */
 
-#include "mem/ruby/network/garnet/fixed-pipeline/OutVcState_d.hh"
 #include "mem/ruby/eventqueue/RubyEventQueue.hh"
+#include "mem/ruby/network/garnet/fixed-pipeline/OutVcState_d.hh"
 
 OutVcState_d::OutVcState_d(int id, GarnetNetwork_d *network_ptr)
 {

diff --git a/src/mem/ruby/network/garnet/fixed-pipeline/OutVcState_d.hh b/src/mem/ruby/network/garnet/fixed-pipeline/OutVcState_d.hh
index 39b2cb5fe91aacd340cc55706c2897e8da964656..5b1328fcf43a9c38f9f72a5792cee400e6db6dc8 100644 (file)
--- a/src/mem/ruby/network/garnet/fixed-pipeline/OutVcState_d.hh
+++ b/src/mem/ruby/network/garnet/fixed-pipeline/OutVcState_d.hh
@@ -31,8 +31,8 @@
 #ifndef __MEM_RUBY_NETWORK_GARNET_FIXED_PIPELINE_OUT_VC_STATE_D_HH__
 #define __MEM_RUBY_NETWORK_GARNET_FIXED_PIPELINE_OUT_VC_STATE_D_HH__
 
-#include "mem/ruby/network/garnet/NetworkHeader.hh"
 #include "mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.hh"
+#include "mem/ruby/network/garnet/NetworkHeader.hh"
 
 class OutVcState_d
 {

diff --git a/src/mem/ruby/network/garnet/fixed-pipeline/OutputUnit_d.hh b/src/mem/ruby/network/garnet/fixed-pipeline/OutputUnit_d.hh
index 98d6147de5ea2063b020fa0bfaf1f89090beb651..3ed1cb4b26842634b2c8bb295225666c145810ac 100644 (file)
--- a/src/mem/ruby/network/garnet/fixed-pipeline/OutputUnit_d.hh
+++ b/src/mem/ruby/network/garnet/fixed-pipeline/OutputUnit_d.hh
@@ -34,12 +34,12 @@
 #include <iostream>
 #include <vector>
 
-#include "mem/ruby/network/garnet/NetworkHeader.hh"
 #include "mem/ruby/common/Consumer.hh"
-#include "mem/ruby/network/garnet/fixed-pipeline/flitBuffer_d.hh"
-#include "mem/ruby/network/garnet/fixed-pipeline/OutVcState_d.hh"
-#include "mem/ruby/network/garnet/fixed-pipeline/NetworkLink_d.hh"
 #include "mem/ruby/network/garnet/fixed-pipeline/CreditLink_d.hh"
+#include "mem/ruby/network/garnet/fixed-pipeline/NetworkLink_d.hh"
+#include "mem/ruby/network/garnet/fixed-pipeline/OutVcState_d.hh"
+#include "mem/ruby/network/garnet/fixed-pipeline/flitBuffer_d.hh"
+#include "mem/ruby/network/garnet/NetworkHeader.hh"
 
 class Router_d;
 

diff --git a/src/mem/ruby/network/garnet/fixed-pipeline/Router_d.cc b/src/mem/ruby/network/garnet/fixed-pipeline/Router_d.cc
index 4ee1766532025722d54387afc6eff3c9450329b7..15cddd3b7bd278455433332e1867eb9de229a496 100644 (file)
--- a/src/mem/ruby/network/garnet/fixed-pipeline/Router_d.cc
+++ b/src/mem/ruby/network/garnet/fixed-pipeline/Router_d.cc
@@ -29,16 +29,16 @@
  */
 
 #include "base/stl_helpers.hh"
-#include "mem/ruby/network/garnet/fixed-pipeline/Router_d.hh"
-#include "mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.hh"
-#include "mem/ruby/network/garnet/fixed-pipeline/NetworkLink_d.hh"
 #include "mem/ruby/network/garnet/fixed-pipeline/CreditLink_d.hh"
+#include "mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.hh"
 #include "mem/ruby/network/garnet/fixed-pipeline/InputUnit_d.hh"
+#include "mem/ruby/network/garnet/fixed-pipeline/NetworkLink_d.hh"
 #include "mem/ruby/network/garnet/fixed-pipeline/OutputUnit_d.hh"
+#include "mem/ruby/network/garnet/fixed-pipeline/Router_d.hh"
 #include "mem/ruby/network/garnet/fixed-pipeline/RoutingUnit_d.hh"
-#include "mem/ruby/network/garnet/fixed-pipeline/VCallocator_d.hh"
 #include "mem/ruby/network/garnet/fixed-pipeline/SWallocator_d.hh"
 #include "mem/ruby/network/garnet/fixed-pipeline/Switch_d.hh"
+#include "mem/ruby/network/garnet/fixed-pipeline/VCallocator_d.hh"
 
 using namespace std;
 using m5::stl_helpers::deletePointers;

diff --git a/src/mem/ruby/network/garnet/fixed-pipeline/Router_d.hh b/src/mem/ruby/network/garnet/fixed-pipeline/Router_d.hh
index f7af30ce98b58bac162832ab75e89336c070945f..4c2b83312e63202682c8c04aece1e75e717ec390 100644 (file)
--- a/src/mem/ruby/network/garnet/fixed-pipeline/Router_d.hh
+++ b/src/mem/ruby/network/garnet/fixed-pipeline/Router_d.hh
@@ -34,9 +34,9 @@
 #include <iostream>
 #include <vector>
 
-#include "mem/ruby/network/garnet/NetworkHeader.hh"
-#include "mem/ruby/network/garnet/fixed-pipeline/flit_d.hh"
 #include "mem/ruby/common/NetDest.hh"
+#include "mem/ruby/network/garnet/fixed-pipeline/flit_d.hh"
+#include "mem/ruby/network/garnet/NetworkHeader.hh"
 #include "mem/ruby/network/orion/NetworkPower.hh"
 
 class GarnetNetwork_d;

diff --git a/src/mem/ruby/network/garnet/fixed-pipeline/RoutingUnit_d.cc b/src/mem/ruby/network/garnet/fixed-pipeline/RoutingUnit_d.cc
index 13491184c1d8b3631706ebc2ed5a15bbc2f1f566..7c7a7d42823ff6e67d4fc7d42e5c07db18100bb4 100644 (file)
--- a/src/mem/ruby/network/garnet/fixed-pipeline/RoutingUnit_d.cc
+++ b/src/mem/ruby/network/garnet/fixed-pipeline/RoutingUnit_d.cc
@@ -28,9 +28,9 @@
  * Authors: Niket Agarwal
  */
 
-#include "mem/ruby/network/garnet/fixed-pipeline/RoutingUnit_d.hh"
-#include "mem/ruby/network/garnet/fixed-pipeline/Router_d.hh"
 #include "mem/ruby/network/garnet/fixed-pipeline/InputUnit_d.hh"
+#include "mem/ruby/network/garnet/fixed-pipeline/Router_d.hh"
+#include "mem/ruby/network/garnet/fixed-pipeline/RoutingUnit_d.hh"
 #include "mem/ruby/slicc_interface/NetworkMessage.hh"
 
 RoutingUnit_d::RoutingUnit_d(Router_d *router)

diff --git a/src/mem/ruby/network/garnet/fixed-pipeline/RoutingUnit_d.hh b/src/mem/ruby/network/garnet/fixed-pipeline/RoutingUnit_d.hh
index 7ae2160491ff4633770b8c41f0d70566822e4e28..15e893150ff5d50bfbc94dc5a0f772c809db514b 100644 (file)
--- a/src/mem/ruby/network/garnet/fixed-pipeline/RoutingUnit_d.hh
+++ b/src/mem/ruby/network/garnet/fixed-pipeline/RoutingUnit_d.hh
@@ -31,10 +31,10 @@
 #ifndef __MEM_RUBY_NETWORK_GARNET_FIXED_PIPELINE_ROUTING_UNIT_D_HH__
 #define __MEM_RUBY_NETWORK_GARNET_FIXED_PIPELINE_ROUTING_UNIT_D_HH__
 
-#include "mem/ruby/network/garnet/NetworkHeader.hh"
 #include "mem/ruby/common/Consumer.hh"
-#include "mem/ruby/network/garnet/fixed-pipeline/flit_d.hh"
 #include "mem/ruby/common/NetDest.hh"
+#include "mem/ruby/network/garnet/fixed-pipeline/flit_d.hh"
+#include "mem/ruby/network/garnet/NetworkHeader.hh"
 
 class InputUnit_d;
 class Router_d;

diff --git a/src/mem/ruby/network/garnet/fixed-pipeline/SWallocator_d.cc b/src/mem/ruby/network/garnet/fixed-pipeline/SWallocator_d.cc
index 7041575891210289adf60b17b89a60774d87a9f5..afed4b2055685473fc705a031ff94f3ee098bbf6 100644 (file)
--- a/src/mem/ruby/network/garnet/fixed-pipeline/SWallocator_d.cc
+++ b/src/mem/ruby/network/garnet/fixed-pipeline/SWallocator_d.cc
@@ -28,11 +28,11 @@
  * Authors: Niket Agarwal
  */
 
-#include "mem/ruby/network/garnet/fixed-pipeline/SWallocator_d.hh"
-#include "mem/ruby/network/garnet/fixed-pipeline/Router_d.hh"
+#include "mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.hh"
 #include "mem/ruby/network/garnet/fixed-pipeline/InputUnit_d.hh"
 #include "mem/ruby/network/garnet/fixed-pipeline/OutputUnit_d.hh"
-#include "mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.hh"
+#include "mem/ruby/network/garnet/fixed-pipeline/Router_d.hh"
+#include "mem/ruby/network/garnet/fixed-pipeline/SWallocator_d.hh"
 
 SWallocator_d::SWallocator_d(Router_d *router)
 {

diff --git a/src/mem/ruby/network/garnet/fixed-pipeline/SWallocator_d.hh b/src/mem/ruby/network/garnet/fixed-pipeline/SWallocator_d.hh
index 66b5229508355688e885e09ffb29c327d87623f5..15f7b8bfeb758d64654a5d3f1a7f139d4c39ec46 100644 (file)
--- a/src/mem/ruby/network/garnet/fixed-pipeline/SWallocator_d.hh
+++ b/src/mem/ruby/network/garnet/fixed-pipeline/SWallocator_d.hh
@@ -34,8 +34,8 @@
 #include <iostream>
 #include <vector>
 
-#include "mem/ruby/network/garnet/NetworkHeader.hh"
 #include "mem/ruby/common/Consumer.hh"
+#include "mem/ruby/network/garnet/NetworkHeader.hh"
 
 class Router_d;
 class InputUnit_d;

diff --git a/src/mem/ruby/network/garnet/fixed-pipeline/Switch_d.cc b/src/mem/ruby/network/garnet/fixed-pipeline/Switch_d.cc
index 50aa16cea47f46158feabe2a7977fdfa1a42c344..62510a45c75e12b862fa5761c1c59e20710c22f0 100644 (file)
--- a/src/mem/ruby/network/garnet/fixed-pipeline/Switch_d.cc
+++ b/src/mem/ruby/network/garnet/fixed-pipeline/Switch_d.cc
@@ -29,9 +29,9 @@
  */
 
 #include "base/stl_helpers.hh"
-#include "mem/ruby/network/garnet/fixed-pipeline/Switch_d.hh"
-#include "mem/ruby/network/garnet/fixed-pipeline/Router_d.hh"
 #include "mem/ruby/network/garnet/fixed-pipeline/OutputUnit_d.hh"
+#include "mem/ruby/network/garnet/fixed-pipeline/Router_d.hh"
+#include "mem/ruby/network/garnet/fixed-pipeline/Switch_d.hh"
 
 using m5::stl_helpers::deletePointers;
 

diff --git a/src/mem/ruby/network/garnet/fixed-pipeline/Switch_d.hh b/src/mem/ruby/network/garnet/fixed-pipeline/Switch_d.hh
index 2ba761c694798b3bdfcf7a5d208530fcb604196a..7ffaf423ee161855b9944893acc4794618f368a9 100644 (file)
--- a/src/mem/ruby/network/garnet/fixed-pipeline/Switch_d.hh
+++ b/src/mem/ruby/network/garnet/fixed-pipeline/Switch_d.hh
@@ -34,9 +34,9 @@
 #include <iostream>
 #include <vector>
 
-#include "mem/ruby/network/garnet/NetworkHeader.hh"
 #include "mem/ruby/common/Consumer.hh"
 #include "mem/ruby/network/garnet/fixed-pipeline/flitBuffer_d.hh"
+#include "mem/ruby/network/garnet/NetworkHeader.hh"
 
 class Router_d;
 class OutputUnit_d;

diff --git a/src/mem/ruby/network/garnet/fixed-pipeline/VCallocator_d.cc b/src/mem/ruby/network/garnet/fixed-pipeline/VCallocator_d.cc
index 326c7fa927d8656f68ef8dde411e6cd6e97727a6..03eed6ce23e9f72108829d9b65198f2a952c32c8 100644 (file)
--- a/src/mem/ruby/network/garnet/fixed-pipeline/VCallocator_d.cc
+++ b/src/mem/ruby/network/garnet/fixed-pipeline/VCallocator_d.cc
@@ -28,11 +28,11 @@
  * Authors: Niket Agarwal
  */
 
-#include "mem/ruby/network/garnet/fixed-pipeline/VCallocator_d.hh"
-#include "mem/ruby/network/garnet/fixed-pipeline/Router_d.hh"
+#include "mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.hh"
 #include "mem/ruby/network/garnet/fixed-pipeline/InputUnit_d.hh"
 #include "mem/ruby/network/garnet/fixed-pipeline/OutputUnit_d.hh"
-#include "mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.hh"
+#include "mem/ruby/network/garnet/fixed-pipeline/Router_d.hh"
+#include "mem/ruby/network/garnet/fixed-pipeline/VCallocator_d.hh"
 
 VCallocator_d::VCallocator_d(Router_d *router)
 {

diff --git a/src/mem/ruby/network/garnet/fixed-pipeline/VCallocator_d.hh b/src/mem/ruby/network/garnet/fixed-pipeline/VCallocator_d.hh
index 78933824499260f67fb64107e445a79d02cf3ec0..d28c6f82fdd953ad60531c24b91f21274d5d9d55 100644 (file)
--- a/src/mem/ruby/network/garnet/fixed-pipeline/VCallocator_d.hh
+++ b/src/mem/ruby/network/garnet/fixed-pipeline/VCallocator_d.hh
@@ -32,11 +32,11 @@
 #define __MEM_RUBY_NETWORK_GARNET_FIXED_PIPELINE_VC_ALLOCATOR_D_HH__
 
 #include <iostream>
-#include <vector>
 #include <utility>
+#include <vector>
 
-#include "mem/ruby/network/garnet/NetworkHeader.hh"
 #include "mem/ruby/common/Consumer.hh"
+#include "mem/ruby/network/garnet/NetworkHeader.hh"
 
 class Router_d;
 class InputUnit_d;

diff --git a/src/mem/ruby/network/garnet/fixed-pipeline/VirtualChannel_d.hh b/src/mem/ruby/network/garnet/fixed-pipeline/VirtualChannel_d.hh
index 075e2ee02ae79c4b0eb85f8dfb59cedfb7f7de26..3f5c02f843e2ed68bf1b1ac1a0bf263099341963 100644 (file)
--- a/src/mem/ruby/network/garnet/fixed-pipeline/VirtualChannel_d.hh
+++ b/src/mem/ruby/network/garnet/fixed-pipeline/VirtualChannel_d.hh
@@ -33,8 +33,8 @@
 
 #include <utility>
 
-#include "mem/ruby/network/garnet/NetworkHeader.hh"
 #include "mem/ruby/network/garnet/fixed-pipeline/flitBuffer_d.hh"
+#include "mem/ruby/network/garnet/NetworkHeader.hh"
 
 class VirtualChannel_d
 {

diff --git a/src/mem/ruby/network/garnet/fixed-pipeline/flitBuffer_d.hh b/src/mem/ruby/network/garnet/fixed-pipeline/flitBuffer_d.hh
index 3cfd9144f72836f0b8db5e6e390904f5f5b8683d..23cbd0bb3bc5f91a0b4070e6f30f502a06de44a0 100644 (file)
--- a/src/mem/ruby/network/garnet/fixed-pipeline/flitBuffer_d.hh
+++ b/src/mem/ruby/network/garnet/fixed-pipeline/flitBuffer_d.hh
@@ -35,8 +35,8 @@
 #include <iostream>
 #include <vector>
 
-#include "mem/ruby/network/garnet/NetworkHeader.hh"
 #include "mem/ruby/network/garnet/fixed-pipeline/flit_d.hh"
+#include "mem/ruby/network/garnet/NetworkHeader.hh"
 
 class flitBuffer_d
 {

diff --git a/src/mem/ruby/network/garnet/flexible-pipeline/FlexibleConsumer.hh b/src/mem/ruby/network/garnet/flexible-pipeline/FlexibleConsumer.hh
index 2f38fc158d0d48707408dc36df6194ee14cfbb55..04a4ac95aa5e3c858487a3a0f0be79f1ceee22a6 100644 (file)
--- a/src/mem/ruby/network/garnet/flexible-pipeline/FlexibleConsumer.hh
+++ b/src/mem/ruby/network/garnet/flexible-pipeline/FlexibleConsumer.hh
@@ -32,8 +32,8 @@
 #define __MEM_RUBY_NETWORK_GARNET_FLEXIBLE_PIPELINE_FLEXIBLE_CONSUMER_HH__
 
 #include "mem/ruby/common/Consumer.hh"
-#include "mem/ruby/network/garnet/NetworkHeader.hh"
 #include "mem/ruby/common/NetDest.hh"
+#include "mem/ruby/network/garnet/NetworkHeader.hh"
 
 class FlexibleConsumer : public Consumer
 {

diff --git a/src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.cc b/src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.cc
index 205eb14725cf3820e7d42b136b741f9442da14c3..b6a9d599d4b5bff41c0cbc4ce53350119908ae12 100644 (file)
--- a/src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.cc
+++ b/src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.cc
@@ -31,16 +31,16 @@
 #include <cassert>
 
 #include "base/stl_helpers.hh"
-#include "mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.hh"
 #include "mem/protocol/MachineType.hh"
-#include "mem/ruby/network/garnet/flexible-pipeline/NetworkInterface.hh"
 #include "mem/ruby/buffers/MessageBuffer.hh"
-#include "mem/ruby/network/garnet/flexible-pipeline/Router.hh"
-#include "mem/ruby/network/simple/Topology.hh"
-#include "mem/ruby/network/simple/SimpleNetwork.hh"
+#include "mem/ruby/common/NetDest.hh"
 #include "mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.hh"
+#include "mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.hh"
+#include "mem/ruby/network/garnet/flexible-pipeline/NetworkInterface.hh"
 #include "mem/ruby/network/garnet/flexible-pipeline/NetworkLink.hh"
-#include "mem/ruby/common/NetDest.hh"
+#include "mem/ruby/network/garnet/flexible-pipeline/Router.hh"
+#include "mem/ruby/network/simple/SimpleNetwork.hh"
+#include "mem/ruby/network/simple/Topology.hh"
 
 using namespace std;
 using m5::stl_helpers::deletePointers;

diff --git a/src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.hh b/src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.hh
index 51a9380cb803428f2d1c895432177a592f74474c..b04e649df9e9a6d53b0a4e76b3e4f1a7c3084347 100644 (file)
--- a/src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.hh
+++ b/src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.hh
@@ -34,8 +34,8 @@
 #include <iostream>
 #include <vector>
 
-#include "mem/ruby/network/garnet/NetworkHeader.hh"
 #include "mem/ruby/network/garnet/BaseGarnetNetwork.hh"
+#include "mem/ruby/network/garnet/NetworkHeader.hh"
 #include "mem/ruby/network/Network.hh"
 #include "params/GarnetNetwork.hh"
 

diff --git a/src/mem/ruby/network/garnet/flexible-pipeline/NetworkInterface.cc b/src/mem/ruby/network/garnet/flexible-pipeline/NetworkInterface.cc
index 11da465a89a0d1215c35e6f10e1eef8fbda0c189..c4c804206cea381cb0fb63748823446515eb8ef8 100644 (file)
--- a/src/mem/ruby/network/garnet/flexible-pipeline/NetworkInterface.cc
+++ b/src/mem/ruby/network/garnet/flexible-pipeline/NetworkInterface.cc
@@ -32,8 +32,8 @@
 #include <cmath>
 
 #include "base/stl_helpers.hh"
-#include "mem/ruby/network/garnet/flexible-pipeline/NetworkInterface.hh"
 #include "mem/ruby/buffers/MessageBuffer.hh"
+#include "mem/ruby/network/garnet/flexible-pipeline/NetworkInterface.hh"
 #include "mem/ruby/network/garnet/flexible-pipeline/flitBuffer.hh"
 #include "mem/ruby/slicc_interface/NetworkMessage.hh"
 

diff --git a/src/mem/ruby/network/garnet/flexible-pipeline/NetworkInterface.hh b/src/mem/ruby/network/garnet/flexible-pipeline/NetworkInterface.hh
index 401a8bc2340c1472f12ae55df2d67eb906124065..c358f420f90b37e3e0d1c96c326cb1988e2adea8 100644 (file)
--- a/src/mem/ruby/network/garnet/flexible-pipeline/NetworkInterface.hh
+++ b/src/mem/ruby/network/garnet/flexible-pipeline/NetworkInterface.hh
@@ -34,12 +34,12 @@
 #include <iostream>
 #include <vector>
 
-#include "mem/ruby/network/garnet/NetworkHeader.hh"
-#include "mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.hh"
 #include "mem/ruby/network/garnet/flexible-pipeline/FlexibleConsumer.hh"
-#include "mem/ruby/slicc_interface/Message.hh"
+#include "mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.hh"
 #include "mem/ruby/network/garnet/flexible-pipeline/NetworkLink.hh"
 #include "mem/ruby/network/garnet/flexible-pipeline/OutVcState.hh"
+#include "mem/ruby/network/garnet/NetworkHeader.hh"
+#include "mem/ruby/slicc_interface/Message.hh"
 
 class NetworkMessage;
 class MessageBuffer;

diff --git a/src/mem/ruby/network/garnet/flexible-pipeline/NetworkLink.cc b/src/mem/ruby/network/garnet/flexible-pipeline/NetworkLink.cc
index 24b93c975e704679620bec478af68ff3e5023d7e..8badcb8124fbca023fe67bb4a1bca80590b5c4e0 100644 (file)
--- a/src/mem/ruby/network/garnet/flexible-pipeline/NetworkLink.cc
+++ b/src/mem/ruby/network/garnet/flexible-pipeline/NetworkLink.cc
@@ -28,8 +28,8 @@
  * Authors: Niket Agarwal
  */
 
-#include "mem/ruby/network/garnet/flexible-pipeline/NetworkLink.hh"
 #include "mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.hh"
+#include "mem/ruby/network/garnet/flexible-pipeline/NetworkLink.hh"
 
 NetworkLink::NetworkLink(int id, int latency, GarnetNetwork *net_ptr)
 {

diff --git a/src/mem/ruby/network/garnet/flexible-pipeline/NetworkLink.hh b/src/mem/ruby/network/garnet/flexible-pipeline/NetworkLink.hh
index 3915448c5b8dce982b5ffaafe6ff7609b00f970d..cf2903a196bbbb4acaff346f13b621b00815419e 100644 (file)
--- a/src/mem/ruby/network/garnet/flexible-pipeline/NetworkLink.hh
+++ b/src/mem/ruby/network/garnet/flexible-pipeline/NetworkLink.hh
@@ -34,10 +34,10 @@
 #include <iostream>
 #include <vector>
 
-#include "mem/ruby/network/garnet/NetworkHeader.hh"
+#include "mem/ruby/common/NetDest.hh"
 #include "mem/ruby/network/garnet/flexible-pipeline/FlexibleConsumer.hh"
 #include "mem/ruby/network/garnet/flexible-pipeline/flitBuffer.hh"
-#include "mem/ruby/common/NetDest.hh"
+#include "mem/ruby/network/garnet/NetworkHeader.hh"
 
 class GarnetNetwork;
 

diff --git a/src/mem/ruby/network/garnet/flexible-pipeline/Router.cc b/src/mem/ruby/network/garnet/flexible-pipeline/Router.cc
index 4a0d599732d2a4c46c48c1691e4d07e841e22c38..d7d242b96e31561095e693f1997c635dd7dbf4b8 100644 (file)
--- a/src/mem/ruby/network/garnet/flexible-pipeline/Router.cc
+++ b/src/mem/ruby/network/garnet/flexible-pipeline/Router.cc
@@ -29,11 +29,11 @@
  */
 
 #include "base/stl_helpers.hh"
-#include "mem/ruby/network/garnet/flexible-pipeline/Router.hh"
-#include "mem/ruby/slicc_interface/NetworkMessage.hh"
 #include "mem/ruby/network/garnet/flexible-pipeline/InVcState.hh"
 #include "mem/ruby/network/garnet/flexible-pipeline/OutVcState.hh"
+#include "mem/ruby/network/garnet/flexible-pipeline/Router.hh"
 #include "mem/ruby/network/garnet/flexible-pipeline/VCarbiter.hh"
+#include "mem/ruby/slicc_interface/NetworkMessage.hh"
 
 using namespace std;
 using m5::stl_helpers::deletePointers;

diff --git a/src/mem/ruby/network/garnet/flexible-pipeline/Router.hh b/src/mem/ruby/network/garnet/flexible-pipeline/Router.hh
index 8f240551ca1a27fb6b7bc44f0d2c8c9d61c795c6..99b9cc1c3a260d2cc37839a295cca27bb4d728a8 100644 (file)
--- a/src/mem/ruby/network/garnet/flexible-pipeline/Router.hh
+++ b/src/mem/ruby/network/garnet/flexible-pipeline/Router.hh
@@ -34,14 +34,14 @@
 #include <iostream>
 #include <vector>
 
-#include "mem/ruby/network/garnet/NetworkHeader.hh"
-#include "mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.hh"
-#include "mem/ruby/network/garnet/flexible-pipeline/FlexibleConsumer.hh"
-#include "mem/ruby/network/garnet/flexible-pipeline/NetworkLink.hh"
 #include "mem/ruby/common/NetDest.hh"
-#include "mem/ruby/network/garnet/flexible-pipeline/flitBuffer.hh"
+#include "mem/ruby/network/garnet/flexible-pipeline/FlexibleConsumer.hh"
+#include "mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.hh"
 #include "mem/ruby/network/garnet/flexible-pipeline/InVcState.hh"
+#include "mem/ruby/network/garnet/flexible-pipeline/NetworkLink.hh"
 #include "mem/ruby/network/garnet/flexible-pipeline/OutVcState.hh"
+#include "mem/ruby/network/garnet/flexible-pipeline/flitBuffer.hh"
+#include "mem/ruby/network/garnet/NetworkHeader.hh"
 
 class VCarbiter;
 

diff --git a/src/mem/ruby/network/garnet/flexible-pipeline/VCarbiter.cc b/src/mem/ruby/network/garnet/flexible-pipeline/VCarbiter.cc
index f1960d62ddcec34ebb62fdceee2afa98e53f0ade..e68e1b12f21c5281fcda5a801e3bcab2f1a9007a 100644 (file)
--- a/src/mem/ruby/network/garnet/flexible-pipeline/VCarbiter.cc
+++ b/src/mem/ruby/network/garnet/flexible-pipeline/VCarbiter.cc
@@ -28,8 +28,8 @@
  * Authors: Niket Agarwal
  */
 
-#include "mem/ruby/network/garnet/flexible-pipeline/VCarbiter.hh"
 #include "mem/ruby/network/garnet/flexible-pipeline/Router.hh"
+#include "mem/ruby/network/garnet/flexible-pipeline/VCarbiter.hh"
 
 VCarbiter::VCarbiter(Router *router)
 {

diff --git a/src/mem/ruby/network/garnet/flexible-pipeline/VCarbiter.hh b/src/mem/ruby/network/garnet/flexible-pipeline/VCarbiter.hh
index 7aa6f9fc19e8f2d105643ed63b172db5a2f9396a..a56bfae0d3518cebf8b8a69b22ce0feac7d7ded8 100644 (file)
--- a/src/mem/ruby/network/garnet/flexible-pipeline/VCarbiter.hh
+++ b/src/mem/ruby/network/garnet/flexible-pipeline/VCarbiter.hh
@@ -33,8 +33,8 @@
 
 #include <iostream>
 
-#include "mem/ruby/network/garnet/NetworkHeader.hh"
 #include "mem/ruby/common/Consumer.hh"
+#include "mem/ruby/network/garnet/NetworkHeader.hh"
 
 class Router;
 

diff --git a/src/mem/ruby/network/garnet/flexible-pipeline/flitBuffer.hh b/src/mem/ruby/network/garnet/flexible-pipeline/flitBuffer.hh
index 619f3285f9d254255af6655a6a59b0ddb334c54a..e5628e93e6d2650db804a1b8013093ef97176351 100644 (file)
--- a/src/mem/ruby/network/garnet/flexible-pipeline/flitBuffer.hh
+++ b/src/mem/ruby/network/garnet/flexible-pipeline/flitBuffer.hh
@@ -34,8 +34,8 @@
 #include <iostream>
 #include <vector>
 
-#include "mem/ruby/network/garnet/NetworkHeader.hh"
 #include "mem/ruby/network/garnet/flexible-pipeline/flit.hh"
+#include "mem/ruby/network/garnet/NetworkHeader.hh"
 
 class flitBuffer
 {

diff --git a/src/mem/ruby/network/orion/Allocator/Arbiter.cc b/src/mem/ruby/network/orion/Allocator/Arbiter.cc
index 2f6c603011a1a2b348da7beb6443abc2a1bca52b..a4f480ae587174d96cfa3ba1994d6c391109a589 100644 (file)
--- a/src/mem/ruby/network/orion/Allocator/Arbiter.cc
+++ b/src/mem/ruby/network/orion/Allocator/Arbiter.cc
@@ -33,8 +33,8 @@
  *           Kambiz Samadi (Orion 2.0, UC San Diego)
  */
 
-#include <iostream>
 #include <cassert>
+#include <iostream>
 
 #include "mem/ruby/network/orion/Allocator/Arbiter.hh"
 #include "mem/ruby/network/orion/Allocator/MatrixArbiter.hh"

diff --git a/src/mem/ruby/network/orion/Allocator/MatrixArbiter.hh b/src/mem/ruby/network/orion/Allocator/MatrixArbiter.hh
index 7cb277a50b681e5de5895f16ba69fcf56e71a444..a4a74f25f41d6f1719f3abb6b68da98a1e790257 100644 (file)
--- a/src/mem/ruby/network/orion/Allocator/MatrixArbiter.hh
+++ b/src/mem/ruby/network/orion/Allocator/MatrixArbiter.hh
@@ -36,9 +36,8 @@
 #ifndef __MATRIXARBITER_H__
 #define __MATRIXARBITER_H__
 
-#include "mem/ruby/network/orion/Type.hh"
-
 #include "mem/ruby/network/orion/Allocator/Arbiter.hh"
+#include "mem/ruby/network/orion/Type.hh"
 
 class TechParameter;
 

diff --git a/src/mem/ruby/network/orion/Allocator/RRArbiter.cc b/src/mem/ruby/network/orion/Allocator/RRArbiter.cc
index 0dad2c5b781ebcdb3d36abf033340b9eb57369a4..c30be475a40c995e8ebdbaa6f1c45191d0a61d44 100644 (file)
--- a/src/mem/ruby/network/orion/Allocator/RRArbiter.cc
+++ b/src/mem/ruby/network/orion/Allocator/RRArbiter.cc
@@ -33,12 +33,12 @@
  *           Kambiz Samadi (Orion 2.0, UC San Diego)
  */
 
-#include <iostream>
 #include <cmath>
+#include <iostream>
 
 #include "mem/ruby/network/orion/Allocator/RRArbiter.hh"
-#include "mem/ruby/network/orion/TechParameter.hh"
 #include "mem/ruby/network/orion/FlipFlop.hh"
+#include "mem/ruby/network/orion/TechParameter.hh"
 
 using namespace std;
 

diff --git a/src/mem/ruby/network/orion/Allocator/RRArbiter.hh b/src/mem/ruby/network/orion/Allocator/RRArbiter.hh
index 24b4d38b8576d5876b12d808e600083f53bb67ac..e3d392e0116c6e77882c28f77e050f3763b97172 100644 (file)
--- a/src/mem/ruby/network/orion/Allocator/RRArbiter.hh
+++ b/src/mem/ruby/network/orion/Allocator/RRArbiter.hh
@@ -36,8 +36,8 @@
 #ifndef __RRARBITER_H__
 #define __RRARBITER_H__
 
-#include "mem/ruby/network/orion/Type.hh"
 #include "mem/ruby/network/orion/Allocator/Arbiter.hh"
+#include "mem/ruby/network/orion/Type.hh"
 
 class TechParameter;
 

diff --git a/src/mem/ruby/network/orion/Allocator/SWAllocator.cc b/src/mem/ruby/network/orion/Allocator/SWAllocator.cc
index 366779e450356433c9534a6ffccc2d43ebda5eba..0211d5ea9ee8e092e71b29cb1b5b538156347742 100644 (file)
--- a/src/mem/ruby/network/orion/Allocator/SWAllocator.cc
+++ b/src/mem/ruby/network/orion/Allocator/SWAllocator.cc
@@ -33,13 +33,13 @@
  *           Kambiz Samadi (Orion 2.0, UC San Diego)
  */
 
-#include <iostream>
 #include <cassert>
+#include <iostream>
 
-#include "mem/ruby/network/orion/Allocator/SWAllocator.hh"
-#include "mem/ruby/network/orion/OrionConfig.hh"
 #include "mem/ruby/network/orion/Allocator/Arbiter.hh"
+#include "mem/ruby/network/orion/Allocator/SWAllocator.hh"
 #include "mem/ruby/network/orion/Crossbar/Crossbar.hh"
+#include "mem/ruby/network/orion/OrionConfig.hh"
 
 using namespace std;
 

diff --git a/src/mem/ruby/network/orion/Allocator/VCAllocator.cc b/src/mem/ruby/network/orion/Allocator/VCAllocator.cc
index 38ac985f3ea32b6464d3d177d8b494a9181c3311..2f3ae2df26d34bcf65c660d1a81656fce34bf3d3 100644 (file)
--- a/src/mem/ruby/network/orion/Allocator/VCAllocator.cc
+++ b/src/mem/ruby/network/orion/Allocator/VCAllocator.cc
@@ -33,15 +33,15 @@
  *           Kambiz Samadi (Orion 2.0, UC San Diego)
  */
 
-#include <iostream>
 #include <cassert>
-#include <cstdlib>
 #include <cmath>
+#include <cstdlib>
+#include <iostream>
 
-#include "mem/ruby/network/orion/Allocator/VCAllocator.hh"
-#include "mem/ruby/network/orion/OrionConfig.hh"
 #include "mem/ruby/network/orion/Allocator/Arbiter.hh"
+#include "mem/ruby/network/orion/Allocator/VCAllocator.hh"
 #include "mem/ruby/network/orion/Buffer/Buffer.hh"
+#include "mem/ruby/network/orion/OrionConfig.hh"
 
 using namespace std;
 

diff --git a/src/mem/ruby/network/orion/Buffer/Buffer.cc b/src/mem/ruby/network/orion/Buffer/Buffer.cc
index 11c92094faf07d61d14f817448f2d8ecbd659920..b46aef6fdbef1b7e1b3a3bb562d9de6c59732778 100644 (file)
--- a/src/mem/ruby/network/orion/Buffer/Buffer.cc
+++ b/src/mem/ruby/network/orion/Buffer/Buffer.cc
@@ -33,14 +33,14 @@
  *           Kambiz Samadi (Orion 2.0, UC San Diego)
  */
 
-#include <iostream>
 #include <cassert>
+#include <iostream>
 
 #include "mem/ruby/network/orion/Buffer/Buffer.hh"
-#include "mem/ruby/network/orion/TechParameter.hh"
-#include "mem/ruby/network/orion/OrionConfig.hh"
-#include "mem/ruby/network/orion/Buffer/SRAM.hh"
 #include "mem/ruby/network/orion/Buffer/Register.hh"
+#include "mem/ruby/network/orion/Buffer/SRAM.hh"
+#include "mem/ruby/network/orion/OrionConfig.hh"
+#include "mem/ruby/network/orion/TechParameter.hh"
 
 using namespace std;
 

diff --git a/src/mem/ruby/network/orion/Buffer/DecoderUnit.hh b/src/mem/ruby/network/orion/Buffer/DecoderUnit.hh
index 93bee26aea2ab455389e579a730d1420a3baffdb..2ab32cd7a55353727d094a68c1e3a32c80c947c7 100644 (file)
--- a/src/mem/ruby/network/orion/Buffer/DecoderUnit.hh
+++ b/src/mem/ruby/network/orion/Buffer/DecoderUnit.hh
@@ -36,8 +36,8 @@
 #ifndef __DECODERUNIT_H__
 #define __DECODERUNIT_H__
 
-#include "mem/ruby/network/orion/Type.hh"
 #include "mem/ruby/network/orion/TechParameter.hh"
+#include "mem/ruby/network/orion/Type.hh"
 
 class DecoderUnit
 {

diff --git a/src/mem/ruby/network/orion/Buffer/OutdrvUnit.cc b/src/mem/ruby/network/orion/Buffer/OutdrvUnit.cc
index ce17074912218d25ba1c86887cd7274d7e9bbedf..07ab5f20223f61291e59d684ed875a1c66f20f30 100644 (file)
--- a/src/mem/ruby/network/orion/Buffer/OutdrvUnit.cc
+++ b/src/mem/ruby/network/orion/Buffer/OutdrvUnit.cc
@@ -35,8 +35,8 @@
 
 #include "base/misc.hh"
 #include "mem/ruby/network/orion/Buffer/OutdrvUnit.hh"
-#include "mem/ruby/network/orion/TechParameter.hh"
 #include "mem/ruby/network/orion/Buffer/SRAM.hh"
+#include "mem/ruby/network/orion/TechParameter.hh"
 
 OutdrvUnit::OutdrvUnit(
         const string& outdrv_model_str_,

diff --git a/src/mem/ruby/network/orion/Buffer/PrechargeUnit.cc b/src/mem/ruby/network/orion/Buffer/PrechargeUnit.cc
index 480ebe82ca9771da5767bee0bd579269d1af658b..9d15843c62721906def15253c394d735a16661a3 100644 (file)
--- a/src/mem/ruby/network/orion/Buffer/PrechargeUnit.cc
+++ b/src/mem/ruby/network/orion/Buffer/PrechargeUnit.cc
@@ -35,8 +35,8 @@
 
 #include "base/misc.hh"
 #include "mem/ruby/network/orion/Buffer/PrechargeUnit.hh"
-#include "mem/ruby/network/orion/TechParameter.hh"
 #include "mem/ruby/network/orion/Buffer/SRAM.hh"
+#include "mem/ruby/network/orion/TechParameter.hh"
 
 PrechargeUnit::PrechargeUnit(
         const string& pre_model_str_,

diff --git a/src/mem/ruby/network/orion/Buffer/Register.cc b/src/mem/ruby/network/orion/Buffer/Register.cc
index 364e5a833823cb79b3736853b368a30ad2e13032..933480f1e58cf7a7488fea04ccf2430f23b2a58d 100644 (file)
--- a/src/mem/ruby/network/orion/Buffer/Register.cc
+++ b/src/mem/ruby/network/orion/Buffer/Register.cc
@@ -33,12 +33,12 @@
  *           Kambiz Samadi (Orion 2.0, UC San Diego)
  */
 
-#include <iostream>
 #include <cassert>
+#include <iostream>
 
 #include "mem/ruby/network/orion/Buffer/Register.hh"
-#include "mem/ruby/network/orion/TechParameter.hh"
 #include "mem/ruby/network/orion/FlipFlop.hh"
+#include "mem/ruby/network/orion/TechParameter.hh"
 
 using namespace std;
 

diff --git a/src/mem/ruby/network/orion/Buffer/SRAM.cc b/src/mem/ruby/network/orion/Buffer/SRAM.cc
index d8f500de5e9af4757cc1000babbbeea9e097e589..00460a32a7d28a07e8482aa502b3cce0d86a1396 100644 (file)
--- a/src/mem/ruby/network/orion/Buffer/SRAM.cc
+++ b/src/mem/ruby/network/orion/Buffer/SRAM.cc
@@ -33,18 +33,18 @@
  *           Kambiz Samadi (Orion 2.0, UC San Diego)
  */
 
-#include <iostream>
-#include <cmath>
 #include <cassert>
+#include <cmath>
+#include <iostream>
 
-#include "mem/ruby/network/orion/Buffer/SRAM.hh"
-#include "mem/ruby/network/orion/Buffer/OutdrvUnit.hh"
 #include "mem/ruby/network/orion/Buffer/AmpUnit.hh"
 #include "mem/ruby/network/orion/Buffer/BitlineUnit.hh"
+#include "mem/ruby/network/orion/Buffer/DecoderUnit.hh"
 #include "mem/ruby/network/orion/Buffer/MemUnit.hh"
+#include "mem/ruby/network/orion/Buffer/OutdrvUnit.hh"
 #include "mem/ruby/network/orion/Buffer/PrechargeUnit.hh"
+#include "mem/ruby/network/orion/Buffer/SRAM.hh"
 #include "mem/ruby/network/orion/Buffer/WordlineUnit.hh"
-#include "mem/ruby/network/orion/Buffer/DecoderUnit.hh"
 
 using namespace std;
 

diff --git a/src/mem/ruby/network/orion/Buffer/SRAM.hh b/src/mem/ruby/network/orion/Buffer/SRAM.hh
index 7b3f4669834a0531683cd2f93a9fe1febc4bfd50..959cc82788ac14408bb0d6a5e47e6fd59f2a3d27 100644 (file)
--- a/src/mem/ruby/network/orion/Buffer/SRAM.hh
+++ b/src/mem/ruby/network/orion/Buffer/SRAM.hh
@@ -36,9 +36,9 @@
 #ifndef __SRAM_H__
 #define __SRAM_H__
 
-#include "mem/ruby/network/orion/Type.hh"
 #include "mem/ruby/network/orion/OrionConfig.hh"
 #include "mem/ruby/network/orion/TechParameter.hh"
+#include "mem/ruby/network/orion/Type.hh"
 
 class OutdrvUnit;
 class AmpUnit;

diff --git a/src/mem/ruby/network/orion/Buffer/WordlineUnit.cc b/src/mem/ruby/network/orion/Buffer/WordlineUnit.cc
index 3f2cdc34bc8e308f1913d7fe89d4c7f6a2e6941d..f56dc06311151dc1e422b2fef7469f3294138f07 100644 (file)
--- a/src/mem/ruby/network/orion/Buffer/WordlineUnit.cc
+++ b/src/mem/ruby/network/orion/Buffer/WordlineUnit.cc
@@ -34,8 +34,8 @@
  */
 
 #include "base/misc.hh"
-#include "mem/ruby/network/orion/Buffer/WordlineUnit.hh"
 #include "mem/ruby/network/orion/Buffer/SRAM.hh"
+#include "mem/ruby/network/orion/Buffer/WordlineUnit.hh"
 #include "mem/ruby/network/orion/TechParameter.hh"
 
 WordlineUnit::WordlineUnit(

diff --git a/src/mem/ruby/network/orion/Clock.cc b/src/mem/ruby/network/orion/Clock.cc
index 27c6e233237717bedc67c8e7e67fc4e149bbec4c..303469e0c2f7a4da2203155652bb5f8640faa644 100644 (file)
--- a/src/mem/ruby/network/orion/Clock.cc
+++ b/src/mem/ruby/network/orion/Clock.cc
@@ -34,8 +34,8 @@
  */
 
 #include "mem/ruby/network/orion/Clock.hh"
-#include "mem/ruby/network/orion/TechParameter.hh"
 #include "mem/ruby/network/orion/OrionConfig.hh"
+#include "mem/ruby/network/orion/TechParameter.hh"
 #include "mem/ruby/network/orion/Wire.hh"
 
 Clock::Clock(

diff --git a/src/mem/ruby/network/orion/ConfigFile.hh b/src/mem/ruby/network/orion/ConfigFile.hh
index 65cf50069b203ad96a61603556f5903da9b0f979..b159bba8cc7faac8e94f114322d9d4816628d412 100644 (file)
--- a/src/mem/ruby/network/orion/ConfigFile.hh
+++ b/src/mem/ruby/network/orion/ConfigFile.hh
@@ -42,11 +42,11 @@
 #ifndef CONFIGFILE_H
 #define CONFIGFILE_H
 
-#include <string>
-#include <map>
-#include <iostream>
 #include <fstream>
+#include <iostream>
+#include <map>
 #include <sstream>
+#include <string>
 
 using std::string;
 

diff --git a/src/mem/ruby/network/orion/Crossbar/Crossbar.cc b/src/mem/ruby/network/orion/Crossbar/Crossbar.cc
index 65f1c20f9a0807c8d5e02d9ff89026564d46f740..7bb29a5c763d45cff9695a2c4528baab8f7dd3d7 100644 (file)
--- a/src/mem/ruby/network/orion/Crossbar/Crossbar.cc
+++ b/src/mem/ruby/network/orion/Crossbar/Crossbar.cc
@@ -33,14 +33,14 @@
  *           Kambiz Samadi (Orion 2.0, UC San Diego)
  */
 
-#include <iostream>
 #include <cassert>
+#include <iostream>
 
 #include "mem/ruby/network/orion/Crossbar/Crossbar.hh"
-#include "mem/ruby/network/orion/TechParameter.hh"
-#include "mem/ruby/network/orion/OrionConfig.hh"
 #include "mem/ruby/network/orion/Crossbar/MatrixCrossbar.hh"
 #include "mem/ruby/network/orion/Crossbar/MultreeCrossbar.hh"
+#include "mem/ruby/network/orion/OrionConfig.hh"
+#include "mem/ruby/network/orion/TechParameter.hh"
 
 using namespace std;
 

diff --git a/src/mem/ruby/network/orion/Crossbar/MatrixCrossbar.cc b/src/mem/ruby/network/orion/Crossbar/MatrixCrossbar.cc
index f283f6176bf2aa48e883957843f287cde64cab5e..3e379bac268cf134e01f004d4d00612e31de1dcd 100644 (file)
--- a/src/mem/ruby/network/orion/Crossbar/MatrixCrossbar.cc
+++ b/src/mem/ruby/network/orion/Crossbar/MatrixCrossbar.cc
@@ -33,8 +33,8 @@
  *           Kambiz Samadi (Orion 2.0, UC San Diego)
  */
 
-#include <iostream>
 #include <cassert>
+#include <iostream>
 
 #include "mem/ruby/network/orion/Crossbar/MatrixCrossbar.hh"
 #include "mem/ruby/network/orion/TechParameter.hh"

diff --git a/src/mem/ruby/network/orion/Crossbar/MatrixCrossbar.hh b/src/mem/ruby/network/orion/Crossbar/MatrixCrossbar.hh
index cbfcf9fc7c6bb5fd2a8ff66f7da905d181048df3..af08834ac8fc11bb3e379a92f91f0fc41da51b40 100644 (file)
--- a/src/mem/ruby/network/orion/Crossbar/MatrixCrossbar.hh
+++ b/src/mem/ruby/network/orion/Crossbar/MatrixCrossbar.hh
@@ -36,8 +36,8 @@
 #ifndef __MATRIXCROSSBAR_H__
 #define __MATRIXCROSSBAR_H__
 
-#include "mem/ruby/network/orion/Type.hh"
 #include "mem/ruby/network/orion/Crossbar/Crossbar.hh"
+#include "mem/ruby/network/orion/Type.hh"
 
 class TechParameter;
 

diff --git a/src/mem/ruby/network/orion/Crossbar/MultreeCrossbar.cc b/src/mem/ruby/network/orion/Crossbar/MultreeCrossbar.cc
index 44fa43cac65d15ce9e7c8ecbc15120e0829d51d3..4c610ebafbba3b9812a9642e6fefa479db0cceec 100644 (file)
--- a/src/mem/ruby/network/orion/Crossbar/MultreeCrossbar.cc
+++ b/src/mem/ruby/network/orion/Crossbar/MultreeCrossbar.cc
@@ -33,8 +33,8 @@
  *           Kambiz Samadi (Orion 2.0, UC San Diego)
  */
 
-#include <iostream>
 #include <cmath>
+#include <iostream>
 
 #include "mem/ruby/network/orion/Crossbar/MultreeCrossbar.hh"
 #include "mem/ruby/network/orion/TechParameter.hh"

diff --git a/src/mem/ruby/network/orion/Crossbar/MultreeCrossbar.hh b/src/mem/ruby/network/orion/Crossbar/MultreeCrossbar.hh
index bac8b22cdcd091fe500cd7ddb138133314129df1..6a339503628eaf8074bad0206e2a1fe752468a7d 100644 (file)
--- a/src/mem/ruby/network/orion/Crossbar/MultreeCrossbar.hh
+++ b/src/mem/ruby/network/orion/Crossbar/MultreeCrossbar.hh
@@ -36,8 +36,8 @@
 #ifndef __MULTREECROSSBAR_H__
 #define __MULTREECROSSBAR_H__
 
-#include "mem/ruby/network/orion/Type.hh"
 #include "mem/ruby/network/orion/Crossbar/Crossbar.hh"
+#include "mem/ruby/network/orion/Type.hh"
 
 class TechParameter;
 

diff --git a/src/mem/ruby/network/orion/FlipFlop.cc b/src/mem/ruby/network/orion/FlipFlop.cc
index 5b76d0a237ba81b428b820eabbc8939a9b95fce2..2b44b0fb42a7989296c30a4f13f208b06e645959 100644 (file)
--- a/src/mem/ruby/network/orion/FlipFlop.cc
+++ b/src/mem/ruby/network/orion/FlipFlop.cc
@@ -33,8 +33,8 @@
  *           Kambiz Samadi (Orion 2.0, UC San Diego)
  */
 
-#include <iostream>
 #include <cassert>
+#include <iostream>
 
 #include "mem/ruby/network/orion/FlipFlop.hh"
 #include "mem/ruby/network/orion/TechParameter.hh"

diff --git a/src/mem/ruby/network/orion/NetworkPower.cc b/src/mem/ruby/network/orion/NetworkPower.cc
index a28b8fd075957fb4ee3974e336cfd5d20c2388a8..81d611f63edbe0e6bdf7587d9024ceff3748e161 100644 (file)
--- a/src/mem/ruby/network/orion/NetworkPower.cc
+++ b/src/mem/ruby/network/orion/NetworkPower.cc
@@ -31,8 +31,8 @@
 
 #include "mem/ruby/network/orion/NetworkPower.hh"
 #include "mem/ruby/network/orion/OrionConfig.hh"
-#include "mem/ruby/network/orion/OrionRouter.hh"
 #include "mem/ruby/network/orion/OrionLink.hh"
+#include "mem/ruby/network/orion/OrionRouter.hh"
 
 double
 Router_d::calculate_power()

diff --git a/src/mem/ruby/network/orion/NetworkPower.hh b/src/mem/ruby/network/orion/NetworkPower.hh
index 591f45362046b123c079cbafa1a5dc3bd250f665..eee7d03bc53a7197ea6635343341a8a3f67783d7 100644 (file)
--- a/src/mem/ruby/network/orion/NetworkPower.hh
+++ b/src/mem/ruby/network/orion/NetworkPower.hh
@@ -32,12 +32,12 @@
 #ifndef POWER_TRACE_H
 #define POWER_TRACE_H
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <assert.h>
+#include <cassert>
+#include <cstdio>
+#include <cstdlib>
 
-#include "mem/ruby/network/garnet/fixed-pipeline/NetworkLink_d.hh"
 #include "mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.hh"
+#include "mem/ruby/network/garnet/fixed-pipeline/NetworkLink_d.hh"
 #include "mem/ruby/network/garnet/fixed-pipeline/Router_d.hh"
 
 //int RW :

diff --git a/src/mem/ruby/network/orion/OrionConfig.cc b/src/mem/ruby/network/orion/OrionConfig.cc
index a4ac55a367270e0b7bee0d602200a2372a0bf41b..ca30bca3bc74b1fd424be2f65904a70aabce5c27 100644 (file)
--- a/src/mem/ruby/network/orion/OrionConfig.cc
+++ b/src/mem/ruby/network/orion/OrionConfig.cc
@@ -31,8 +31,8 @@
 #include <iostream>
 #include <string>
 
-#include "mem/ruby/network/orion/OrionConfig.hh"
 #include "mem/ruby/network/orion/ConfigFile.hh"
+#include "mem/ruby/network/orion/OrionConfig.hh"
 #include "mem/ruby/network/orion/TechParameter.hh"
 
 using namespace std;

diff --git a/src/mem/ruby/network/orion/OrionConfig.hh b/src/mem/ruby/network/orion/OrionConfig.hh
index 78131e3c5b13fd2fbdca627289bf323c662d39cc..7138fd8a242dab7aa934112aa508aae9cac5c6ba 100644 (file)
--- a/src/mem/ruby/network/orion/OrionConfig.hh
+++ b/src/mem/ruby/network/orion/OrionConfig.hh
@@ -32,8 +32,8 @@
 #define __ORIONCONFIG_H__
 
 #include <iostream>
-#include <sstream>
 #include <map>
+#include <sstream>
 
 #include "mem/ruby/network/orion/Type.hh"
 

diff --git a/src/mem/ruby/network/orion/OrionLink.cc b/src/mem/ruby/network/orion/OrionLink.cc
index 38ddd0459e8e41ee4df1b02bb97b6b107ac23b79..c10552d7a1275fc454653df25532619eb08df377 100644 (file)
--- a/src/mem/ruby/network/orion/OrionLink.cc
+++ b/src/mem/ruby/network/orion/OrionLink.cc
@@ -33,11 +33,11 @@
  *           Kambiz Samadi (Orion 2.0, UC San Diego)
  */
 
-#include <iostream>
 #include <cassert>
+#include <iostream>
 
-#include "mem/ruby/network/orion/OrionLink.hh"
 #include "mem/ruby/network/orion/OrionConfig.hh"
+#include "mem/ruby/network/orion/OrionLink.hh"
 #include "mem/ruby/network/orion/Wire.hh"
 
 using namespace std;

diff --git a/src/mem/ruby/network/orion/OrionRouter.cc b/src/mem/ruby/network/orion/OrionRouter.cc
index 1dd92d885a2cedf85a25c3fcf608a193af3ed0fe..579114f3d895e7b46ae92041f49f23c6a1eec906 100644 (file)
--- a/src/mem/ruby/network/orion/OrionRouter.cc
+++ b/src/mem/ruby/network/orion/OrionRouter.cc
@@ -35,13 +35,13 @@
 
 #include <cassert>
 
-#include "OrionRouter.hh"
-#include "mem/ruby/network/orion/OrionConfig.hh"
+#include "mem/ruby/network/orion/Allocator/SWAllocator.hh"
+#include "mem/ruby/network/orion/Allocator/VCAllocator.hh"
 #include "mem/ruby/network/orion/Buffer/Buffer.hh"
 #include "mem/ruby/network/orion/Crossbar/Crossbar.hh"
-#include "mem/ruby/network/orion/Allocator/VCAllocator.hh"
-#include "mem/ruby/network/orion/Allocator/SWAllocator.hh"
 #include "mem/ruby/network/orion/Clock.hh"
+#include "mem/ruby/network/orion/OrionConfig.hh"
+#include "OrionRouter.hh"
 
 OrionRouter::OrionRouter(
     uint32_t num_in_port_,

diff --git a/src/mem/ruby/network/orion/TechParameter.cc b/src/mem/ruby/network/orion/TechParameter.cc
index d1a107e1829bbd31fe4fe5328c56fd02da0a9cf3..5147eaec1339d1a109d3393e61427e7a80bfce0c 100644 (file)
--- a/src/mem/ruby/network/orion/TechParameter.cc
+++ b/src/mem/ruby/network/orion/TechParameter.cc
@@ -33,13 +33,13 @@
  *           Kambiz Samadi (Orion 2.0, UC San Diego)
  */
 
-#include <iostream>
-#include <string>
 #include <cmath>
 #include <cstdlib>
+#include <iostream>
+#include <string>
 
-#include "mem/ruby/network/orion/TechParameter.hh"
 #include "mem/ruby/network/orion/OrionConfig.hh"
+#include "mem/ruby/network/orion/TechParameter.hh"
 
 using namespace std;
 

diff --git a/src/mem/ruby/network/orion/Wire.cc b/src/mem/ruby/network/orion/Wire.cc
index c704fa8da3338ec39ff04e0cb57c9c8e5f64950f..d7333dd19ceb401c1f6be2c71002a2bb9d56860e 100644 (file)
--- a/src/mem/ruby/network/orion/Wire.cc
+++ b/src/mem/ruby/network/orion/Wire.cc
@@ -33,13 +33,13 @@
  *           Kambiz Samadi (Orion 2.0, UC San Diego)
  */
 
-#include <iostream>
 #include <cmath>
 #include <cstdlib>
+#include <iostream>
 
 #include "base/misc.hh"
-#include "mem/ruby/network/orion/Wire.hh"
 #include "mem/ruby/network/orion/TechParameter.hh"
+#include "mem/ruby/network/orion/Wire.hh"
 
 using namespace std;
 

diff --git a/src/mem/ruby/network/orion/orion.hh b/src/mem/ruby/network/orion/orion.hh
index a9cc2a5b6faa3498666ba80d5f3718ab4cf7f8c7..215398583e54839ee5888a871c56925d622977f7 100644 (file)
--- a/src/mem/ruby/network/orion/orion.hh
+++ b/src/mem/ruby/network/orion/orion.hh
@@ -32,8 +32,8 @@
 #define __ORION_H__
 
 #include "mem/ruby/network/orion/OrionConfig.hh"
-#include "mem/ruby/network/orion/OrionRouter.hh"
 #include "mem/ruby/network/orion/OrionLink.hh"
+#include "mem/ruby/network/orion/OrionRouter.hh"
 
 #endif
 

diff --git a/src/mem/ruby/network/simple/PerfectSwitch.hh b/src/mem/ruby/network/simple/PerfectSwitch.hh
index 41125083f690b7cb120e4bfaa6717e0e1015da39..15abec02084c88c71b1cf7be23fa5080102b43af 100644 (file)
--- a/src/mem/ruby/network/simple/PerfectSwitch.hh
+++ b/src/mem/ruby/network/simple/PerfectSwitch.hh
@@ -37,8 +37,8 @@
 #define __MEM_RUBY_NETWORK_SIMPLE_PERFECTSWITCH_HH__
 
 #include <iostream>
-#include <vector>
 #include <string>
+#include <vector>
 
 #include "mem/ruby/common/Consumer.hh"
 #include "mem/ruby/common/Global.hh"

diff --git a/src/mem/ruby/network/simple/Switch.cc b/src/mem/ruby/network/simple/Switch.cc
index 3439bf44b567bfa0df391c8ef850e662fac10471..391e087247c5f81272a233b00a6f2e9c1807877d 100644 (file)
--- a/src/mem/ruby/network/simple/Switch.cc
+++ b/src/mem/ruby/network/simple/Switch.cc
@@ -32,10 +32,10 @@
 #include "mem/protocol/MessageSizeType.hh"
 #include "mem/protocol/Protocol.hh"
 #include "mem/ruby/buffers/MessageBuffer.hh"
-#include "mem/ruby/network/Network.hh"
 #include "mem/ruby/network/simple/PerfectSwitch.hh"
 #include "mem/ruby/network/simple/Switch.hh"
 #include "mem/ruby/network/simple/Throttle.hh"
+#include "mem/ruby/network/Network.hh"
 
 using namespace std;
 using m5::stl_helpers::deletePointers;

diff --git a/src/mem/ruby/network/simple/Throttle.cc b/src/mem/ruby/network/simple/Throttle.cc
index 28638cca91fcf9ae0602be954dde90a9ee9d54af..0274a9771951d2869e9a42109b07d65889772e09 100644 (file)
--- a/src/mem/ruby/network/simple/Throttle.cc
+++ b/src/mem/ruby/network/simple/Throttle.cc
@@ -31,8 +31,8 @@
 #include "base/cprintf.hh"
 #include "mem/protocol/Protocol.hh"
 #include "mem/ruby/buffers/MessageBuffer.hh"
-#include "mem/ruby/network/Network.hh"
 #include "mem/ruby/network/simple/Throttle.hh"
+#include "mem/ruby/network/Network.hh"
 #include "mem/ruby/slicc_interface/NetworkMessage.hh"
 #include "mem/ruby/system/System.hh"
 

diff --git a/src/mem/ruby/network/simple/Throttle.hh b/src/mem/ruby/network/simple/Throttle.hh
index b4e6c867ebc8617326963787e238e2fd6d3894b5..0a1fc9a301184efc87c870d25748413ffb4bebe2 100644 (file)
--- a/src/mem/ruby/network/simple/Throttle.hh
+++ b/src/mem/ruby/network/simple/Throttle.hh
@@ -39,8 +39,8 @@
 #define __MEM_RUBY_NETWORK_SIMPLE_THROTTLE_HH__
 
 #include <iostream>
-#include <vector>
 #include <string>
+#include <vector>
 
 #include "mem/ruby/common/Consumer.hh"
 #include "mem/ruby/common/Global.hh"

diff --git a/src/mem/ruby/network/simple/Topology.cc b/src/mem/ruby/network/simple/Topology.cc
index d79491ef280e2b35e6302f0d5e3168cfcc881b69..a06c1578d34da65ca7ae0af1dc860d8bd0ce1838 100644 (file)
--- a/src/mem/ruby/network/simple/Topology.cc
+++ b/src/mem/ruby/network/simple/Topology.cc
@@ -32,8 +32,8 @@
 #include "mem/protocol/Protocol.hh"
 #include "mem/protocol/TopologyType.hh"
 #include "mem/ruby/common/NetDest.hh"
-#include "mem/ruby/network/Network.hh"
 #include "mem/ruby/network/simple/Topology.hh"
+#include "mem/ruby/network/Network.hh"
 #include "mem/ruby/slicc_interface/AbstractController.hh"
 #include "mem/ruby/system/System.hh"
 

diff --git a/src/mem/ruby/profiler/CacheProfiler.hh b/src/mem/ruby/profiler/CacheProfiler.hh
index 1ae6ba7a8685dec2f1430798c57068e72df1bd6c..33cb45e852fa2515203985c9f55110ad9572f4dc 100644 (file)
--- a/src/mem/ruby/profiler/CacheProfiler.hh
+++ b/src/mem/ruby/profiler/CacheProfiler.hh
@@ -33,10 +33,10 @@
 #include <string>
 #include <vector>
 
-#include "mem/protocol/RubyAccessMode.hh"
-#include "mem/protocol/RubyRequestType.hh"
 #include "mem/protocol/GenericRequestType.hh"
 #include "mem/protocol/PrefetchBit.hh"
+#include "mem/protocol/RubyAccessMode.hh"
+#include "mem/protocol/RubyRequestType.hh"
 #include "mem/ruby/common/Global.hh"
 #include "mem/ruby/common/Histogram.hh"
 #include "mem/ruby/system/NodeID.hh"

diff --git a/src/mem/ruby/profiler/Profiler.cc b/src/mem/ruby/profiler/Profiler.cc
index ed7c25c9d7e62a8f8047e9c13c76d6ad10ac76d6..afb77f09f866438a1be5c416aa0729004464e6fd 100644 (file)
--- a/src/mem/ruby/profiler/Profiler.cc
+++ b/src/mem/ruby/profiler/Profiler.cc
@@ -51,14 +51,13 @@
 
 #include "base/stl_helpers.hh"
 #include "base/str.hh"
-#include "mem/protocol/RubyRequest.hh"
 #include "mem/protocol/MachineType.hh"
 #include "mem/protocol/Protocol.hh"
+#include "mem/protocol/RubyRequest.hh"
 #include "mem/ruby/network/Network.hh"
 #include "mem/ruby/profiler/AddressProfiler.hh"
 #include "mem/ruby/profiler/Profiler.hh"
 #include "mem/ruby/system/System.hh"
-#include "mem/ruby/system/System.hh"
 
 using namespace std;
 using m5::stl_helpers::operator<<;

diff --git a/src/mem/ruby/profiler/Profiler.hh b/src/mem/ruby/profiler/Profiler.hh
index 352ba453f39456ce81f74421392af4610c255a72..9efaf4be10e2e20755511cc727f46a6e77365a6c 100644 (file)
--- a/src/mem/ruby/profiler/Profiler.hh
+++ b/src/mem/ruby/profiler/Profiler.hh
@@ -51,12 +51,12 @@
 #include <vector>
 
 #include "base/hashmap.hh"
-#include "mem/protocol/RubyAccessMode.hh"
 #include "mem/protocol/AccessType.hh"
-#include "mem/protocol/RubyRequestType.hh"
 #include "mem/protocol/GenericMachineType.hh"
 #include "mem/protocol/GenericRequestType.hh"
 #include "mem/protocol/PrefetchBit.hh"
+#include "mem/protocol/RubyAccessMode.hh"
+#include "mem/protocol/RubyRequestType.hh"
 #include "mem/ruby/common/Address.hh"
 #include "mem/ruby/common/Consumer.hh"
 #include "mem/ruby/common/Global.hh"

diff --git a/src/mem/ruby/recorder/CacheRecorder.cc b/src/mem/ruby/recorder/CacheRecorder.cc
index 1d08eef12a160c230d399ed4db065a15fd22a200..fc6ad097528dbf0a524fc59436581cf55a7afc04 100644 (file)
--- a/src/mem/ruby/recorder/CacheRecorder.cc
+++ b/src/mem/ruby/recorder/CacheRecorder.cc
@@ -28,10 +28,9 @@
 
 #include <algorithm>
 
-#include "gzstream.hh"
-
 #include "mem/ruby/eventqueue/RubyEventQueue.hh"
 #include "mem/ruby/recorder/CacheRecorder.hh"
+#include "gzstream.hh"
 
 using namespace std;
 

diff --git a/src/mem/ruby/recorder/CacheRecorder.hh b/src/mem/ruby/recorder/CacheRecorder.hh
index 1aac9a7e2eb1993af74ffe8db7f449a62cd68602..97a20af2878e72f061898399bcd97a28c67af4fd 100644 (file)
--- a/src/mem/ruby/recorder/CacheRecorder.hh
+++ b/src/mem/ruby/recorder/CacheRecorder.hh
@@ -40,8 +40,8 @@
 
 #include "mem/protocol/RubyRequestType.hh"
 #include "mem/ruby/common/Global.hh"
-#include "mem/ruby/system/NodeID.hh"
 #include "mem/ruby/recorder/TraceRecord.hh"
+#include "mem/ruby/system/NodeID.hh"
 
 class Address;
 class TraceRecord;

diff --git a/src/mem/ruby/recorder/Tracer.hh b/src/mem/ruby/recorder/Tracer.hh
index 39bab72a100300c4bfe6aa4a0625b41af5df0bf4..e050b38126a163ca944bf889cd64b8b32804170c 100644 (file)
--- a/src/mem/ruby/recorder/Tracer.hh
+++ b/src/mem/ruby/recorder/Tracer.hh
@@ -37,13 +37,12 @@
 #include <iostream>
 #include <string>
 
-#include "gzstream.hh"
-
 #include "mem/protocol/RubyRequestType.hh"
 #include "mem/ruby/common/Global.hh"
 #include "mem/ruby/system/NodeID.hh"
 #include "params/RubyTracer.hh"
 #include "sim/sim_object.hh"
+#include "gzstream.hh"
 
 class Address;
 class TraceRecord;

diff --git a/src/mem/ruby/slicc_interface/AbstractEntry.hh b/src/mem/ruby/slicc_interface/AbstractEntry.hh
index 6752bf6c4e107f0d70c842f57c0d8827a274b358..7076d2e4c0cad151bf116380ddf8b4439b5edcaf 100644 (file)
--- a/src/mem/ruby/slicc_interface/AbstractEntry.hh
+++ b/src/mem/ruby/slicc_interface/AbstractEntry.hh
@@ -31,9 +31,9 @@
 
 #include <iostream>
 
+#include "mem/protocol/AccessPermission.hh"
 #include "mem/ruby/common/Address.hh"
 #include "mem/ruby/common/Global.hh"
-#include "mem/protocol/AccessPermission.hh"
 
 class DataBlock;
 

diff --git a/src/mem/ruby/slicc_interface/RubyRequest.hh b/src/mem/ruby/slicc_interface/RubyRequest.hh
index 8ac43a8e19c08f5a57f664802a9bf308dbd23f77..0e7ab039d9e4e17a03e0e784937794e085305a3b 100644 (file)
--- a/src/mem/ruby/slicc_interface/RubyRequest.hh
+++ b/src/mem/ruby/slicc_interface/RubyRequest.hh
@@ -31,12 +31,12 @@
 
 #include <ostream>
 
-#include "mem/packet.hh"
-#include "mem/protocol/RubyAccessMode.hh"
-#include "mem/protocol/RubyRequestType.hh"
 #include "mem/protocol/Message.hh"
 #include "mem/protocol/PrefetchBit.hh"
+#include "mem/protocol/RubyAccessMode.hh"
+#include "mem/protocol/RubyRequestType.hh"
 #include "mem/ruby/common/Address.hh"
+#include "mem/packet.hh"
 
 typedef void* RubyPortHandle;
 

diff --git a/src/mem/ruby/slicc_interface/RubySlicc_ComponentMapping.cc b/src/mem/ruby/slicc_interface/RubySlicc_ComponentMapping.cc
index 79b9821ba3c8b56a3a78c8e2723e36cee158edaa..06c036a10fa54a53429a5edef7b5a2d3e88b978f 100644 (file)
--- a/src/mem/ruby/slicc_interface/RubySlicc_ComponentMapping.cc
+++ b/src/mem/ruby/slicc_interface/RubySlicc_ComponentMapping.cc
@@ -28,5 +28,3 @@
 
 #include "mem/ruby/slicc_interface/RubySlicc_ComponentMapping.hh"
 #include "mem/ruby/system/CacheMemory.hh"
-
-

diff --git a/src/mem/ruby/slicc_interface/RubySlicc_includes.hh b/src/mem/ruby/slicc_interface/RubySlicc_includes.hh
index ae98b308422149eac2475cfe32e7ca78eb316c25..6defbbaa8527adefb9640173c0b972b1ee884c8f 100644 (file)
--- a/src/mem/ruby/slicc_interface/RubySlicc_includes.hh
+++ b/src/mem/ruby/slicc_interface/RubySlicc_includes.hh
@@ -30,8 +30,8 @@
 #define __MEM_RUBY_SLICC_INTERFACE_RUBYSLICC_INCLUDES_HH__
 
 #include "mem/ruby/slicc_interface/RubySlicc_ComponentMapping.hh"
-#include "mem/ruby/slicc_interface/RubySlicc_Util.hh"
 #include "mem/ruby/slicc_interface/RubySlicc_Profiler_interface.hh"
+#include "mem/ruby/slicc_interface/RubySlicc_Util.hh"
 
 #endif // __MEM_RUBY_SLICC_INTERFACE_RUBYSLICC_INCLUDES_HH__
 

diff --git a/src/mem/ruby/system/CacheMemory.hh b/src/mem/ruby/system/CacheMemory.hh
index e2e9a429e90ad2eb4cdf5fc0f94ccc6961f00d68..4e4206e8de8b8a9ee2002b8db21fc9944d67b61d 100644 (file)
--- a/src/mem/ruby/system/CacheMemory.hh
+++ b/src/mem/ruby/system/CacheMemory.hh
@@ -35,10 +35,10 @@
 
 #include "base/hashmap.hh"
 #include "mem/protocol/AccessPermission.hh"
-#include "mem/protocol/RubyRequest.hh"
-#include "mem/protocol/RubyRequestType.hh"
 #include "mem/protocol/GenericRequestType.hh"
 #include "mem/protocol/MachineType.hh"
+#include "mem/protocol/RubyRequest.hh"
+#include "mem/protocol/RubyRequestType.hh"
 #include "mem/ruby/common/Address.hh"
 #include "mem/ruby/common/DataBlock.hh"
 #include "mem/ruby/common/Global.hh"

diff --git a/src/mem/ruby/system/RubyPort.cc b/src/mem/ruby/system/RubyPort.cc
index 6d5cb71bf9296b345e8514da8c3182b29098bd93..354634358e1ea8b68f188d98bca65c33f17dc70b 100644 (file)
--- a/src/mem/ruby/system/RubyPort.cc
+++ b/src/mem/ruby/system/RubyPort.cc
@@ -31,9 +31,9 @@
 #include "arch/x86/insts/microldstop.hh"
 #endif // X86_ISA
 #include "cpu/testers/rubytest/RubyTester.hh"
-#include "mem/physical.hh"
 #include "mem/ruby/slicc_interface/AbstractController.hh"
 #include "mem/ruby/system/RubyPort.hh"
+#include "mem/physical.hh"
 
 RubyPort::RubyPort(const Params *p)
     : MemObject(p)

diff --git a/src/mem/ruby/system/RubyPort.hh b/src/mem/ruby/system/RubyPort.hh
index 82ddc682a04b5912eafca4602ac3c90a247a829d..dc7a141c37bec6bcb0eb195a88d9ed620b70d926 100644 (file)
--- a/src/mem/ruby/system/RubyPort.hh
+++ b/src/mem/ruby/system/RubyPort.hh
@@ -32,11 +32,11 @@
 #include <cassert>
 #include <string>
 
-#include "mem/mem_object.hh"
-#include "mem/physical.hh"
 #include "mem/protocol/RequestStatus.hh"
 #include "mem/ruby/slicc_interface/RubyRequest.hh"
 #include "mem/ruby/system/System.hh"
+#include "mem/mem_object.hh"
+#include "mem/physical.hh"
 #include "mem/tport.hh"
 #include "params/RubyPort.hh"
 

diff --git a/src/mem/ruby/system/Sequencer.cc b/src/mem/ruby/system/Sequencer.cc
index 0d812033053d3d5337b169301b6c32a2fe4fbb55..db30b179f21d4369ae1964e01514e3d0e05a3851 100644 (file)
--- a/src/mem/ruby/system/Sequencer.cc
+++ b/src/mem/ruby/system/Sequencer.cc
@@ -26,18 +26,17 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "base/str.hh"
 #include "base/misc.hh"
+#include "base/str.hh"
 #include "cpu/testers/rubytest/RubyTester.hh"
 #include "mem/protocol/Protocol.hh"
-#include "mem/protocol/Protocol.hh"
 #include "mem/ruby/buffers/MessageBuffer.hh"
 #include "mem/ruby/common/Global.hh"
 #include "mem/ruby/common/SubBlock.hh"
-#include "mem/ruby/slicc_interface/RubyRequest.hh"
 #include "mem/ruby/profiler/Profiler.hh"
 #include "mem/ruby/recorder/Tracer.hh"
 #include "mem/ruby/slicc_interface/AbstractController.hh"
+#include "mem/ruby/slicc_interface/RubyRequest.hh"
 #include "mem/ruby/system/CacheMemory.hh"
 #include "mem/ruby/system/Sequencer.hh"
 #include "mem/ruby/system/System.hh"

diff --git a/src/mem/ruby/system/Sequencer.hh b/src/mem/ruby/system/Sequencer.hh
index ff3a0d5b1bcaeb6beef7fd5a2c5fe6c69a485196..8859102511636a2b21f03997e2254c11a74b1561 100644 (file)
--- a/src/mem/ruby/system/Sequencer.hh
+++ b/src/mem/ruby/system/Sequencer.hh
@@ -32,10 +32,10 @@
 #include <iostream>
 
 #include "base/hashmap.hh"
-#include "mem/protocol/RubyAccessMode.hh"
-#include "mem/protocol/RubyRequestType.hh"
 #include "mem/protocol/GenericMachineType.hh"
 #include "mem/protocol/PrefetchBit.hh"
+#include "mem/protocol/RubyAccessMode.hh"
+#include "mem/protocol/RubyRequestType.hh"
 #include "mem/ruby/common/Address.hh"
 #include "mem/ruby/common/Consumer.hh"
 #include "mem/ruby/common/Global.hh"

diff --git a/src/mem/ruby/system/WireBuffer.hh b/src/mem/ruby/system/WireBuffer.hh
index b34488fb129ca175d70e3d25a2ca36f2f8a8318f..648019aeb7a872da89c581da4cbfc1f8016a1145 100644 (file)
--- a/src/mem/ruby/system/WireBuffer.hh
+++ b/src/mem/ruby/system/WireBuffer.hh
@@ -33,8 +33,8 @@
 #define __MEM_RUBY_SYSTEM_WIREBUFFER_HH__
 
 #include <iostream>
-#include <vector>
 #include <string>
+#include <vector>
 
 #include "mem/ruby/buffers/MessageBufferNode.hh"
 #include "mem/ruby/common/Global.hh"
@@ -42,7 +42,6 @@
 #include "params/RubyWireBuffer.hh"
 #include "sim/sim_object.hh"
 
-
 //////////////////////////////////////////////////////////////////////////////
 // This object was written to literally mimic a Wire in Ruby, in the sense
 // that there is no way for messages to get reordered en route on the WireBuffer.

diff --git a/src/mem/slicc/symbols/StateMachine.py b/src/mem/slicc/symbols/StateMachine.py
index 90b7bfbd80be6b357b4be382aff6c9db5ab755cf..d1be1076984c83e53f691332e46914138edbac2a 100644 (file)
--- a/src/mem/slicc/symbols/StateMachine.py
+++ b/src/mem/slicc/symbols/StateMachine.py
@@ -222,15 +222,14 @@ class $py_ident(RubyController):
 #include <sstream>
 #include <string>
 
-#include "params/$c_ident.hh"
-
-#include "mem/ruby/common/Global.hh"
-#include "mem/ruby/common/Consumer.hh"
-#include "mem/ruby/slicc_interface/AbstractController.hh"
+#include "mem/protocol/${ident}_ProfileDumper.hh"
+#include "mem/protocol/${ident}_Profiler.hh"
 #include "mem/protocol/TransitionResult.hh"
 #include "mem/protocol/Types.hh"
-#include "mem/protocol/${ident}_Profiler.hh"
-#include "mem/protocol/${ident}_ProfileDumper.hh"
+#include "mem/ruby/common/Consumer.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/slicc_interface/AbstractController.hh"
+#include "params/$c_ident.hh"
 ''')
 
         seen_types = set()
@@ -419,8 +418,8 @@ void unset_tbe(${{self.TBEType.c_ident}}*& m_tbe_ptr);
 
 #include "base/cprintf.hh"
 #include "mem/protocol/${ident}_Controller.hh"
-#include "mem/protocol/${ident}_State.hh"
 #include "mem/protocol/${ident}_Event.hh"
+#include "mem/protocol/${ident}_State.hh"
 #include "mem/protocol/Types.hh"
 #include "mem/ruby/common/Global.hh"
 #include "mem/ruby/slicc_interface/RubySlicc_includes.hh"
@@ -969,12 +968,12 @@ $c_ident::${{action.ident}}(const Address& addr)
 #include <cassert>
 
 #include "base/misc.hh"
-#include "mem/ruby/common/Global.hh"
-#include "mem/ruby/slicc_interface/RubySlicc_includes.hh"
 #include "mem/protocol/${ident}_Controller.hh"
-#include "mem/protocol/${ident}_State.hh"
 #include "mem/protocol/${ident}_Event.hh"
+#include "mem/protocol/${ident}_State.hh"
 #include "mem/protocol/Types.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/slicc_interface/RubySlicc_includes.hh"
 #include "mem/ruby/system/System.hh"
 
 using namespace std;
@@ -1038,11 +1037,11 @@ ${ident}_Controller::wakeup()
 
 #include "base/misc.hh"
 #include "base/trace.hh"
-#include "mem/ruby/common/Global.hh"
 #include "mem/protocol/${ident}_Controller.hh"
-#include "mem/protocol/${ident}_State.hh"
 #include "mem/protocol/${ident}_Event.hh"
+#include "mem/protocol/${ident}_State.hh"
 #include "mem/protocol/Types.hh"
+#include "mem/ruby/common/Global.hh"
 #include "mem/ruby/system/System.hh"
 
 #define HASH_FUN(state, event)  ((int(state)*${ident}_Event_NUM)+int(event))
@@ -1261,8 +1260,8 @@ if (!%s.areNSlotsAvailable(%s))
 #include <iostream>
 #include <vector>
 
-#include "${ident}_Profiler.hh"
 #include "${ident}_Event.hh"
+#include "${ident}_Profiler.hh"
 
 typedef std::vector<${ident}_Profiler *> ${ident}_profilers;
 
@@ -1356,9 +1355,9 @@ ${ident}_ProfileDumper::dumpStats(std::ostream& out) const
 #include <cassert>
 #include <iostream>
 
-#include "mem/ruby/common/Global.hh"
-#include "mem/protocol/${ident}_State.hh"
 #include "mem/protocol/${ident}_Event.hh"
+#include "mem/protocol/${ident}_State.hh"
+#include "mem/ruby/common/Global.hh"
 
 class ${ident}_Profiler
 {

diff --git a/src/mem/tport.hh b/src/mem/tport.hh
index 91a8ab9a55d639a84052dba2a88755d30336c41f..f081d8656d78a32b1c5c95489dfe7967f4684974 100644 (file)
--- a/src/mem/tport.hh
+++ b/src/mem/tport.hh
@@ -37,11 +37,12 @@
  * Declaration of SimpleTimingPort.
  */
 
-#include "mem/port.hh"
-#include "sim/eventq.hh"
 #include <list>
 #include <string>
 
+#include "mem/port.hh"
+#include "sim/eventq.hh"
+
 /**
  * A simple port for interfacing objects that basically have only
  * functional memory behavior (e.g. I/O devices) to the memory system.

diff --git a/src/mem/translating_port.cc b/src/mem/translating_port.cc
index 700229b23f5766b8f7c0eba67b4b68c547967adb..210f9beb3112414c8b5209c3813e064cf0a157b4 100644 (file)
--- a/src/mem/translating_port.cc
+++ b/src/mem/translating_port.cc
@@ -33,9 +33,9 @@
 
 #include "base/chunk_generator.hh"
 #include "config/the_isa.hh"
+#include "mem/page_table.hh"
 #include "mem/port.hh"
 #include "mem/translating_port.hh"
-#include "mem/page_table.hh"
 #include "sim/process.hh"
 
 using namespace TheISA;

diff --git a/src/mem/vport.hh b/src/mem/vport.hh
index a8ceaa9fca2319536269ccfaf66dcfae9eb87fb5..1dfc0ea235753be4c60188342fa6146cf8f6d3ca 100644 (file)
--- a/src/mem/vport.hh
+++ b/src/mem/vport.hh
@@ -38,10 +38,9 @@
 #ifndef __MEM_VPORT_HH__
 #define __MEM_VPORT_HH__
 
-#include "mem/port_impl.hh"
-#include "config/full_system.hh"
 #include "arch/vtophys.hh"
-
+#include "config/full_system.hh"
+#include "mem/port_impl.hh"
 
 /** A class that translates a virtual address to a physical address and then
  * calls the above read/write functions. If a thread context is provided the

diff --git a/src/python/swig/core.i b/src/python/swig/core.i
index ffaf84476e01ece48e4980c9397e4d1cf47da8a1..ed520e17a5ce52bbea2fd6e9b495e91812ba2a12 100644 (file)
--- a/src/python/swig/core.i
+++ b/src/python/swig/core.i
@@ -32,12 +32,11 @@
 %module(package="m5.internal") core
 
 %{
-#include "python/swig/pyobject.hh"
-
 #include "base/misc.hh"
 #include "base/random.hh"
 #include "base/socket.hh"
 #include "base/types.hh"
+#include "python/swig/pyobject.hh"
 #include "sim/core.hh"
 
 extern const char *compileDate;
@@ -64,8 +63,8 @@ seedRandom(uint64_t seed)
 
 %}
 
-%include <stdint.i>
 %include <std_string.i>
+%include <stdint.i>
 
 %include "base/types.hh"
 

diff --git a/src/python/swig/event.i b/src/python/swig/event.i
index 1ea20dc81e9594360e9211d15642c3390e6cd910..0aae6bd0a8276cada1ee2c97cdb081dad3953fd5 100644 (file)
--- a/src/python/swig/event.i
+++ b/src/python/swig/event.i
@@ -70,15 +70,15 @@
 %ignore EventQueue::schedule;
 %ignore EventQueue::deschedule;
 
+%include <std_string.i>
+%include <stdint.i>
+
 %import "base/fast_alloc.hh"
 %import "sim/serialize.hh"
 
-%include <stdint.i>
-%include <std_string.i>
-
 %include "base/types.hh"
-%include "sim/eventq.hh"
 %include "python/swig/pyevent.hh"
+%include "sim/eventq.hh"
 
 struct CountedDrainEvent : public Event
 {

diff --git a/src/python/swig/inet.i b/src/python/swig/inet.i
index ebe264484e6300878a487e9fea5c584887aac669..144b3dbaceb09708e43984b2e29b420cf4fd9554 100644 (file)
--- a/src/python/swig/inet.i
+++ b/src/python/swig/inet.i
@@ -34,8 +34,8 @@
 #include "base/inet.hh"
 %}
 
-%import <stdint.i>
 %import <std_string.i>
+%import <stdint.i>
 
 namespace Net {
 struct EthAddr

diff --git a/src/python/swig/pyobject.cc b/src/python/swig/pyobject.cc
index eaa8baa8bbf731f83138f289c9708b21f89c8bed..7847a6f3ad2dfc7e3265e3bf6592506fc20c2bb4 100644 (file)
--- a/src/python/swig/pyobject.cc
+++ b/src/python/swig/pyobject.cc
@@ -41,8 +41,8 @@
 
 #if FULL_SYSTEM
 #include "dev/etherdevice.hh"
-#include "dev/etherobject.hh"
 #include "dev/etherint.hh"
+#include "dev/etherobject.hh"
 #endif
 
 using namespace std;

diff --git a/src/python/swig/sim_object.i b/src/python/swig/sim_object.i
index 7957182a15a434e64e3e089206deda0e11ab54df..06f683aa180076642fbb273c92a622f812d04fc4 100644 (file)
--- a/src/python/swig/sim_object.i
+++ b/src/python/swig/sim_object.i
@@ -33,8 +33,8 @@
 %}
 
 // import these files for SWIG to wrap
-%include <stdint.i>
 %include <std_string.i>
+%include <stdint.i>
 
 %include "base/types.hh"
 %include "sim/sim_object_params.hh"

diff --git a/src/python/swig/stats.i b/src/python/swig/stats.i
index 1f113093779ee9eb634f2ece0a90168a05426db1..72172ae945157d48655816c617ccf9ff9597befd 100644 (file)
--- a/src/python/swig/stats.i
+++ b/src/python/swig/stats.i
@@ -34,14 +34,15 @@
 %include <std_string.i>
 
 %{
-#include "base/statistics.hh"
 #include "base/stats/mysql.hh"
 #include "base/stats/text.hh"
+#include "base/statistics.hh"
 #include "sim/core.hh"
 #include "sim/stat_control.hh"
 %}
 
 %import "base/stats/types.hh"
+
 %include "base/stats/info.hh"
 
 namespace Stats {

diff --git a/src/python/swig/system.i b/src/python/swig/system.i
index 5e36b4ac5a08ba2033ea7f30cf756a78cecb1654..1aadcecc6dc8d6cf1f2c7d151de28dc31b26b3aa 100644 (file)
--- a/src/python/swig/system.i
+++ b/src/python/swig/system.i
@@ -32,8 +32,8 @@
 #include "sim/system.hh"
 %}
 
-%import "python/swig/sim_object.i"
 %import "enums/MemoryMode.hh"
+%import "python/swig/sim_object.i"
 
 class System : public SimObject
 {

diff --git a/src/sim/faults.cc b/src/sim/faults.cc
index fbe8fb32aecba6d4969fc634794fd00ee580937b..adf6b2466fc788c981e9bd1ae7d836fa31826745 100644 (file)
--- a/src/sim/faults.cc
+++ b/src/sim/faults.cc
@@ -31,11 +31,11 @@
 
 #include "arch/isa_traits.hh"
 #include "base/misc.hh"
-#include "cpu/thread_context.hh"
 #include "cpu/base.hh"
+#include "cpu/thread_context.hh"
+#include "mem/page_table.hh"
 #include "sim/faults.hh"
 #include "sim/process.hh"
-#include "mem/page_table.hh"
 
 #if !FULL_SYSTEM
 void FaultBase::invoke(ThreadContext * tc, StaticInstPtr inst)

diff --git a/src/sim/faults.hh b/src/sim/faults.hh
index 779e34c8f81219d3d1bbbda677bf7bf21b4dbb1b..7f431b3132880dd6074a77a3fc93eff2dd4ee146 100644 (file)
--- a/src/sim/faults.hh
+++ b/src/sim/faults.hh
@@ -34,10 +34,10 @@
 
 #include "base/refcnt.hh"
 #include "base/types.hh"
-#include "sim/fault_fwd.hh"
-#include "sim/stats.hh"
 #include "config/full_system.hh"
 #include "cpu/static_inst.hh"
+#include "sim/fault_fwd.hh"
+#include "sim/stats.hh"
 
 class ThreadContext;
 

diff --git a/src/sim/init.cc b/src/sim/init.cc
index a9aa905ee9332094ae141e7811f8f44b1ad13077..4c795eac48e9c1b8886391852cd99064531d2487 100644 (file)
--- a/src/sim/init.cc
+++ b/src/sim/init.cc
@@ -30,13 +30,14 @@
  */
 
 #include <Python.h>
+
 #include <marshal.h>
-#include <signal.h>
+#include <zlib.h>
 
-#include <list>
+#include <csignal>
 #include <iostream>
+#include <list>
 #include <string>
-#include <zlib.h>
 
 #include "base/cprintf.hh"
 #include "base/misc.hh"

diff --git a/src/sim/process.cc b/src/sim/process.cc
index d4b1fba900df0d20e6ae6e94701ad4ecc8a7caaf..c0eebb3713aa18607462cb15a54b6bd8fc5aaeb7 100644 (file)
--- a/src/sim/process.cc
+++ b/src/sim/process.cc
@@ -30,15 +30,15 @@
  *          Ali Saidi
  */
 
-#include <unistd.h>
 #include <fcntl.h>
+#include <unistd.h>
 
 #include <cstdio>
 #include <string>
 
-#include "base/intmath.hh"
 #include "base/loader/object_file.hh"
 #include "base/loader/symtab.hh"
+#include "base/intmath.hh"
 #include "base/statistics.hh"
 #include "config/full_system.hh"
 #include "config/the_isa.hh"
@@ -46,8 +46,8 @@
 #include "mem/page_table.hh"
 #include "mem/physical.hh"
 #include "mem/translating_port.hh"
-#include "params/Process.hh"
 #include "params/LiveProcess.hh"
+#include "params/Process.hh"
 #include "sim/debug.hh"
 #include "sim/process.hh"
 #include "sim/process_impl.hh"

diff --git a/src/sim/process_impl.hh b/src/sim/process_impl.hh
index 1db533428b92fb81fa7885f730a89b99b7cdadfd..b5333858cbcd37efe938da96e7b4eddf103040f1 100644 (file)
--- a/src/sim/process_impl.hh
+++ b/src/sim/process_impl.hh
@@ -47,7 +47,6 @@
 #include "mem/translating_port.hh"
 #include "sim/byteswap.hh"
 
-
 //This needs to be templated for cases where 32 bit pointers are needed.
 template<class AddrType>
 void

diff --git a/src/sim/pseudo_inst.cc b/src/sim/pseudo_inst.cc
index bcff2f5c18e46d7249e38c473ff2471c4dffb9c3..65dd7a1a137dab31c7524208c5c4a1062c2cdd92 100644 (file)
--- a/src/sim/pseudo_inst.cc
+++ b/src/sim/pseudo_inst.cc
@@ -40,10 +40,10 @@
  * Authors: Nathan Binkert
  */
 
-#include <errno.h>
 #include <fcntl.h>
 #include <unistd.h>
 
+#include <cerrno>
 #include <fstream>
 #include <string>
 
@@ -52,8 +52,8 @@
 #include "config/full_system.hh"
 #include "config/the_isa.hh"
 #include "cpu/base.hh"
-#include "cpu/thread_context.hh"
 #include "cpu/quiesce_event.hh"
+#include "cpu/thread_context.hh"
 #include "params/BaseCPU.hh"
 #include "sim/pseudo_inst.hh"
 #include "sim/serialize.hh"

diff --git a/src/sim/serialize.cc b/src/sim/serialize.cc
index 44fe7b2e7f22b9616968d28ae9beaf0c3abb7d3c..03f900837dc4c9374ece271491823f9ca4e98c34 100644 (file)
--- a/src/sim/serialize.cc
+++ b/src/sim/serialize.cc
@@ -30,11 +30,11 @@
  *          Steve Reinhardt
  */
 
+#include <sys/stat.h>
 #include <sys/time.h>
 #include <sys/types.h>
-#include <sys/stat.h>
-#include <errno.h>
 
+#include <cerrno>
 #include <fstream>
 #include <list>
 #include <string>

diff --git a/src/sim/serialize.hh b/src/sim/serialize.hh
index 6be8ce3b6e8ecdd85b949a01629f6b1cafef79ea..12b787a5e1e81109c3c0d24690fd373853d975bc 100644 (file)
--- a/src/sim/serialize.hh
+++ b/src/sim/serialize.hh
@@ -38,10 +38,10 @@
 #define __SERIALIZE_HH__
 
 
-#include <list>
-#include <vector>
 #include <iostream>
+#include <list>
 #include <map>
+#include <vector>
 
 #include "base/types.hh"
 

diff --git a/src/sim/stat_control.cc b/src/sim/stat_control.cc
index ad1d4a9e412a904b8ea3032ed73bf2fef6d22eae..80aec224e5358ff92dcf34f6891c525802c1d2b1 100644 (file)
--- a/src/sim/stat_control.cc
+++ b/src/sim/stat_control.cc
@@ -39,7 +39,6 @@
 #include "base/hostinfo.hh"
 #include "base/statistics.hh"
 #include "base/time.hh"
-
 #include "config/the_isa.hh"
 #if THE_ISA == NO_ISA
 #include "arch/noisa/cpu_dummy.hh"

diff --git a/src/sim/syscall_emul.cc b/src/sim/syscall_emul.cc
index 506b22fdfa30a50d0a15078a5cb513a0fbfdd2fb..76fa8a239e6f9159bf5ec83a4497e43502e61dc9 100644 (file)
--- a/src/sim/syscall_emul.cc
+++ b/src/sim/syscall_emul.cc
@@ -37,16 +37,16 @@
 #include <string>
 
 #include "arch/utility.hh"
-#include "sim/syscall_emul.hh"
 #include "base/chunk_generator.hh"
 #include "base/trace.hh"
 #include "config/the_isa.hh"
-#include "cpu/thread_context.hh"
 #include "cpu/base.hh"
+#include "cpu/thread_context.hh"
 #include "mem/page_table.hh"
 #include "sim/process.hh"
-#include "sim/system.hh"
 #include "sim/sim_exit.hh"
+#include "sim/syscall_emul.hh"
+#include "sim/system.hh"
 
 using namespace std;
 using namespace TheISA;

diff --git a/src/sim/syscall_emul.hh b/src/sim/syscall_emul.hh
index 5091c275d4bac51a56c4e668905d3d58afd487c4..06fadf51659de10b142cb2f546b7adc0388d7b2c 100644 (file)
--- a/src/sim/syscall_emul.hh
+++ b/src/sim/syscall_emul.hh
@@ -45,11 +45,11 @@
 #include <sys/fcntl.h>  // for O_BINARY
 #endif
 #include <sys/stat.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <sys/uio.h>
 #include <sys/time.h>
+#include <sys/uio.h>
+#include <fcntl.h>
 
+#include <cerrno>
 #include <string>
 
 #include "base/chunk_generator.hh"
@@ -60,11 +60,11 @@
 #include "config/the_isa.hh"
 #include "cpu/base.hh"
 #include "cpu/thread_context.hh"
-#include "mem/translating_port.hh"
 #include "mem/page_table.hh"
+#include "mem/translating_port.hh"
 #include "sim/byteswap.hh"
-#include "sim/system.hh"
 #include "sim/process.hh"
+#include "sim/system.hh"
 
 ///
 /// System call descriptor.

diff --git a/src/sim/system.cc b/src/sim/system.cc
index e9fd727f1f0ae34c28f6cf74f181830d2376d4c5..e710bc5e865193e7814285585ed7935dad9ff057 100644 (file)
--- a/src/sim/system.cc
+++ b/src/sim/system.cc
@@ -39,14 +39,14 @@
 #include "base/loader/object_file.hh"
 #include "base/loader/symtab.hh"
 #include "base/trace.hh"
-#include "cpu/thread_context.hh"
 #include "config/full_system.hh"
 #include "config/the_isa.hh"
+#include "cpu/thread_context.hh"
 #include "mem/mem_object.hh"
 #include "mem/physical.hh"
 #include "sim/byteswap.hh"
-#include "sim/system.hh"
 #include "sim/debug.hh"
+#include "sim/system.hh"
 
 #if FULL_SYSTEM
 #include "arch/vtophys.hh"

diff --git a/src/sim/tlb.cc b/src/sim/tlb.cc
index e2f4f9135ebbdc1bc1df1afb56b0c1787908373c..8cde0db2e7b540b748d11c010b2c128c97f142e0 100644 (file)
--- a/src/sim/tlb.cc
+++ b/src/sim/tlb.cc
@@ -30,8 +30,8 @@
 
 #include "cpu/thread_context.hh"
 #include "mem/page_table.hh"
-#include "sim/process.hh"
 #include "sim/faults.hh"
+#include "sim/process.hh"
 #include "sim/tlb.hh"
 
 Fault

diff --git a/src/sim/vptr.hh b/src/sim/vptr.hh
index 09aa2d2139f2c208f28e10d7b74bf1402bcf2a78..2033339f9a19b3461009495483035f02720d7e8c 100644 (file)
--- a/src/sim/vptr.hh
+++ b/src/sim/vptr.hh
@@ -31,8 +31,8 @@
 #ifndef __ARCH_ALPHA_VPTR_HH__
 #define __ARCH_ALPHA_VPTR_HH__
 
-#include "arch/vtophys.hh"
 #include "arch/isa_traits.hh"
+#include "arch/vtophys.hh"
 #include "mem/vport.hh"
 
 class ThreadContext;

diff --git a/src/unittest/cprintftest.cc b/src/unittest/cprintftest.cc
index 6722ce6a33bb52f161176187ebf7edfc4bda0ef5..ee5701d137dd73a966e9f957f6dff3d609fac95d 100644 (file)
--- a/src/unittest/cprintftest.cc
+++ b/src/unittest/cprintftest.cc
@@ -30,8 +30,8 @@
 
 #include <iostream>
 #include <list>
-#include <string>
 #include <sstream>
+#include <string>
 
 #include "base/cprintf.hh"
 #include "base/misc.hh"

diff --git a/src/unittest/cprintftime.cc b/src/unittest/cprintftime.cc
index f35e0aa25be7d27d71cf116707d8645f3680ad41..3192d8e4df1e7bebb1149827d84b5b5542f406a6 100644 (file)
--- a/src/unittest/cprintftime.cc
+++ b/src/unittest/cprintftime.cc
@@ -30,8 +30,8 @@
 
 #include <iostream>
 #include <list>
-#include <string>
 #include <sstream>
+#include <string>
 
 #include "base/cprintf.hh"
 

diff --git a/src/unittest/initest.cc b/src/unittest/initest.cc
index 67ac4487420013b711d518e05a6612be6df0d9fb..077b59d36cf23e643feba18d714cfb25e175f319 100644 (file)
--- a/src/unittest/initest.cc
+++ b/src/unittest/initest.cc
@@ -29,13 +29,13 @@
  *          Steve Reinhardt
  */
 
-#include <iostream>
 #include <fstream>
+#include <iostream>
 #include <string>
 #include <vector>
 
-#include "base/inifile.hh"
 #include "base/cprintf.hh"
+#include "base/inifile.hh"
 
 using namespace std;
 

diff --git a/src/unittest/rangemaptest.cc b/src/unittest/rangemaptest.cc
index 5ea117cb8711e1331a4acd2fbf3921f6142c2e5f..af00e4e5881aec8ce7fe9445e9cff060175a2585 100644 (file)
--- a/src/unittest/rangemaptest.cc
+++ b/src/unittest/rangemaptest.cc
@@ -28,8 +28,8 @@
  * Authors: Ali Saidi
  */
 
-#include <iostream>
 #include <cassert>
+#include <iostream>
 
 #include "base/range_map.hh"
 #include "base/types.hh"

diff --git a/src/unittest/stattest.cc b/src/unittest/stattest.cc
index 529511c71dd795049a5a3c9abdf06aded79a986d..e7654ae5b2c09f0db8833c3615411ecf331bca47 100644 (file)
--- a/src/unittest/stattest.cc
+++ b/src/unittest/stattest.cc
@@ -32,11 +32,11 @@
 #include <iostream>
 #include <string>
 
+#include "base/stats/mysql.hh"
+#include "base/stats/text.hh"
 #include "base/cprintf.hh"
 #include "base/misc.hh"
 #include "base/statistics.hh"
-#include "base/stats/text.hh"
-#include "base/stats/mysql.hh"
 #include "base/types.hh"
 #include "sim/core.hh"
 #include "sim/stat_control.hh"

diff --git a/src/unittest/symtest.cc b/src/unittest/symtest.cc
index 10ffb42e59c6956dc55703e9b3d86f8977372b2d..a40210ba7fba4aac6a0dfe0572bc5570b1c8118a 100644 (file)
--- a/src/unittest/symtest.cc
+++ b/src/unittest/symtest.cc
@@ -30,8 +30,8 @@
 
 #include <iostream>
 
-#include "base/str.hh"
 #include "base/loader/symtab.hh"
+#include "base/str.hh"
 
 using namespace std;
 

diff --git a/util/ccdrv/devtime.c b/util/ccdrv/devtime.c
index d8be97bb43eb2da3cf4251c71050e91923c23b41..d46d6f00c9dc9b7335c90c8b77a7028bdef9e68c 100644 (file)
--- a/util/ccdrv/devtime.c
+++ b/util/ccdrv/devtime.c
@@ -28,20 +28,20 @@
  * Authors: Ali Saidi
  */
 
-#include <linux/module.h>
+#include <asm/io.h>
+#include <asm/page.h>
+#include <asm/uaccess.h>
 #include <linux/config.h>
-#include <linux/moduleparam.h>
-#include <linux/init.h>
 #include <linux/fs.h>
-#include <asm/uaccess.h>
+#include <linux/init.h>
 #include <linux/kernel.h>
-#include <asm/io.h>
-#include <asm/page.h>
+#include <linux/module.h>
+#include <linux/moduleparam.h>
 #include <linux/netdevice.h>
 
 #ifdef __i386__
-#include <asm/processor.h>
 #include <asm/msr.h>
+#include <asm/processor.h>
 #endif
 
 #define DRIVER_AUTHOR "Ali Saidi"

diff --git a/util/m5/m5.c b/util/m5/m5.c
index 96150f2bbfd595f0f97a9d032d97d93408e94668..fc4f5dcae5030b0661ee20d6b7c6fbebeefbc379 100644 (file)
--- a/util/m5/m5.c
+++ b/util/m5/m5.c
@@ -33,9 +33,9 @@
 #include <sched.h>
 #endif
 
-#include <inttypes.h>
 #include <err.h>
 #include <fcntl.h>
+#include <inttypes.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/util/statetrace/arch/amd64/tracechild.cc b/util/statetrace/arch/amd64/tracechild.cc
index 5d3b660abc78905463af44c711e81a877113250a..1aec5ec979657d7a0bf7c64fde9eb9f2ffa22d7a 100644 (file)
--- a/util/statetrace/arch/amd64/tracechild.cc
+++ b/util/statetrace/arch/amd64/tracechild.cc
@@ -28,12 +28,13 @@
  * Authors: Gabe Black
  */
 
-#include <iostream>
-#include <iomanip>
-#include <errno.h>
 #include <sys/ptrace.h>
 #include <stdint.h>
-#include <string.h>
+
+#include <cerrno>
+#include <cstring>
+#include <iomanip>
+#include <iostream>
 
 #include "arch/amd64/tracechild.hh"
 

diff --git a/util/statetrace/arch/amd64/tracechild.hh b/util/statetrace/arch/amd64/tracechild.hh
index 6f28bc0bd14a2472abb35cd1377dd1151212cfaa..7adbec59ea4daa99e104e6a05fac823efc090eb7 100644 (file)
--- a/util/statetrace/arch/amd64/tracechild.hh
+++ b/util/statetrace/arch/amd64/tracechild.hh
@@ -31,9 +31,10 @@
 #ifndef REGSTATE_AMD64_HH
 #define REGSTATE_AMD64_HH
 
-#include <sys/user.h>
-#include <sys/types.h>
 #include <sys/ptrace.h>
+#include <sys/types.h>
+#include <sys/user.h>
+
 #include <cassert>
 #include <string>
 

diff --git a/util/statetrace/arch/arm/tracechild.cc b/util/statetrace/arch/arm/tracechild.cc
index 97b8d06ec1cd8177d1cdb78d8789b0e1b5b49636..5dde3d567a2ef169713608b8769bd2204d06e632 100644 (file)
--- a/util/statetrace/arch/arm/tracechild.cc
+++ b/util/statetrace/arch/arm/tracechild.cc
@@ -41,11 +41,12 @@
  *          Gabe Black
  */
 
-#include <iostream>
-#include <errno.h>
 #include <stdint.h>
-#include <cstring>
+
+#include <cerrno>
 #include <cstdio>
+#include <cstring>
+#include <iostream>
 
 #include "arch/arm/tracechild.hh"
 

diff --git a/util/statetrace/arch/arm/tracechild.hh b/util/statetrace/arch/arm/tracechild.hh
index f4e8ca694b6857f61d63090a443e4e12bfe213c5..9a4dc1921d9c4ce1637128eb2857ce0ff94edc79 100644 (file)
--- a/util/statetrace/arch/arm/tracechild.hh
+++ b/util/statetrace/arch/arm/tracechild.hh
@@ -44,12 +44,13 @@
 #ifndef TRACECHILD_ARM_HH
 #define TRACECHILD_ARM_HH
 
+#include <sys/ptrace.h>
+#include <sys/user.h>
+
 #include <cassert>
 #include <string>
-#include <sys/user.h>
-#include <sys/ptrace.h>
-#include "base/tracechild.hh"
 
+#include "base/tracechild.hh"
 
 class ARMTraceChild : public TraceChild
 {

diff --git a/util/statetrace/arch/i686/tracechild.cc b/util/statetrace/arch/i686/tracechild.cc
index f9e37442ebf6ae100eb522c318a997cde85af5f9..44508c1a002c4262a4db034e9eefc13be5fa413d 100644 (file)
--- a/util/statetrace/arch/i686/tracechild.cc
+++ b/util/statetrace/arch/i686/tracechild.cc
@@ -28,11 +28,12 @@
  * Authors: Gabe Black
  */
 
-#include <iostream>
-#include <errno.h>
 #include <sys/ptrace.h>
 #include <stdint.h>
 
+#include <cerrno>
+#include <iostream>
+
 #include "arch/i686/tracechild.hh"
 
 using namespace std;

diff --git a/util/statetrace/arch/i686/tracechild.hh b/util/statetrace/arch/i686/tracechild.hh
index 1c1a365939178d7c73384fc8ad3d78ea31be1c61..60bc5ed8d680db9a7c79a51640df9c450ec44560 100644 (file)
--- a/util/statetrace/arch/i686/tracechild.hh
+++ b/util/statetrace/arch/i686/tracechild.hh
@@ -31,9 +31,10 @@
 #ifndef REGSTATE_I686_HH
 #define REGSTATE_I686_HH
 
-#include <sys/user.h>
-#include <sys/types.h>
 #include <sys/ptrace.h>
+#include <sys/types.h>
+#include <sys/user.h>
+
 #include <cassert>
 #include <string>
 

diff --git a/util/statetrace/arch/sparc/tracechild.cc b/util/statetrace/arch/sparc/tracechild.cc
index b18739e24660ce41e32ebe1b45b39dd67867aba4..fad4a00d7c9783c918f95584e5383aaf5dc7f9ad 100644 (file)
--- a/util/statetrace/arch/sparc/tracechild.cc
+++ b/util/statetrace/arch/sparc/tracechild.cc
@@ -28,11 +28,12 @@
  * Authors: Gabe Black
  */
 
-#include <iostream>
-#include <errno.h>
 #include <sys/ptrace.h>
 #include <stdint.h>
 
+#include <cerrno>
+#include <iostream>
+
 #include "arch/sparc/tracechild.hh"
 
 using namespace std;

diff --git a/util/statetrace/arch/sparc/tracechild.hh b/util/statetrace/arch/sparc/tracechild.hh
index 27670604a6a87f28667d892ba1f5159b23ccdac7..30f7f26bd7dc78080cca6ed3e3e510b801b144d5 100644 (file)
--- a/util/statetrace/arch/sparc/tracechild.hh
+++ b/util/statetrace/arch/sparc/tracechild.hh
@@ -32,12 +32,13 @@
 #define TRACECHILD_SPARC_HH
 
 #include <asm-sparc64/reg.h>
+#include <sys/ptrace.h>
+#include <sys/types.h>
+#include <stdint.h>
+
 #include <cassert>
 #include <ostream>
-#include <stdint.h>
 #include <string>
-#include <sys/ptrace.h>
-#include <sys/types.h>
 
 #include "base/tracechild.hh"
 

diff --git a/util/statetrace/base/regstate.hh b/util/statetrace/base/regstate.hh
index bab3485c6eb14958ab1894ee7fdf912dfbf61245..ac350ddba5586363ad9780bd4b3b455b56c0da98 100644 (file)
--- a/util/statetrace/base/regstate.hh
+++ b/util/statetrace/base/regstate.hh
@@ -31,9 +31,10 @@
 #ifndef REGSTATE_H
 #define REGSTATE_H
 
-#include <string>
 #include <stdint.h>
 
+#include <string>
+
 class RegState
 {
   protected:

diff --git a/util/statetrace/base/statetrace.cc b/util/statetrace/base/statetrace.cc
index 156983a676a63d8cf88f7e6d0230e4ae0bebfab3..fd6f40925f9022bcd8fc10329ce4cb798c325ae8 100644 (file)
--- a/util/statetrace/base/statetrace.cc
+++ b/util/statetrace/base/statetrace.cc
@@ -28,22 +28,22 @@
  * Authors: Gabe Black
  */
 
-#include "base/arch_check.h"
-
-#include <cstring>
-#include <errno.h>
-#include <fstream>
-#include <iostream>
-#include <netdb.h>
 #include <netinet/in.h>
-#include <stdio.h>
-#include <string>
 #include <sys/ptrace.h>
 #include <sys/socket.h>
 #include <sys/types.h>
 #include <sys/wait.h>
+#include <netdb.h>
 #include <unistd.h>
 
+#include <cerrno>
+#include <cstdio>
+#include <cstring>
+#include <fstream>
+#include <iostream>
+#include <string>
+
+#include "base/arch_check.h"
 #include "tracechild.hh"
 
 using namespace std;

diff --git a/util/statetrace/base/tracechild.cc b/util/statetrace/base/tracechild.cc
index b5665ff3754f8d2d166611d63bcce10306d7a032..d22f2fd4346befc62bf158b73ed116309b4864b2 100644 (file)
--- a/util/statetrace/base/tracechild.cc
+++ b/util/statetrace/base/tracechild.cc
@@ -28,13 +28,15 @@
  * Authors: Gabe Black
  */
 
-#include "tracechild.hh"
-#include <cstring>
-#include <errno.h>
-#include <iostream>
 #include <sys/ptrace.h>
 #include <sys/wait.h>
 
+#include <cerrno>
+#include <cstring>
+#include <iostream>
+
+#include "tracechild.hh"
+
 using namespace std;
 
 bool

diff --git a/util/tap/tap.cc b/util/tap/tap.cc
index b026e022057b450057e335181b52cf24cbf41eae..2cc7de4b5d6ac52e63e434f7a3b8eebd95d84f07 100644 (file)
--- a/util/tap/tap.cc
+++ b/util/tap/tap.cc
@@ -32,25 +32,21 @@ extern "C" {
 #include <pcap.h>
 }
 
-#include <dnet.h>
-
 #include <arpa/inet.h>
-
-#include <sys/ioctl.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-
 #include <netinet/in.h>
 #include <netinet/tcp.h>
-
-#include <errno.h>
+#include <sys/ioctl.h>
+#include <sys/socket.h>
+#include <sys/types.h>
+#include <dnet.h>
 #include <fcntl.h>
 #include <libgen.h>
 #include <netdb.h>
 #include <poll.h>
-#include <signal.h>
 #include <unistd.h>
 
+#include <cerrno>
+#include <csignal>
 #include <list>
 #include <string>
 

diff --git a/util/term/term.c b/util/term/term.c
index 54924c0e17ec17c0e75836dd0276340f9644050c..ca88ad47e4e4304b3e7e09aee43dacfd89bb37a8 100644 (file)
--- a/util/term/term.c
+++ b/util/term/term.c
@@ -26,17 +26,16 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/types.h>
+#include <arpa/telnet.h>
+#include <netinet/in.h>
 #include <sys/socket.h>
 #include <sys/termios.h>
 #include <sys/time.h>
+#include <sys/types.h>
 #include <sys/un.h>
-
-#include <netinet/in.h>
-#include <arpa/telnet.h>
-
 #include <err.h>
 #include <errno.h>
+#include <fcntl.h>
 #include <netdb.h>
 #include <poll.h>
 #include <stdarg.h>
@@ -44,7 +43,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <fcntl.h>
 
 ssize_t atomicio(ssize_t (*)(), int, void *, size_t);
 void    readwrite(int);