changeset 2f4020838149 in /z/repo/m5
details: http://repo.m5sim.org/m5?cmd=changeset;node=2f4020838149
description:
includes: sort includes again
diffstat:
99 files changed, 206 insertions(+), 219 deletions(-)
src/arch/alpha/isa_traits.hh | 2 +-
src/arch/alpha/predecoder.hh | 2 +-
src/arch/arm/utility.hh | 2 +-
src/arch/mips/dsp.hh | 2 +-
src/arch/mips/isa_traits.hh | 2 +-
src/arch/mips/utility.hh | 5 +----
src/arch/sparc/isa_traits.hh | 2 +-
src/arch/sparc/predecoder.hh | 2 +-
src/arch/sparc/regfile.hh | 4 ++--
src/arch/x86/bios/acpi.hh | 6 +++---
src/arch/x86/bios/e820.hh | 6 +++---
src/arch/x86/bios/intelmp.cc | 2 +-
src/arch/x86/bios/smbios.cc | 2 +-
src/arch/x86/bios/smbios.hh | 2 +-
src/arch/x86/intmessage.hh | 2 +-
src/arch/x86/miscregfile.hh | 4 ++--
src/arch/x86/pagetable.hh | 2 +-
src/arch/x86/pagetable_walker.hh | 2 +-
src/arch/x86/predecoder.cc | 2 +-
src/arch/x86/regfile.hh | 4 ++--
src/arch/x86/utility.hh | 2 +-
src/arch/x86/x86_traits.hh | 2 +-
src/base/cp_annotate.hh | 15 ++++++++-------
src/base/crc.cc | 2 +-
src/base/inet.cc | 2 +-
src/base/inet.hh | 2 +-
src/base/intmath.hh | 8 ++++----
src/base/misc.cc | 2 +-
src/base/pollevent.cc | 4 ++--
src/base/res_list.hh | 3 ++-
src/base/statistics.hh | 2 +-
src/base/stats/mysql.cc | 2 +-
src/base/stats/output.cc | 2 +-
src/cpu/exetrace.hh | 10 +++++-----
src/cpu/inorder/comm.hh | 2 +-
src/cpu/inorder/inorder_trace.hh | 13 ++++++-------
src/cpu/inteltrace.hh | 9 ++++-----
src/cpu/legiontrace.hh | 8 ++++----
src/cpu/nativetrace.hh | 13 ++++++-------
src/cpu/o3/2bit_local_pred.hh | 6 +++---
src/cpu/o3/bpred_unit.hh | 8 +++-----
src/cpu/o3/comm.hh | 4 ++--
src/cpu/o3/fetch_impl.hh | 8 +++-----
src/cpu/o3/inst_queue.hh | 2 +-
src/cpu/o3/ras.hh | 3 ++-
src/cpu/o3/store_set.hh | 2 +-
src/cpu/o3/tournament_pred.hh | 5 +++--
src/cpu/ozone/ea_list.hh | 2 +-
src/cpu/ozone/inst_queue.hh | 2 +-
src/cpu/ozone/null_predictor.hh | 2 +-
src/cpu/simple/base.cc | 9 ++++-----
src/cpu/simple_thread.hh | 2 +-
src/cpu/static_inst.hh | 4 ++--
src/cpu/thread_context.hh | 4 ++--
src/dev/alpha/backdoor.hh | 2 +-
src/dev/etherlink.hh | 6 +++---
src/dev/etherpkt.hh | 2 +-
src/dev/intel_8254_timer.hh | 2 +-
src/dev/mips/backdoor.hh | 4 ++--
src/dev/ns_gige.cc | 2 +-
src/dev/sinic.cc | 4 ++--
src/dev/x86/intdev.hh | 2 +-
src/dev/x86/south_bridge.cc | 2 +-
src/kern/tru64/dump_mbuf.cc | 10 +++++-----
src/kern/tru64/mbuf.hh | 2 +-
src/mem/bus.hh | 4 ++--
src/mem/cache/cache_impl.hh | 9 +++------
src/mem/cache/mshr.cc | 12 ++++++------
src/mem/cache/tags/fa_lru.cc | 5 ++---
src/mem/cache/tags/fa_lru.hh | 10 +++++-----
src/mem/cache/tags/iic_repl/gen.cc | 2 +-
src/mem/cache/tags/iic_repl/repl.hh | 3 +--
src/mem/cache/tags/lru.hh | 12 ++++++------
src/mem/gems_common/util.cc | 3 ++-
src/mem/packet.hh | 3 +--
src/mem/page_table.hh | 10 +++++-----
src/mem/physical.cc | 2 +-
src/mem/ruby/common/Debug.hh | 7 ++++---
src/mem/ruby/common/Global.hh | 6 +++---
src/mem/ruby/network/orion/power_ll.cc | 4 ++--
src/mem/ruby/network/orion/power_utils.cc | 7 ++++---
src/mem/rubymem.cc | 20 ++++++++------------
src/mem/slicc/slicc_global.hh | 4 +---
src/python/swig/core.i | 2 +-
src/python/swig/event.i | 5 +++--
src/python/swig/pyobject.hh | 2 +-
src/python/swig/sim_object.i | 1 +
src/sim/arguments.hh | 4 ++--
src/sim/eventq.hh | 2 +-
src/sim/init.cc | 2 +-
src/sim/insttracer.hh | 2 +-
src/sim/sim_object.cc | 4 ++--
src/sim/simulate.cc | 4 ++--
src/sim/syscall_emul.hh | 2 +-
src/unittest/rangemaptest.cc | 3 ++-
src/unittest/rangemultimaptest.cc | 2 +-
util/statetrace/arch/tracechild_amd64.hh | 2 +-
util/statetrace/arch/tracechild_i386.hh | 2 +-
util/statetrace/arch/tracechild_sparc.hh | 2 +-
diffs (truncated from 1778 to 300 lines):
diff -r 9aed64c9f10f -r 2f4020838149 src/arch/alpha/isa_traits.hh
--- a/src/arch/alpha/isa_traits.hh Sun May 17 14:34:51 2009 -0700
+++ b/src/arch/alpha/isa_traits.hh Sun May 17 14:34:52 2009 -0700
@@ -37,8 +37,8 @@
#include "arch/alpha/ipr.hh"
#include "arch/alpha/max_inst_regs.hh"
#include "arch/alpha/types.hh"
+#include "base/types.hh"
#include "config/full_system.hh"
-#include "base/types.hh"
class StaticInstPtr;
diff -r 9aed64c9f10f -r 2f4020838149 src/arch/alpha/predecoder.hh
--- a/src/arch/alpha/predecoder.hh Sun May 17 14:34:51 2009 -0700
+++ b/src/arch/alpha/predecoder.hh Sun May 17 14:34:52 2009 -0700
@@ -33,8 +33,8 @@
#include "arch/alpha/types.hh"
#include "base/misc.hh"
+#include "base/types.hh"
#include "config/full_system.hh"
-#include "base/types.hh"
class ThreadContext;
diff -r 9aed64c9f10f -r 2f4020838149 src/arch/arm/utility.hh
--- a/src/arch/arm/utility.hh Sun May 17 14:34:51 2009 -0700
+++ b/src/arch/arm/utility.hh Sun May 17 14:34:52 2009 -0700
@@ -35,9 +35,9 @@
#include "arch/arm/types.hh"
#include "base/misc.hh"
+#include "base/types.hh"
#include "config/full_system.hh"
#include "cpu/thread_context.hh"
-#include "base/types.hh"
class ThreadContext;
diff -r 9aed64c9f10f -r 2f4020838149 src/arch/mips/dsp.hh
--- a/src/arch/mips/dsp.hh Sun May 17 14:34:51 2009 -0700
+++ b/src/arch/mips/dsp.hh Sun May 17 14:34:52 2009 -0700
@@ -34,8 +34,8 @@
#include "arch/mips/types.hh"
#include "arch/mips/isa_traits.hh"
#include "base/misc.hh"
+#include "base/types.hh"
#include "config/full_system.hh"
-#include "base/types.hh"
class ThreadContext;
diff -r 9aed64c9f10f -r 2f4020838149 src/arch/mips/isa_traits.hh
--- a/src/arch/mips/isa_traits.hh Sun May 17 14:34:51 2009 -0700
+++ b/src/arch/mips/isa_traits.hh Sun May 17 14:34:52 2009 -0700
@@ -36,8 +36,8 @@
#include "arch/mips/types.hh"
#include "arch/mips/mips_core_specific.hh"
+#include "base/types.hh"
#include "config/full_system.hh"
-#include "base/types.hh"
namespace LittleEndianGuest {};
diff -r 9aed64c9f10f -r 2f4020838149 src/arch/mips/utility.hh
--- a/src/arch/mips/utility.hh Sun May 17 14:34:51 2009 -0700
+++ b/src/arch/mips/utility.hh Sun May 17 14:34:52 2009 -0700
@@ -37,11 +37,8 @@
#include "arch/mips/types.hh"
#include "arch/mips/isa_traits.hh"
#include "base/misc.hh"
+#include "base/types.hh"
#include "config/full_system.hh"
-//XXX This is needed for size_t. We should use something other than size_t
-//#include "kern/linux/linux.hh"
-#include "base/types.hh"
-
#include "cpu/thread_context.hh"
class ThreadContext;
diff -r 9aed64c9f10f -r 2f4020838149 src/arch/sparc/isa_traits.hh
--- a/src/arch/sparc/isa_traits.hh Sun May 17 14:34:51 2009 -0700
+++ b/src/arch/sparc/isa_traits.hh Sun May 17 14:34:52 2009 -0700
@@ -35,8 +35,8 @@
#include "arch/sparc/types.hh"
#include "arch/sparc/max_inst_regs.hh"
#include "arch/sparc/sparc_traits.hh"
+#include "base/types.hh"
#include "config/full_system.hh"
-#include "base/types.hh"
class StaticInstPtr;
diff -r 9aed64c9f10f -r 2f4020838149 src/arch/sparc/predecoder.hh
--- a/src/arch/sparc/predecoder.hh Sun May 17 14:34:51 2009 -0700
+++ b/src/arch/sparc/predecoder.hh Sun May 17 14:34:52 2009 -0700
@@ -33,8 +33,8 @@
#include "arch/sparc/types.hh"
#include "base/misc.hh"
+#include "base/types.hh"
#include "cpu/thread_context.hh"
-#include "base/types.hh"
class ThreadContext;
diff -r 9aed64c9f10f -r 2f4020838149 src/arch/sparc/regfile.hh
--- a/src/arch/sparc/regfile.hh Sun May 17 14:34:51 2009 -0700
+++ b/src/arch/sparc/regfile.hh Sun May 17 14:34:52 2009 -0700
@@ -32,6 +32,8 @@
#ifndef __ARCH_SPARC_REGFILE_HH__
#define __ARCH_SPARC_REGFILE_HH__
+#include <string>
+
#include "arch/sparc/floatregfile.hh"
#include "arch/sparc/intregfile.hh"
#include "arch/sparc/isa_traits.hh"
@@ -39,8 +41,6 @@
#include "arch/sparc/types.hh"
#include "base/types.hh"
-#include <string>
-
class Checkpoint;
namespace SparcISA
diff -r 9aed64c9f10f -r 2f4020838149 src/arch/x86/bios/acpi.hh
--- a/src/arch/x86/bios/acpi.hh Sun May 17 14:34:51 2009 -0700
+++ b/src/arch/x86/bios/acpi.hh Sun May 17 14:34:52 2009 -0700
@@ -58,12 +58,12 @@
#ifndef __ARCH_X86_BIOS_ACPI_HH__
#define __ARCH_X86_BIOS_ACPI_HH__
+#include <string>
+#include <vector>
+
#include "base/types.hh"
#include "sim/sim_object.hh"
-#include <vector>
-#include <string>
-
class Port;
class X86ACPIRSDPParams;
diff -r 9aed64c9f10f -r 2f4020838149 src/arch/x86/bios/e820.hh
--- a/src/arch/x86/bios/e820.hh Sun May 17 14:34:51 2009 -0700
+++ b/src/arch/x86/bios/e820.hh Sun May 17 14:34:52 2009 -0700
@@ -58,13 +58,13 @@
#ifndef __ARCH_X86_BIOS_E820_HH__
#define __ARCH_X86_BIOS_E820_HH__
+#include <vector>
+
+#include "base/types.hh"
#include "params/X86E820Entry.hh"
#include "params/X86E820Table.hh"
-#include "base/types.hh"
#include "sim/sim_object.hh"
-#include <vector>
-
class Port;
namespace X86ISA
diff -r 9aed64c9f10f -r 2f4020838149 src/arch/x86/bios/intelmp.cc
--- a/src/arch/x86/bios/intelmp.cc Sun May 17 14:34:51 2009 -0700
+++ b/src/arch/x86/bios/intelmp.cc Sun May 17 14:34:52 2009 -0700
@@ -58,9 +58,9 @@
#include "arch/x86/bios/intelmp.hh"
#include "arch/x86/isa_traits.hh"
#include "base/misc.hh"
+#include "base/types.hh"
#include "mem/port.hh"
#include "sim/byteswap.hh"
-#include "base/types.hh"
// Config entry types
#include "params/X86IntelMPBaseConfigEntry.hh"
diff -r 9aed64c9f10f -r 2f4020838149 src/arch/x86/bios/smbios.cc
--- a/src/arch/x86/bios/smbios.cc Sun May 17 14:34:51 2009 -0700
+++ b/src/arch/x86/bios/smbios.cc Sun May 17 14:34:52 2009 -0700
@@ -87,12 +87,12 @@
#include "arch/x86/bios/smbios.hh"
#include "arch/x86/isa_traits.hh"
+#include "base/types.hh"
#include "mem/port.hh"
#include "params/X86SMBiosBiosInformation.hh"
#include "params/X86SMBiosSMBiosStructure.hh"
#include "params/X86SMBiosSMBiosTable.hh"
#include "sim/byteswap.hh"
-#include "base/types.hh"
using namespace std;
diff -r 9aed64c9f10f -r 2f4020838149 src/arch/x86/bios/smbios.hh
--- a/src/arch/x86/bios/smbios.hh Sun May 17 14:34:51 2009 -0700
+++ b/src/arch/x86/bios/smbios.hh Sun May 17 14:34:52 2009 -0700
@@ -91,9 +91,9 @@
#include <string>
#include <vector>
+#include "base/types.hh"
#include "enums/Characteristic.hh"
#include "enums/ExtCharacteristic.hh"
-#include "base/types.hh"
#include "sim/sim_object.hh"
class FunctionalPort;
diff -r 9aed64c9f10f -r 2f4020838149 src/arch/x86/intmessage.hh
--- a/src/arch/x86/intmessage.hh Sun May 17 14:34:51 2009 -0700
+++ b/src/arch/x86/intmessage.hh Sun May 17 14:34:52 2009 -0700
@@ -33,10 +33,10 @@
#include "arch/x86/x86_traits.hh"
#include "base/bitunion.hh"
+#include "base/types.hh"
#include "mem/packet.hh"
#include "mem/packet_access.hh"
#include "mem/request.hh"
-#include "base/types.hh"
namespace X86ISA
{
diff -r 9aed64c9f10f -r 2f4020838149 src/arch/x86/miscregfile.hh
--- a/src/arch/x86/miscregfile.hh Sun May 17 14:34:51 2009 -0700
+++ b/src/arch/x86/miscregfile.hh Sun May 17 14:34:52 2009 -0700
@@ -88,13 +88,13 @@
#ifndef __ARCH_X86_MISCREGFILE_HH__
#define __ARCH_X86_MISCREGFILE_HH__
+#include <string>
+
#include "arch/x86/faults.hh"
#include "arch/x86/miscregs.hh"
#include "arch/x86/types.hh"
#include "base/types.hh"
-#include <string>
-
class Checkpoint;
namespace X86ISA
diff -r 9aed64c9f10f -r 2f4020838149 src/arch/x86/pagetable.hh
--- a/src/arch/x86/pagetable.hh Sun May 17 14:34:51 2009 -0700
+++ b/src/arch/x86/pagetable.hh Sun May 17 14:34:52 2009 -0700
@@ -61,9 +61,9 @@
#include <iostream>
#include <string>
-#include "base/types.hh"
#include "base/bitunion.hh"
#include "base/misc.hh"
+#include "base/types.hh"
class Checkpoint;
diff -r 9aed64c9f10f -r 2f4020838149 src/arch/x86/pagetable_walker.hh
--- a/src/arch/x86/pagetable_walker.hh Sun May 17 14:34:51 2009 -0700
+++ b/src/arch/x86/pagetable_walker.hh Sun May 17 14:34:52 2009 -0700
@@ -62,10 +62,10 @@
#include "arch/x86/pagetable.hh"
#include "arch/x86/tlb.hh"
+#include "base/types.hh"
#include "mem/mem_object.hh"
#include "mem/packet.hh"
#include "params/X86PagetableWalker.hh"
-#include "base/types.hh"
class ThreadContext;
diff -r 9aed64c9f10f -r 2f4020838149 src/arch/x86/predecoder.cc
--- a/src/arch/x86/predecoder.cc Sun May 17 14:34:51 2009 -0700
+++ b/src/arch/x86/predecoder.cc Sun May 17 14:34:52 2009 -0700
@@ -59,8 +59,8 @@
#include "arch/x86/predecoder.hh"
#include "base/misc.hh"
#include "base/trace.hh"
+#include "base/types.hh"
#include "cpu/thread_context.hh"
-#include "base/types.hh"
namespace X86ISA
{
diff -r 9aed64c9f10f -r 2f4020838149 src/arch/x86/regfile.hh
--- a/src/arch/x86/regfile.hh Sun May 17 14:34:51 2009 -0700
+++ b/src/arch/x86/regfile.hh Sun May 17 14:34:52 2009 -0700
@@ -58,6 +58,8 @@
#ifndef __ARCH_X86_REGFILE_HH__
#define __ARCH_X86_REGFILE_HH__
+#include <string>
+
#include "arch/x86/floatregfile.hh"
#include "arch/x86/intregfile.hh"
_______________________________________________
m5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/m5-dev
