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

src/base/atomicio.cc

@@ -28,11 +28,11 @@
  * Authors: Nathan Binkert
  */
 
+#include "base/atomicio.hh"
+
 #include <cerrno>
 #include <cstdio>
 
-#include "base/atomicio.hh"
-
 ssize_t
 atomic_read(int fd, void *s, size_t n)
 {

src/base/bigint.cc

@@ -28,10 +28,10 @@
  * Authors: Gabe Black
  */
 
-#include <iostream>
-
 #include "base/bigint.hh"
 
+#include <iostream>
+
 using namespace std;
 
 ostream & operator << (ostream & os, const Twin64_t & t)

src/base/cp_annotate.cc

@@ -28,11 +28,12 @@
  * Authors: Ali Saidi
  */
 
+#include "base/cp_annotate.hh"
+
 #include "arch/generic/linux/threadinfo.hh"
 #include "arch/utility.hh"
-#include "base/loader/object_file.hh"
 #include "base/callback.hh"
-#include "base/cp_annotate.hh"
+#include "base/loader/object_file.hh"
 #include "base/output.hh"
 #include "base/trace.hh"
 #include "config/the_isa.hh"

src/base/cprintf.cc

@@ -28,13 +28,13 @@
  * Authors: Nathan Binkert
  */
 
+#include "base/cprintf.hh"
+
 #include <cassert>
 #include <iomanip>
 #include <iostream>
 #include <sstream>
 
-#include "base/cprintf.hh"
-
 using namespace std;
 
 namespace cp {

src/base/debug.cc

@@ -28,6 +28,8 @@
  * Authors: Nathan Binkert
  */
 
+#include "base/debug.hh"
+
 #include <sys/types.h>
 #include <unistd.h>
 
@@ -35,7 +37,6 @@
 #include <csignal>
 
 #include "base/cprintf.hh"
-#include "base/debug.hh"
 #include "base/misc.hh"
 
 using namespace std;

src/base/hostinfo.cc

@@ -34,8 +34,11 @@
 #include <mach/mach_init.h>
 #include <mach/shared_region.h>
 #include <mach/task.h>
+
 #endif
 
+#include "base/hostinfo.hh"
+
 #include <cctype>
 #include <cerrno>
 #include <cmath>
@@ -44,7 +47,6 @@
 #include <cstring>
 #include <string>
 
-#include "base/hostinfo.hh"
 #include "base/misc.hh"
 #include "base/str.hh"
 #include "base/types.hh"

src/base/inet.cc

@@ -43,13 +43,14 @@
  *          Geoffrey Blake
  */
 
+#include "base/inet.hh"
+
 #include <cstddef>
 #include <cstdio>
 #include <sstream>
 #include <string>
 
 #include "base/cprintf.hh"
-#include "base/inet.hh"
 #include "base/types.hh"
 
 using namespace std;

src/base/inifile.cc

@@ -29,13 +29,14 @@
  *          Steve Reinhardt
  */
 
+#include "base/inifile.hh"
+
 #include <algorithm>
 #include <fstream>
 #include <iostream>
 #include <string>
 #include <vector>
 
-#include "base/inifile.hh"
 #include "base/str.hh"
 
 using namespace std;

src/base/loader/aout_object.cc

@@ -28,9 +28,10 @@
  * Authors: Steve Reinhardt
  */
 
+#include "base/loader/aout_object.hh"
+
 #include <string>
 
-#include "base/loader/aout_object.hh"
 #include "base/loader/exec_aout.h"
 #include "base/loader/symtab.hh"
 #include "base/trace.hh"

src/base/loader/dtb_object.cc

@@ -35,9 +35,9 @@
 
 #include <cassert>
 
-#include "sim/byteswap.hh"
 #include "fdt.h"
 #include "libfdt.h"
+#include "sim/byteswap.hh"
 
 ObjectFile *
 DtbObject::tryFile(const std::string &fname, size_t len, uint8_t *data)

src/base/loader/ecoff_object.cc

@@ -28,9 +28,10 @@
  * Authors: Steve Reinhardt
  */
 
+#include "base/loader/ecoff_object.hh"
+
 #include <string>
 
-#include "base/loader/ecoff_object.hh"
 #include "base/loader/symtab.hh"
 #include "base/misc.hh"
 #include "base/trace.hh"

src/base/loader/hex_file.cc

@@ -28,14 +28,15 @@
  * Authors: Jaidev Patwardhan
  */
 
+#include "base/loader/hex_file.hh"
+
 #include <cctype>
 #include <cstdio>
 #include <list>
 #include <string>
 
-#include "base/loader/hex_file.hh"
-#include "base/loader/symtab.hh"
 #include "base/cprintf.hh"
+#include "base/loader/symtab.hh"
 #include "mem/port_proxy.hh"
 
 using namespace std;

src/base/loader/object_file.cc

@@ -29,9 +29,11 @@
  *          Steve Reinhardt
  */
 
+#include "base/loader/object_file.hh"
+
+#include <fcntl.h>
 #include <sys/mman.h>
 #include <sys/types.h>
-#include <fcntl.h>
 #include <unistd.h>
 #include <zlib.h>
 
@@ -39,14 +41,13 @@
 #include <list>
 #include <string>
 
+#include "base/cprintf.hh"
 #include "base/loader/aout_object.hh"
 #include "base/loader/dtb_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/port_proxy.hh"
 
 using namespace std;

src/base/loader/raw_object.cc

@@ -29,6 +29,7 @@
  */
 
 #include "base/loader/raw_object.hh"
+
 #include "base/loader/symtab.hh"
 #include "base/trace.hh"
 #include "debug/Loader.hh"

src/base/loader/symtab.cc

@@ -28,12 +28,13 @@
  * Authors: Nathan Binkert
  */
 
+#include "base/loader/symtab.hh"
+
 #include <fstream>
 #include <iostream>
 #include <string>
 #include <vector>
 
-#include "base/loader/symtab.hh"
 #include "base/misc.hh"
 #include "base/str.hh"
 #include "base/types.hh"

src/base/match.cc

@@ -29,6 +29,7 @@
  */
 
 #include "base/match.hh"
+
 #include "base/str.hh"
 
 using namespace std;

src/base/misc.cc

@@ -41,13 +41,14 @@
  *          Andreas Sandberg
  */
 
+#include "base/misc.hh"
+
 #include <cstdlib>
 #include <cstring>
 #include <string>
 
 #include "base/cprintf.hh"
 #include "base/hostinfo.hh"
-#include "base/misc.hh"
 #include "base/output.hh"
 #include "base/trace.hh"
 #include "base/types.hh"

src/base/output.cc

@@ -44,10 +44,13 @@
  *          Sascha Bischoff
  */
 
+#include "base/output.hh"
+
+#include <dirent.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <dirent.h>
 #include <unistd.h>
+#include <zfstream.h>
 
 #include <cassert>
 #include <cerrno>
@@ -55,10 +58,7 @@
 #include <cstdlib>
 #include <fstream>
 
-#include <zfstream.h>
-
 #include "base/misc.hh"
-#include "base/output.hh"
 
 using namespace std;
 

src/base/pollevent.cc

@@ -30,17 +30,20 @@
 
 #include <sys/ioctl.h>
 #include <sys/types.h>
+
 #if defined(__sun__) || defined(__SUNPRO_CC)
 #include <sys/file.h>
+
 #endif
 
+#include "base/pollevent.hh"
+
 #include <fcntl.h>
 #include <unistd.h>
 
 #include <csignal>
 
 #include "base/misc.hh"
-#include "base/pollevent.hh"
 #include "base/types.hh"
 #include "sim/async.hh"
 #include "sim/core.hh"

src/base/random.cc

@@ -42,10 +42,11 @@
  *          Andreas Hansson
  */
 
+#include "base/random.hh"
+
 #include <sstream>
 
 #include "base/misc.hh"
-#include "base/random.hh"
 #include "sim/serialize.hh"
 
 Random::Random()

src/base/remote_gdb.cc

@@ -119,16 +119,17 @@
  * "Stub" to allow remote cpu to debug over a serial line using gdb.
  */
 
-#include <signal.h>
+#include "base/remote_gdb.hh"
+
 #include <sys/signal.h>
 #include <unistd.h>
 
+#include <csignal>
 #include <cstdio>
 #include <string>
 
 #include "arch/vtophys.hh"
 #include "base/intmath.hh"
-#include "base/remote_gdb.hh"
 #include "base/socket.hh"
 #include "base/trace.hh"
 #include "config/the_isa.hh"
@@ -136,8 +137,8 @@
 #include "cpu/static_inst.hh"
 #include "cpu/thread_context.hh"
 #include "debug/GDBAll.hh"
-#include "mem/port.hh"
 #include "mem/fs_translating_port_proxy.hh"
+#include "mem/port.hh"
 #include "mem/se_translating_port_proxy.hh"
 #include "sim/full_system.hh"
 #include "sim/system.hh"

src/base/socket.cc

@@ -28,6 +28,8 @@
  * Authors: Nathan Binkert
  */
 
+#include "base/socket.hh"
+
 #include <netinet/in.h>
 #include <netinet/tcp.h>
 #include <sys/socket.h>
@@ -37,7 +39,6 @@
 #include <cerrno>
 
 #include "base/misc.hh"
-#include "base/socket.hh"
 #include "base/types.hh"
 
 using namespace std;

src/base/statistics.cc

@@ -28,6 +28,8 @@
  * Authors: Nathan Binkert
  */
 
+#include "base/statistics.hh"
+
 #include <fstream>
 #include <iomanip>
 #include <list>
@@ -39,7 +41,6 @@
 #include "base/debug.hh"
 #include "base/hostinfo.hh"
 #include "base/misc.hh"
-#include "base/statistics.hh"
 #include "base/str.hh"
 #include "base/time.hh"
 #include "base/trace.hh"

src/base/stats/text.cc

@@ -33,23 +33,27 @@
 #endif
 
 #if defined(__sun)
-#include <math.h>
+#include <cmath>
+
 #endif
 
 #include <cassert>
+
 #ifdef __SUNPRO_CC
-#include <math.h>
+#include <cmath>
+
 #endif
+#include "base/stats/text.hh"
+
 #include <cmath>
 #include <fstream>
 #include <iostream>
 #include <sstream>
 #include <string>
 
-#include "base/stats/info.hh"
-#include "base/stats/text.hh"
 #include "base/cast.hh"
 #include "base/misc.hh"
+#include "base/stats/info.hh"
 #include "base/str.hh"
 
 using namespace std;

src/base/str.cc

@@ -28,11 +28,11 @@
  * Authors: Nathan Binkert
  */
 
+#include "base/str.hh"
+
 #include <string>
 #include <vector>
 
-#include "base/str.hh"
-
 using namespace std;
 
 bool

src/base/time.cc

@@ -28,12 +28,13 @@
  * Authors: Nathan Binkert
  */
 
+#include "base/time.hh"
+
 #include <cstdlib>
 #include <ctime>
 #include <iostream>
 #include <sstream>
 
-#include "base/time.hh"
 #include "config/use_posix_clock.hh"
 #include "sim/core.hh"
 #include "sim/serialize.hh"

src/base/trace.cc

@@ -33,6 +33,8 @@
  *          Andrew Bardsley
  */
 
+#include "base/trace.hh"
+
 #include <cctype>
 #include <fstream>
 #include <iostream>
@@ -43,7 +45,6 @@
 #include "base/misc.hh"
 #include "base/output.hh"
 #include "base/str.hh"
-#include "base/trace.hh"
 
 const std::string &name()
 {

src/base/vnc/vncinput.cc

@@ -42,9 +42,10 @@
  * Implementiation of a VNC input
  */
 
+#include "base/vnc/vncinput.hh"
+
 #include <sys/types.h>
 
-#include "base/vnc/vncinput.hh"
 #include "base/output.hh" //simout
 #include "base/trace.hh"
 #include "debug/VNC.hh"

src/base/vnc/vncserver.cc

@@ -60,8 +60,8 @@
 #include <unistd.h>
 
 #include <cerrno>
-#include <cstdio>
 #include <cstddef>
+#include <cstdio>
 
 #include "base/atomicio.hh"
 #include "base/bitmap.hh"