changeset 92274350b953 in /z/repo/m5
details: http://repo.m5sim.org/m5?cmd=changeset;node=92274350b953
description:
style: fix sorting of includes and whitespace in some files
diffstat:
src/arch/alpha/faults.cc | 1 +
src/arch/alpha/linux/process.cc | 2 --
src/arch/mips/faults.cc | 9 +++++----
src/arch/mips/linux/process.cc | 2 --
src/arch/mips/locked_mem.hh | 1 -
src/arch/mips/process.cc | 3 ---
src/arch/mips/tlb.cc | 1 -
src/arch/power/tlb.cc | 1 -
src/arch/x86/insts/microregop.cc | 3 ++-
src/base/loader/aout_object.cc | 5 +----
src/base/loader/ecoff_object.cc | 13 +++++++++----
src/base/loader/elf_object.cc | 2 +-
src/base/loader/exec_ecoff.h | 3 ---
src/cpu/o3/mem_dep_unit_impl.hh | 1 -
src/dev/pcidev.cc | 6 +++---
src/kern/linux/events.cc | 6 +++---
src/mem/cache/base.hh | 6 +++---
src/mem/cache/tags/iic.cc | 11 ++++-------
src/mem/cache/tags/lru.cc | 4 ++--
19 files changed, 34 insertions(+), 46 deletions(-)
diffs (truncated from 312 to 300 lines):
diff -r 2221ec64132f -r 92274350b953 src/arch/alpha/faults.cc
--- a/src/arch/alpha/faults.cc Thu Sep 09 14:26:29 2010 -0700
+++ b/src/arch/alpha/faults.cc Fri Sep 10 14:58:04 2010 -0700
@@ -35,6 +35,7 @@
#include "cpu/thread_context.hh"
#include "cpu/base.hh"
#include "base/trace.hh"
+
#if !FULL_SYSTEM
#include "sim/process.hh"
#include "mem/page_table.hh"
diff -r 2221ec64132f -r 92274350b953 src/arch/alpha/linux/process.cc
--- a/src/arch/alpha/linux/process.cc Thu Sep 09 14:26:29 2010 -0700
+++ b/src/arch/alpha/linux/process.cc Fri Sep 10 14:58:04 2010 -0700
@@ -32,11 +32,9 @@
#include "arch/alpha/linux/linux.hh"
#include "arch/alpha/linux/process.hh"
#include "arch/alpha/isa_traits.hh"
-
#include "base/trace.hh"
#include "cpu/thread_context.hh"
#include "kern/linux/linux.hh"
-
#include "sim/process.hh"
#include "sim/syscall_emul.hh"
diff -r 2221ec64132f -r 92274350b953 src/arch/mips/faults.cc
--- a/src/arch/mips/faults.cc Thu Sep 09 14:26:29 2010 -0700
+++ b/src/arch/mips/faults.cc Fri Sep 10 14:58:04 2010 -0700
@@ -32,13 +32,14 @@
*/
#include "arch/mips/faults.hh"
+#include "arch/mips/pra_constants.hh"
+#include "base/trace.hh"
+#include "cpu/base.hh"
#include "cpu/thread_context.hh"
-#include "cpu/base.hh"
-#include "base/trace.hh"
-#include "arch/mips/pra_constants.hh"
+
#if !FULL_SYSTEM
+#include "mem/page_table.hh"
#include "sim/process.hh"
-#include "mem/page_table.hh"
#endif
namespace MipsISA
diff -r 2221ec64132f -r 92274350b953 src/arch/mips/linux/process.cc
--- a/src/arch/mips/linux/process.cc Thu Sep 09 14:26:29 2010 -0700
+++ b/src/arch/mips/linux/process.cc Fri Sep 10 14:58:04 2010 -0700
@@ -33,11 +33,9 @@
#include "arch/mips/linux/linux.hh"
#include "arch/mips/linux/process.hh"
#include "arch/mips/isa_traits.hh"
-
#include "base/trace.hh"
#include "cpu/thread_context.hh"
#include "kern/linux/linux.hh"
-
#include "sim/process.hh"
#include "sim/system.hh"
#include "sim/syscall_emul.hh"
diff -r 2221ec64132f -r 92274350b953 src/arch/mips/locked_mem.hh
--- a/src/arch/mips/locked_mem.hh Thu Sep 09 14:26:29 2010 -0700
+++ b/src/arch/mips/locked_mem.hh Fri Sep 10 14:58:04 2010 -0700
@@ -42,7 +42,6 @@
#include "base/trace.hh"
#include "mem/request.hh"
-
namespace MipsISA
{
diff -r 2221ec64132f -r 92274350b953 src/arch/mips/process.cc
--- a/src/arch/mips/process.cc Thu Sep 09 14:26:29 2010 -0700
+++ b/src/arch/mips/process.cc Fri Sep 10 14:58:04 2010 -0700
@@ -32,14 +32,11 @@
#include "arch/mips/isa_traits.hh"
#include "arch/mips/process.hh"
-
#include "base/loader/object_file.hh"
#include "base/loader/elf_object.hh"
#include "base/misc.hh"
#include "cpu/thread_context.hh"
-
#include "mem/page_table.hh"
-
#include "sim/process.hh"
#include "sim/process_impl.hh"
#include "sim/system.hh"
diff -r 2221ec64132f -r 92274350b953 src/arch/mips/tlb.cc
--- a/src/arch/mips/tlb.cc Thu Sep 09 14:26:29 2010 -0700
+++ b/src/arch/mips/tlb.cc Fri Sep 10 14:58:04 2010 -0700
@@ -47,7 +47,6 @@
#include "mem/page_table.hh"
#include "params/MipsTLB.hh"
-
using namespace std;
using namespace MipsISA;
diff -r 2221ec64132f -r 92274350b953 src/arch/power/tlb.cc
--- a/src/arch/power/tlb.cc Thu Sep 09 14:26:29 2010 -0700
+++ b/src/arch/power/tlb.cc Fri Sep 10 14:58:04 2010 -0700
@@ -50,7 +50,6 @@
#include "params/PowerTLB.hh"
#include "sim/process.hh"
-
using namespace std;
using namespace PowerISA;
diff -r 2221ec64132f -r 92274350b953 src/arch/x86/insts/microregop.cc
--- a/src/arch/x86/insts/microregop.cc Thu Sep 09 14:26:29 2010 -0700
+++ b/src/arch/x86/insts/microregop.cc Fri Sep 10 14:58:04 2010 -0700
@@ -37,10 +37,11 @@
* Authors: Gabe Black
*/
+#include <string>
+
#include "arch/x86/insts/microregop.hh"
#include "arch/x86/regs/misc.hh"
#include "base/condcodes.hh"
-#include <string>
namespace X86ISA
{
diff -r 2221ec64132f -r 92274350b953 src/base/loader/aout_object.cc
--- a/src/base/loader/aout_object.cc Thu Sep 09 14:26:29 2010 -0700
+++ b/src/base/loader/aout_object.cc Fri Sep 10 14:58:04 2010 -0700
@@ -31,11 +31,8 @@
#include <string>
#include "base/loader/aout_object.hh"
-
#include "base/loader/symtab.hh"
-
-#include "base/trace.hh" // for DPRINTF
-
+#include "base/trace.hh"
#include "base/loader/exec_aout.h"
using namespace std;
diff -r 2221ec64132f -r 92274350b953 src/base/loader/ecoff_object.cc
--- a/src/base/loader/ecoff_object.cc Thu Sep 09 14:26:29 2010 -0700
+++ b/src/base/loader/ecoff_object.cc Fri Sep 10 14:58:04 2010 -0700
@@ -31,14 +31,19 @@
#include <string>
#include "base/loader/ecoff_object.hh"
+#include "base/loader/symtab.hh"
#include "base/misc.hh"
-#include "base/loader/symtab.hh"
+#include "base/trace.hh"
+#include "base/types.hh"
-#include "base/trace.hh" // for DPRINTF
-
-#include "base/loader/exec_ecoff.h"
+// Only alpha will be able to load ecoff files for now.
+// base/types.hh and ecoff_machdep.h must be before the other .h files
+// because they are are gathered from other code bases and require some
+// typedefs from those files.
+#include "arch/alpha/ecoff_machdep.h"
#include "base/loader/coff_sym.h"
#include "base/loader/coff_symconst.h"
+#include "base/loader/exec_ecoff.h"
using namespace std;
diff -r 2221ec64132f -r 92274350b953 src/base/loader/elf_object.cc
--- a/src/base/loader/elf_object.cc Thu Sep 09 14:26:29 2010 -0700
+++ b/src/base/loader/elf_object.cc Fri Sep 10 14:58:04 2010 -0700
@@ -38,7 +38,7 @@
#include "base/loader/elf_object.hh"
#include "base/loader/symtab.hh"
#include "base/misc.hh"
-#include "base/trace.hh" // for DPRINTF
+#include "base/trace.hh"
#include "sim/byteswap.hh"
using namespace std;
diff -r 2221ec64132f -r 92274350b953 src/base/loader/exec_ecoff.h
--- a/src/base/loader/exec_ecoff.h Thu Sep 09 14:26:29 2010 -0700
+++ b/src/base/loader/exec_ecoff.h Fri Sep 10 14:58:04 2010 -0700
@@ -37,9 +37,6 @@
#ifndef _SYS_EXEC_ECOFF_H_
#define _SYS_EXEC_ECOFF_H_
-//Only alpha will be able to load ecoff files for now
-#include "arch/alpha/ecoff_machdep.h"
-
struct ecoff_filehdr {
coff_ushort f_magic; /* magic number */
coff_ushort f_nscns; /* # of sections */
diff -r 2221ec64132f -r 92274350b953 src/cpu/o3/mem_dep_unit_impl.hh
--- a/src/cpu/o3/mem_dep_unit_impl.hh Thu Sep 09 14:26:29 2010 -0700
+++ b/src/cpu/o3/mem_dep_unit_impl.hh Fri Sep 10 14:58:04 2010 -0700
@@ -32,7 +32,6 @@
#include "cpu/o3/inst_queue.hh"
#include "cpu/o3/mem_dep_unit.hh"
-
#include "params/DerivO3CPU.hh"
template <class MemDepPred, class Impl>
diff -r 2221ec64132f -r 92274350b953 src/dev/pcidev.cc
--- a/src/dev/pcidev.cc Thu Sep 09 14:26:29 2010 -0700
+++ b/src/dev/pcidev.cc Fri Sep 10 14:58:04 2010 -0700
@@ -39,13 +39,13 @@
#include <vector>
#include "base/inifile.hh"
-#include "base/intmath.hh" // for isPowerOf2(
+#include "base/intmath.hh"
#include "base/misc.hh"
-#include "base/str.hh" // for to_number
+#include "base/str.hh"
#include "base/trace.hh"
+#include "dev/alpha/tsunamireg.h"
#include "dev/pciconfigall.hh"
#include "dev/pcidev.hh"
-#include "dev/alpha/tsunamireg.h"
#include "mem/packet.hh"
#include "mem/packet_access.hh"
#include "sim/byteswap.hh"
diff -r 2221ec64132f -r 92274350b953 src/kern/linux/events.cc
--- a/src/kern/linux/events.cc Thu Sep 09 14:26:29 2010 -0700
+++ b/src/kern/linux/events.cc Fri Sep 10 14:58:04 2010 -0700
@@ -29,16 +29,16 @@
* Ali Saidi
*/
-#include "sim/arguments.hh"
+#include <sstream>
+
#include "base/trace.hh"
#include "cpu/thread_context.hh"
#include "kern/linux/events.hh"
#include "kern/linux/printk.hh"
#include "kern/system_events.hh"
+#include "sim/arguments.hh"
#include "sim/system.hh"
-#include <sstream>
-
namespace Linux {
void
diff -r 2221ec64132f -r 92274350b953 src/mem/cache/base.hh
--- a/src/mem/cache/base.hh Thu Sep 09 14:26:29 2010 -0700
+++ b/src/mem/cache/base.hh Fri Sep 10 14:58:04 2010 -0700
@@ -38,10 +38,10 @@
#ifndef __BASE_CACHE_HH__
#define __BASE_CACHE_HH__
+#include <algorithm>
+#include <list>
+#include <string>
#include <vector>
-#include <string>
-#include <list>
-#include <algorithm>
#include "base/misc.hh"
#include "base/statistics.hh"
diff -r 2221ec64132f -r 92274350b953 src/mem/cache/tags/iic.cc
--- a/src/mem/cache/tags/iic.cc Thu Sep 09 14:26:29 2010 -0700
+++ b/src/mem/cache/tags/iic.cc Fri Sep 10 14:58:04 2010 -0700
@@ -34,18 +34,15 @@
*/
#include <algorithm>
+#include <cmath>
#include <string>
#include <vector>
-#include <math.h>
-
+#include "base/intmath.hh"
+#include "base/trace.hh"
#include "mem/cache/base.hh"
#include "mem/cache/tags/iic.hh"
-#include "base/intmath.hh"
-#include "sim/core.hh" // for curTick
-
-#include "base/trace.hh" // for DPRINTF
-
+#include "sim/core.hh"
using namespace std;
diff -r 2221ec64132f -r 92274350b953 src/mem/cache/tags/lru.cc
--- a/src/mem/cache/tags/lru.cc Thu Sep 09 14:26:29 2010 -0700
+++ b/src/mem/cache/tags/lru.cc Fri Sep 10 14:58:04 2010 -0700
@@ -35,11 +35,11 @@
_______________________________________________
m5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/m5-dev
