style: [patch 1/22] use /r/3648/ to reorganize includes

11 files changed, 22 insertions, 11 deletions

diff --git a/src/cpu/minor/activity.cc b/src/cpu/minor/activity.cc
index 8e322d3e7..4a4f9d71c 100644
--- a/src/cpu/minor/activity.cc
+++ b/src/cpu/minor/activity.cc
@@ -37,9 +37,10 @@
  * Authors: Andrew Bardsley
  */
 
+#include "cpu/minor/activity.hh"
+
 #include <sstream>
 
-#include "cpu/minor/activity.hh"
 #include "cpu/minor/trace.hh"
 
 namespace Minor
diff --git a/src/cpu/minor/cpu.cc b/src/cpu/minor/cpu.cc
index 016a60f47..ae4fda6f6 100644
--- a/src/cpu/minor/cpu.cc
+++ b/src/cpu/minor/cpu.cc
@@ -37,8 +37,9 @@
  * Authors: Andrew Bardsley
  */
 
-#include "arch/utility.hh"
 #include "cpu/minor/cpu.hh"
+
+#include "arch/utility.hh"
 #include "cpu/minor/dyn_inst.hh"
 #include "cpu/minor/fetch1.hh"
 #include "cpu/minor/pipeline.hh"
diff --git a/src/cpu/minor/decode.cc b/src/cpu/minor/decode.cc
index a8a33d989..390ca5f11 100644
--- a/src/cpu/minor/decode.cc
+++ b/src/cpu/minor/decode.cc
@@ -38,6 +38,7 @@
  */
 
 #include "cpu/minor/decode.hh"
+
 #include "cpu/minor/pipeline.hh"
 #include "debug/Decode.hh"
 
diff --git a/src/cpu/minor/dyn_inst.cc b/src/cpu/minor/dyn_inst.cc
index 5d54f6913..16af15bd7 100644
--- a/src/cpu/minor/dyn_inst.cc
+++ b/src/cpu/minor/dyn_inst.cc
@@ -37,14 +37,15 @@
  * Authors: Andrew Bardsley
  */
 
+#include "cpu/minor/dyn_inst.hh"
+
 #include <iomanip>
 #include <sstream>
 
 #include "arch/isa.hh"
 #include "arch/registers.hh"
-#include "cpu/minor/dyn_inst.hh"
-#include "cpu/minor/trace.hh"
 #include "cpu/base.hh"
+#include "cpu/minor/trace.hh"
 #include "cpu/reg_class.hh"
 #include "debug/MinorExecute.hh"
 #include "enums/OpClass.hh"
diff --git a/src/cpu/minor/execute.cc b/src/cpu/minor/execute.cc
index f5f006733..a38a7677a 100644
--- a/src/cpu/minor/execute.cc
+++ b/src/cpu/minor/execute.cc
@@ -37,12 +37,13 @@
  * Authors: Andrew Bardsley
  */
 
+#include "cpu/minor/execute.hh"
+
 #include "arch/locked_mem.hh"
 #include "arch/registers.hh"
 #include "arch/utility.hh"
 #include "cpu/minor/cpu.hh"
 #include "cpu/minor/exec_context.hh"
-#include "cpu/minor/execute.hh"
 #include "cpu/minor/fetch1.hh"
 #include "cpu/minor/lsq.hh"
 #include "cpu/op_class.hh"
diff --git a/src/cpu/minor/fetch1.cc b/src/cpu/minor/fetch1.cc
index f47f54962..0620fee1e 100644
--- a/src/cpu/minor/fetch1.cc
+++ b/src/cpu/minor/fetch1.cc
@@ -37,12 +37,13 @@
  * Authors: Andrew Bardsley
  */
 
+#include "cpu/minor/fetch1.hh"
+
 #include <cstring>
 #include <iomanip>
 #include <sstream>
 
 #include "base/cast.hh"
-#include "cpu/minor/fetch1.hh"
 #include "cpu/minor/pipeline.hh"
 #include "debug/Drain.hh"
 #include "debug/Fetch.hh"
diff --git a/src/cpu/minor/fetch2.cc b/src/cpu/minor/fetch2.cc
index 15d362da7..986f1f2ae 100644
--- a/src/cpu/minor/fetch2.cc
+++ b/src/cpu/minor/fetch2.cc
@@ -37,11 +37,12 @@
  * Authors: Andrew Bardsley
  */
 
+#include "cpu/minor/fetch2.hh"
+
 #include <string>
 
 #include "arch/decoder.hh"
 #include "arch/utility.hh"
-#include "cpu/minor/fetch2.hh"
 #include "cpu/minor/pipeline.hh"
 #include "cpu/pred/bpred_unit.hh"
 #include "debug/Branch.hh"
diff --git a/src/cpu/minor/func_unit.cc b/src/cpu/minor/func_unit.cc
index aeee5cc44..a9248ba96 100644
--- a/src/cpu/minor/func_unit.cc
+++ b/src/cpu/minor/func_unit.cc
@@ -37,11 +37,12 @@
  * Authors: Andrew Bardsley
  */
 
+#include "cpu/minor/func_unit.hh"
+
 #include <iomanip>
 #include <sstream>
 #include <typeinfo>
 
-#include "cpu/minor/func_unit.hh"
 #include "debug/MinorTiming.hh"
 #include "enums/OpClass.hh"
 
diff --git a/src/cpu/minor/lsq.cc b/src/cpu/minor/lsq.cc
index 476f9d474..3b70c53aa 100644
--- a/src/cpu/minor/lsq.cc
+++ b/src/cpu/minor/lsq.cc
@@ -37,6 +37,8 @@
  * Authors: Andrew Bardsley
  */
 
+#include "cpu/minor/lsq.hh"
+
 #include <iomanip>
 #include <sstream>
 
@@ -45,7 +47,6 @@
 #include "cpu/minor/cpu.hh"
 #include "cpu/minor/exec_context.hh"
 #include "cpu/minor/execute.hh"
-#include "cpu/minor/lsq.hh"
 #include "cpu/minor/pipeline.hh"
 #include "debug/Activity.hh"
 #include "debug/MinorMem.hh"
diff --git a/src/cpu/minor/pipeline.cc b/src/cpu/minor/pipeline.cc
index 8c04e3949..08dc3db74 100644
--- a/src/cpu/minor/pipeline.cc
+++ b/src/cpu/minor/pipeline.cc
@@ -37,13 +37,14 @@
  * Authors: Andrew Bardsley
  */
 
+#include "cpu/minor/pipeline.hh"
+
 #include <algorithm>
 
 #include "cpu/minor/decode.hh"
 #include "cpu/minor/execute.hh"
 #include "cpu/minor/fetch1.hh"
 #include "cpu/minor/fetch2.hh"
-#include "cpu/minor/pipeline.hh"
 #include "debug/Drain.hh"
 #include "debug/MinorCPU.hh"
 #include "debug/MinorTrace.hh"
diff --git a/src/cpu/minor/scoreboard.cc b/src/cpu/minor/scoreboard.cc
index f6b1f7944..4de3f9522 100644
--- a/src/cpu/minor/scoreboard.cc
+++ b/src/cpu/minor/scoreboard.cc
@@ -37,8 +37,9 @@
  * Authors: Andrew Bardsley
  */
 
-#include "arch/registers.hh"
 #include "cpu/minor/scoreboard.hh"
+
+#include "arch/registers.hh"
 #include "cpu/reg_class.hh"
 #include "debug/MinorScoreboard.hh"
 #include "debug/MinorTiming.hh"