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

src/dev/arm/a9scu.cc

@@ -37,9 +37,10 @@
  * Authors: Ali Saidi
  */
 
+#include "dev/arm/a9scu.hh"
+
 #include "base/intmath.hh"
 #include "base/trace.hh"
-#include "dev/arm/a9scu.hh"
 #include "mem/packet.hh"
 #include "mem/packet_access.hh"
 #include "sim/system.hh"

src/dev/arm/amba_device.cc

@@ -40,9 +40,10 @@
  * Authors: Ali Saidi
  */
 
+#include "dev/arm/amba_device.hh"
+
 #include "base/trace.hh"
 #include "debug/AMBA.hh"
-#include "dev/arm/amba_device.hh"
 #include "dev/arm/amba_fake.hh"
 #include "mem/packet.hh"
 #include "mem/packet_access.hh"

src/dev/arm/amba_fake.cc

@@ -40,9 +40,10 @@
  * Authors: Ali Saidi
  */
 
+#include "dev/arm/amba_fake.hh"
+
 #include "base/trace.hh"
 #include "debug/AMBA.hh"
-#include "dev/arm/amba_fake.hh"
 #include "mem/packet.hh"
 #include "mem/packet_access.hh"
 

src/dev/arm/energy_ctrl.cc

@@ -39,8 +39,9 @@
  *          Stephan Diestelhorst
  */
 
-#include "debug/EnergyCtrl.hh"
 #include "dev/arm/energy_ctrl.hh"
+
+#include "debug/EnergyCtrl.hh"
 #include "mem/packet.hh"
 #include "mem/packet_access.hh"
 #include "params/EnergyCtrl.hh"

src/dev/arm/gic_pl390.cc

@@ -41,12 +41,13 @@
  *          Prakash Ramrakhyani
  */
 
+#include "dev/arm/gic_pl390.hh"
+
 #include "base/trace.hh"
 #include "debug/Checkpoint.hh"
 #include "debug/GIC.hh"
 #include "debug/IPI.hh"
 #include "debug/Interrupt.hh"
-#include "dev/arm/gic_pl390.hh"
 #include "dev/terminal.hh"
 #include "mem/packet.hh"
 #include "mem/packet_access.hh"

src/dev/arm/hdlcd.cc

@@ -40,9 +40,9 @@
 
 #include "dev/arm/hdlcd.hh"
 
-#include "base/vnc/vncinput.hh"
 #include "base/output.hh"
 #include "base/trace.hh"
+#include "base/vnc/vncinput.hh"
 #include "debug/Checkpoint.hh"
 #include "debug/HDLcd.hh"
 #include "dev/arm/amba_device.hh"

src/dev/arm/kmi.cc

@@ -41,11 +41,12 @@
  *          William Wang
  */
 
-#include "base/vnc/vncinput.hh"
+#include "dev/arm/kmi.hh"
+
 #include "base/trace.hh"
+#include "base/vnc/vncinput.hh"
 #include "debug/Pl050.hh"
 #include "dev/arm/amba_device.hh"
-#include "dev/arm/kmi.hh"
 #include "dev/ps2.hh"
 #include "mem/packet.hh"
 #include "mem/packet_access.hh"

src/dev/arm/pl011.cc

@@ -51,8 +51,8 @@
 #include "dev/terminal.hh"
 #include "mem/packet.hh"
 #include "mem/packet_access.hh"
-#include "sim/sim_exit.hh"
 #include "params/Pl011.hh"
+#include "sim/sim_exit.hh"
 
 Pl011::Pl011(const Pl011Params *p)
     : Uart(p, 0xfff),

src/dev/arm/pl111.cc

@@ -38,14 +38,15 @@
  *          Ali Saidi
  */
 
-#include "base/vnc/vncinput.hh"
+#include "dev/arm/pl111.hh"
+
 #include "base/output.hh"
 #include "base/trace.hh"
+#include "base/vnc/vncinput.hh"
 #include "debug/PL111.hh"
 #include "debug/Uart.hh"
 #include "dev/arm/amba_device.hh"
 #include "dev/arm/base_gic.hh"
-#include "dev/arm/pl111.hh"
 #include "mem/packet.hh"
 #include "mem/packet_access.hh"
 #include "sim/system.hh"

src/dev/arm/realview.cc

@@ -44,6 +44,8 @@
  * Implementation of RealView platform.
  */
 
+#include "dev/arm/realview.hh"
+
 #include <deque>
 #include <string>
 #include <vector>
@@ -51,7 +53,6 @@
 #include "config/the_isa.hh"
 #include "cpu/intr_control.hh"
 #include "dev/arm/base_gic.hh"
-#include "dev/arm/realview.hh"
 #include "dev/terminal.hh"
 #include "sim/system.hh"
 

src/dev/arm/rtc_pl031.cc

@@ -37,13 +37,14 @@
  * Authors: Ali Saidi
  */
 
+#include "dev/arm/rtc_pl031.hh"
+
 #include "base/intmath.hh"
 #include "base/time.hh"
 #include "base/trace.hh"
 #include "debug/Checkpoint.hh"
 #include "debug/Timer.hh"
 #include "dev/arm/amba_device.hh"
-#include "dev/arm/rtc_pl031.hh"
 #include "mem/packet.hh"
 #include "mem/packet_access.hh"
 

src/dev/arm/timer_cpulocal.cc

@@ -38,12 +38,13 @@
  *          Geoffrey Blake
  */
 
+#include "dev/arm/timer_cpulocal.hh"
+
 #include "base/intmath.hh"
 #include "base/trace.hh"
 #include "debug/Checkpoint.hh"
 #include "debug/Timer.hh"
 #include "dev/arm/base_gic.hh"
-#include "dev/arm/timer_cpulocal.hh"
 #include "mem/packet.hh"
 #include "mem/packet_access.hh"
 

src/dev/arm/timer_sp804.cc

@@ -37,12 +37,13 @@
  * Authors: Ali Saidi
  */
 
+#include "dev/arm/timer_sp804.hh"
+
 #include "base/intmath.hh"
 #include "base/trace.hh"
 #include "debug/Checkpoint.hh"
 #include "debug/Timer.hh"
 #include "dev/arm/base_gic.hh"
-#include "dev/arm/timer_sp804.hh"
 #include "mem/packet.hh"
 #include "mem/packet_access.hh"
 

src/dev/arm/vgic.cc

@@ -37,11 +37,12 @@
  * Authors: Matt Evans
  */
 
+#include "dev/arm/vgic.hh"
+
 #include "base/trace.hh"
 #include "debug/Checkpoint.hh"
 #include "debug/VGIC.hh"
 #include "dev/arm/base_gic.hh"
-#include "dev/arm/vgic.hh"
 #include "dev/terminal.hh"
 #include "mem/packet.hh"
 #include "mem/packet_access.hh"