style: fix sorting of includes and whitespace in some files
This commit is contained in:
parent
47ef97b9ca
commit
afafaf1dcb
|
@ -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"
|
||||
|
|
|
@ -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"
|
||||
|
||||
|
|
|
@ -32,13 +32,14 @@
|
|||
*/
|
||||
|
||||
#include "arch/mips/faults.hh"
|
||||
#include "cpu/thread_context.hh"
|
||||
#include "cpu/base.hh"
|
||||
#include "base/trace.hh"
|
||||
#include "arch/mips/pra_constants.hh"
|
||||
#include "base/trace.hh"
|
||||
#include "cpu/base.hh"
|
||||
#include "cpu/thread_context.hh"
|
||||
|
||||
#if !FULL_SYSTEM
|
||||
#include "sim/process.hh"
|
||||
#include "mem/page_table.hh"
|
||||
#include "sim/process.hh"
|
||||
#endif
|
||||
|
||||
namespace MipsISA
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -42,7 +42,6 @@
|
|||
#include "base/trace.hh"
|
||||
#include "mem/request.hh"
|
||||
|
||||
|
||||
namespace MipsISA
|
||||
{
|
||||
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -47,7 +47,6 @@
|
|||
#include "mem/page_table.hh"
|
||||
#include "params/MipsTLB.hh"
|
||||
|
||||
|
||||
using namespace std;
|
||||
using namespace MipsISA;
|
||||
|
||||
|
|
|
@ -50,7 +50,6 @@
|
|||
#include "params/PowerTLB.hh"
|
||||
#include "sim/process.hh"
|
||||
|
||||
|
||||
using namespace std;
|
||||
using namespace PowerISA;
|
||||
|
||||
|
|
|
@ -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
|
||||
{
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -31,14 +31,19 @@
|
|||
#include <string>
|
||||
|
||||
#include "base/loader/ecoff_object.hh"
|
||||
#include "base/misc.hh"
|
||||
#include "base/loader/symtab.hh"
|
||||
#include "base/misc.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;
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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 */
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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
|
||||
|
|
6
src/mem/cache/base.hh
vendored
6
src/mem/cache/base.hh
vendored
|
@ -38,10 +38,10 @@
|
|||
#ifndef __BASE_CACHE_HH__
|
||||
#define __BASE_CACHE_HH__
|
||||
|
||||
#include <vector>
|
||||
#include <string>
|
||||
#include <list>
|
||||
#include <algorithm>
|
||||
#include <list>
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
#include "base/misc.hh"
|
||||
#include "base/statistics.hh"
|
||||
|
|
11
src/mem/cache/tags/iic.cc
vendored
11
src/mem/cache/tags/iic.cc
vendored
|
@ -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;
|
||||
|
||||
|
|
4
src/mem/cache/tags/lru.cc
vendored
4
src/mem/cache/tags/lru.cc
vendored
|
@ -35,11 +35,11 @@
|
|||
|
||||
#include <string>
|
||||
|
||||
#include "mem/cache/base.hh"
|
||||
#include "base/intmath.hh"
|
||||
#include "mem/cache/base.hh"
|
||||
#include "mem/cache/tags/cacheset.hh"
|
||||
#include "mem/cache/tags/lru.hh"
|
||||
#include "sim/core.hh"
|
||||
#include "cacheset.hh"
|
||||
|
||||
using namespace std;
|
||||
|
||||
|
|
Loading…
Reference in a new issue