From 7a8dda49a4ec33be17bbd101ebd68e02562b9c3d Mon Sep 17 00:00:00 2001 From: Brandon Potter Date: Wed, 9 Nov 2016 14:27:37 -0600 Subject: style: [patch 1/22] use /r/3648/ to reorganize includes --- src/arch/mips/bare_iron/system.cc | 1 + src/arch/mips/dsp.cc | 1 + src/arch/mips/faults.cc | 1 + src/arch/mips/idle_event.cc | 1 + src/arch/mips/interrupts.cc | 1 + src/arch/mips/isa.cc | 1 + src/arch/mips/linux/process.cc | 3 ++- src/arch/mips/linux/system.cc | 3 ++- src/arch/mips/pagetable.cc | 1 + src/arch/mips/process.cc | 3 ++- src/arch/mips/remote_gdb.cc | 3 ++- src/arch/mips/stacktrace.cc | 3 ++- src/arch/mips/system.cc | 1 + src/arch/mips/tlb.cc | 3 ++- src/arch/mips/utility.cc | 4 ++-- src/arch/mips/vtophys.cc | 3 ++- 16 files changed, 24 insertions(+), 9 deletions(-) (limited to 'src/arch/mips') diff --git a/src/arch/mips/bare_iron/system.cc b/src/arch/mips/bare_iron/system.cc index ff928acfc..e1f5462aa 100755 --- a/src/arch/mips/bare_iron/system.cc +++ b/src/arch/mips/bare_iron/system.cc @@ -29,6 +29,7 @@ */ #include "arch/mips/bare_iron/system.hh" + #include "params/BareIronMipsSystem.hh" BareIronMipsSystem::BareIronMipsSystem(Params *p) diff --git a/src/arch/mips/dsp.cc b/src/arch/mips/dsp.cc index 3f6c6866e..c999955e4 100755 --- a/src/arch/mips/dsp.cc +++ b/src/arch/mips/dsp.cc @@ -29,6 +29,7 @@ */ #include "arch/mips/dsp.hh" + #include "arch/mips/isa_traits.hh" #include "base/bitfield.hh" #include "base/misc.hh" diff --git a/src/arch/mips/faults.cc b/src/arch/mips/faults.cc index eae6bc927..9ab1500ec 100644 --- a/src/arch/mips/faults.cc +++ b/src/arch/mips/faults.cc @@ -34,6 +34,7 @@ */ #include "arch/mips/faults.hh" + #include "arch/mips/pra_constants.hh" #include "base/trace.hh" #include "cpu/base.hh" diff --git a/src/arch/mips/idle_event.cc b/src/arch/mips/idle_event.cc index 8c98c5078..a57988c10 100644 --- a/src/arch/mips/idle_event.cc +++ b/src/arch/mips/idle_event.cc @@ -31,6 +31,7 @@ */ #include "arch/mips/idle_event.hh" + #include "arch/mips/kernel_stats.hh" #include "cpu/thread_context.hh" diff --git a/src/arch/mips/interrupts.cc b/src/arch/mips/interrupts.cc index 98c1b8e23..17bb146c4 100755 --- a/src/arch/mips/interrupts.cc +++ b/src/arch/mips/interrupts.cc @@ -32,6 +32,7 @@ */ #include "arch/mips/interrupts.hh" + #include "arch/mips/isa_traits.hh" #include "arch/mips/pra_constants.hh" #include "base/trace.hh" diff --git a/src/arch/mips/isa.cc b/src/arch/mips/isa.cc index 5090e0b92..6310f67e7 100644 --- a/src/arch/mips/isa.cc +++ b/src/arch/mips/isa.cc @@ -29,6 +29,7 @@ */ #include "arch/mips/isa.hh" + #include "arch/mips/mt.hh" #include "arch/mips/mt_constants.hh" #include "arch/mips/pra_constants.hh" diff --git a/src/arch/mips/linux/process.cc b/src/arch/mips/linux/process.cc index c6c40188e..deb6e8b80 100644 --- a/src/arch/mips/linux/process.cc +++ b/src/arch/mips/linux/process.cc @@ -30,9 +30,10 @@ * Korey Sewell */ -#include "arch/mips/linux/linux.hh" #include "arch/mips/linux/process.hh" + #include "arch/mips/isa_traits.hh" +#include "arch/mips/linux/linux.hh" #include "base/trace.hh" #include "cpu/thread_context.hh" #include "debug/SyscallVerbose.hh" diff --git a/src/arch/mips/linux/system.cc b/src/arch/mips/linux/system.cc index dc2ac7da5..4a23aae66 100644 --- a/src/arch/mips/linux/system.cc +++ b/src/arch/mips/linux/system.cc @@ -39,8 +39,9 @@ * up boot time. */ -#include "arch/generic/linux/threadinfo.hh" #include "arch/mips/linux/system.hh" + +#include "arch/generic/linux/threadinfo.hh" #include "arch/mips/idle_event.hh" #include "arch/mips/system.hh" #include "arch/vtophys.hh" diff --git a/src/arch/mips/pagetable.cc b/src/arch/mips/pagetable.cc index 26d9bf408..0c1734b42 100644 --- a/src/arch/mips/pagetable.cc +++ b/src/arch/mips/pagetable.cc @@ -32,6 +32,7 @@ */ #include "arch/mips/pagetable.hh" + #include "sim/serialize.hh" namespace MipsISA diff --git a/src/arch/mips/process.cc b/src/arch/mips/process.cc index 6947eeafd..dd97fe7f1 100644 --- a/src/arch/mips/process.cc +++ b/src/arch/mips/process.cc @@ -30,8 +30,9 @@ * Korey Sewell */ -#include "arch/mips/isa_traits.hh" #include "arch/mips/process.hh" + +#include "arch/mips/isa_traits.hh" #include "base/loader/elf_object.hh" #include "base/loader/object_file.hh" #include "base/misc.hh" diff --git a/src/arch/mips/remote_gdb.cc b/src/arch/mips/remote_gdb.cc index 68d8eaa57..4fa7cac70 100644 --- a/src/arch/mips/remote_gdb.cc +++ b/src/arch/mips/remote_gdb.cc @@ -133,13 +133,14 @@ * "Stub" to allow remote cpu to debug over a serial line using gdb. */ +#include "arch/mips/remote_gdb.hh" + #include #include #include #include "arch/mips/decoder.hh" -#include "arch/mips/remote_gdb.hh" #include "arch/mips/vtophys.hh" #include "cpu/thread_state.hh" #include "debug/GDBAcc.hh" diff --git a/src/arch/mips/stacktrace.cc b/src/arch/mips/stacktrace.cc index 78457c09c..f584855dc 100644 --- a/src/arch/mips/stacktrace.cc +++ b/src/arch/mips/stacktrace.cc @@ -28,10 +28,11 @@ * Authors: Nathan Binkert */ +#include "arch/mips/stacktrace.hh" + #include #include "arch/mips/isa_traits.hh" -#include "arch/mips/stacktrace.hh" #include "arch/mips/vtophys.hh" #include "base/bitfield.hh" #include "base/trace.hh" diff --git a/src/arch/mips/system.cc b/src/arch/mips/system.cc index c6a043e46..815674702 100755 --- a/src/arch/mips/system.cc +++ b/src/arch/mips/system.cc @@ -32,6 +32,7 @@ */ #include "arch/mips/system.hh" + #include "arch/vtophys.hh" #include "base/loader/hex_file.hh" #include "base/loader/object_file.hh" diff --git a/src/arch/mips/tlb.cc b/src/arch/mips/tlb.cc index 340c83021..87a459488 100644 --- a/src/arch/mips/tlb.cc +++ b/src/arch/mips/tlb.cc @@ -33,13 +33,14 @@ * Deyuan Guo */ +#include "arch/mips/tlb.hh" + #include #include #include "arch/mips/faults.hh" #include "arch/mips/pagetable.hh" #include "arch/mips/pra_constants.hh" -#include "arch/mips/tlb.hh" #include "arch/mips/utility.hh" #include "base/inifile.hh" #include "base/str.hh" diff --git a/src/arch/mips/utility.cc b/src/arch/mips/utility.cc index 80047fbfd..c56321612 100644 --- a/src/arch/mips/utility.cc +++ b/src/arch/mips/utility.cc @@ -28,11 +28,12 @@ * Authors: Korey Sewell */ +#include "arch/mips/utility.hh" + #include #include "arch/mips/isa_traits.hh" #include "arch/mips/registers.hh" -#include "arch/mips/utility.hh" #include "arch/mips/vtophys.hh" #include "base/bitfield.hh" #include "base/misc.hh" @@ -41,7 +42,6 @@ #include "mem/fs_translating_port_proxy.hh" #include "sim/serialize.hh" - using namespace MipsISA; using namespace std; diff --git a/src/arch/mips/vtophys.cc b/src/arch/mips/vtophys.cc index 60d9bc1ba..237b67524 100755 --- a/src/arch/mips/vtophys.cc +++ b/src/arch/mips/vtophys.cc @@ -31,9 +31,10 @@ * Jaidev Patwardhan */ +#include "arch/mips/vtophys.hh" + #include -#include "arch/mips/vtophys.hh" #include "base/chunk_generator.hh" #include "base/trace.hh" #include "cpu/thread_context.hh" -- cgit v1.2.3