diff --git a/src/cpu/static_inst.cc b/src/cpu/static_inst.cc --- a/src/cpu/static_inst.cc +++ b/src/cpu/static_inst.cc @@ -29,9 +29,10 @@ * Nathan Binkert */ +#include "cpu/static_inst.hh" + #include -#include "cpu/static_inst.hh" #include "sim/core.hh" StaticInstPtr StaticInst::nullStaticInstPtr; diff --git a/src/cpu/testers/directedtest/DirectedGenerator.cc b/src/cpu/testers/directedtest/DirectedGenerator.cc --- a/src/cpu/testers/directedtest/DirectedGenerator.cc +++ b/src/cpu/testers/directedtest/DirectedGenerator.cc @@ -28,6 +28,7 @@ */ #include "cpu/testers/directedtest/DirectedGenerator.hh" + #include "sim/system.hh" DirectedGenerator::DirectedGenerator(const Params *p) diff --git a/src/cpu/testers/directedtest/InvalidateGenerator.cc b/src/cpu/testers/directedtest/InvalidateGenerator.cc --- a/src/cpu/testers/directedtest/InvalidateGenerator.cc +++ b/src/cpu/testers/directedtest/InvalidateGenerator.cc @@ -27,8 +27,9 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "cpu/testers/directedtest/InvalidateGenerator.hh" + #include "cpu/testers/directedtest/DirectedGenerator.hh" -#include "cpu/testers/directedtest/InvalidateGenerator.hh" #include "cpu/testers/directedtest/RubyDirectedTester.hh" #include "debug/DirectedTest.hh" diff --git a/src/cpu/testers/directedtest/RubyDirectedTester.cc b/src/cpu/testers/directedtest/RubyDirectedTester.cc --- a/src/cpu/testers/directedtest/RubyDirectedTester.cc +++ b/src/cpu/testers/directedtest/RubyDirectedTester.cc @@ -39,8 +39,9 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "cpu/testers/directedtest/RubyDirectedTester.hh" + #include "cpu/testers/directedtest/DirectedGenerator.hh" -#include "cpu/testers/directedtest/RubyDirectedTester.hh" #include "debug/DirectedTest.hh" #include "sim/sim_exit.hh" diff --git a/src/cpu/testers/directedtest/SeriesRequestGenerator.cc b/src/cpu/testers/directedtest/SeriesRequestGenerator.cc --- a/src/cpu/testers/directedtest/SeriesRequestGenerator.cc +++ b/src/cpu/testers/directedtest/SeriesRequestGenerator.cc @@ -27,10 +27,11 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "cpu/testers/directedtest/SeriesRequestGenerator.hh" + #include "base/random.hh" #include "cpu/testers/directedtest/DirectedGenerator.hh" #include "cpu/testers/directedtest/RubyDirectedTester.hh" -#include "cpu/testers/directedtest/SeriesRequestGenerator.hh" #include "debug/DirectedTest.hh" SeriesRequestGenerator::SeriesRequestGenerator(const Params *p) diff --git a/src/cpu/testers/garnet_synthetic_traffic/GarnetSyntheticTraffic.cc b/src/cpu/testers/garnet_synthetic_traffic/GarnetSyntheticTraffic.cc --- a/src/cpu/testers/garnet_synthetic_traffic/GarnetSyntheticTraffic.cc +++ b/src/cpu/testers/garnet_synthetic_traffic/GarnetSyntheticTraffic.cc @@ -28,6 +28,8 @@ * Authors: Tushar Krishna */ +#include "cpu/testers/garnet_synthetic_traffic/GarnetSyntheticTraffic.hh" + #include #include #include @@ -37,7 +39,6 @@ #include "base/misc.hh" #include "base/random.hh" #include "base/statistics.hh" -#include "cpu/testers/garnet_synthetic_traffic/GarnetSyntheticTraffic.hh" #include "debug/GarnetSyntheticTraffic.hh" #include "mem/mem_object.hh" #include "mem/packet.hh" diff --git a/src/cpu/testers/memtest/memtest.cc b/src/cpu/testers/memtest/memtest.cc --- a/src/cpu/testers/memtest/memtest.cc +++ b/src/cpu/testers/memtest/memtest.cc @@ -42,9 +42,10 @@ * Andreas Hansson */ +#include "cpu/testers/memtest/memtest.hh" + #include "base/random.hh" #include "base/statistics.hh" -#include "cpu/testers/memtest/memtest.hh" #include "debug/MemTest.hh" #include "mem/mem_object.hh" #include "sim/sim_exit.hh" diff --git a/src/cpu/testers/rubytest/Check.cc b/src/cpu/testers/rubytest/Check.cc --- a/src/cpu/testers/rubytest/Check.cc +++ b/src/cpu/testers/rubytest/Check.cc @@ -27,8 +27,9 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "cpu/testers/rubytest/Check.hh" + #include "base/random.hh" -#include "cpu/testers/rubytest/Check.hh" #include "debug/RubyTest.hh" #include "mem/ruby/common/SubBlock.hh" diff --git a/src/cpu/testers/rubytest/CheckTable.cc b/src/cpu/testers/rubytest/CheckTable.cc --- a/src/cpu/testers/rubytest/CheckTable.cc +++ b/src/cpu/testers/rubytest/CheckTable.cc @@ -27,10 +27,11 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "cpu/testers/rubytest/CheckTable.hh" + #include "base/intmath.hh" #include "base/random.hh" #include "cpu/testers/rubytest/Check.hh" -#include "cpu/testers/rubytest/CheckTable.hh" #include "debug/RubyTest.hh" CheckTable::CheckTable(int _num_writers, int _num_readers, RubyTester* _tester) diff --git a/src/cpu/testers/rubytest/RubyTester.cc b/src/cpu/testers/rubytest/RubyTester.cc --- a/src/cpu/testers/rubytest/RubyTester.cc +++ b/src/cpu/testers/rubytest/RubyTester.cc @@ -39,9 +39,10 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "cpu/testers/rubytest/RubyTester.hh" + #include "base/misc.hh" #include "cpu/testers/rubytest/Check.hh" -#include "cpu/testers/rubytest/RubyTester.hh" #include "debug/RubyTest.hh" #include "mem/ruby/common/SubBlock.hh" #include "sim/sim_exit.hh" diff --git a/src/cpu/testers/traffic_gen/generators.cc b/src/cpu/testers/traffic_gen/generators.cc --- a/src/cpu/testers/traffic_gen/generators.cc +++ b/src/cpu/testers/traffic_gen/generators.cc @@ -40,9 +40,10 @@ * Neha Agarwal */ +#include "cpu/testers/traffic_gen/generators.hh" + #include "base/random.hh" #include "base/trace.hh" -#include "cpu/testers/traffic_gen/generators.hh" #include "debug/TrafficGen.hh" #include "proto/packet.pb.h" diff --git a/src/cpu/thread_context.cc b/src/cpu/thread_context.cc --- a/src/cpu/thread_context.cc +++ b/src/cpu/thread_context.cc @@ -41,13 +41,14 @@ * Authors: Kevin Lim */ +#include "cpu/thread_context.hh" + #include "arch/kernel_stats.hh" #include "base/misc.hh" #include "base/trace.hh" #include "config/the_isa.hh" #include "cpu/base.hh" #include "cpu/quiesce_event.hh" -#include "cpu/thread_context.hh" #include "debug/Context.hh" #include "debug/Quiesce.hh" #include "params/BaseCPU.hh" diff --git a/src/cpu/thread_state.cc b/src/cpu/thread_state.cc --- a/src/cpu/thread_state.cc +++ b/src/cpu/thread_state.cc @@ -28,12 +28,13 @@ * Authors: Kevin Lim */ +#include "cpu/thread_state.hh" + #include "arch/kernel_stats.hh" #include "base/output.hh" #include "cpu/base.hh" #include "cpu/profile.hh" #include "cpu/quiesce_event.hh" -#include "cpu/thread_state.hh" #include "mem/fs_translating_port_proxy.hh" #include "mem/port.hh" #include "mem/port_proxy.hh" diff --git a/src/cpu/timing_expr.cc b/src/cpu/timing_expr.cc --- a/src/cpu/timing_expr.cc +++ b/src/cpu/timing_expr.cc @@ -37,8 +37,9 @@ * Authors: Andrew Bardsley */ +#include "cpu/timing_expr.hh" + #include "base/intmath.hh" -#include "cpu/timing_expr.hh" TimingExprEvalContext::TimingExprEvalContext(const StaticInstPtr &inst_, ThreadContext *thread_, diff --git a/src/dev/alpha/backdoor.cc b/src/dev/alpha/backdoor.cc --- a/src/dev/alpha/backdoor.cc +++ b/src/dev/alpha/backdoor.cc @@ -35,6 +35,8 @@ * Alpha Console Backdoor Definition */ +#include "dev/alpha/backdoor.hh" + #include #include @@ -45,7 +47,6 @@ #include "cpu/base.hh" #include "cpu/thread_context.hh" #include "debug/AlphaBackdoor.hh" -#include "dev/alpha/backdoor.hh" #include "dev/alpha/tsunami.hh" #include "dev/alpha/tsunami_cchip.hh" #include "dev/alpha/tsunami_io.hh" diff --git a/src/dev/alpha/tsunami.cc b/src/dev/alpha/tsunami.cc --- a/src/dev/alpha/tsunami.cc +++ b/src/dev/alpha/tsunami.cc @@ -32,6 +32,8 @@ * Implementation of Tsunami platform. */ +#include "dev/alpha/tsunami.hh" + #include #include #include @@ -39,7 +41,6 @@ #include "arch/alpha/system.hh" #include "config/the_isa.hh" #include "cpu/intr_control.hh" -#include "dev/alpha/tsunami.hh" #include "dev/alpha/tsunami_cchip.hh" #include "dev/alpha/tsunami_io.hh" #include "dev/alpha/tsunami_pchip.hh" diff --git a/src/dev/alpha/tsunami_cchip.cc b/src/dev/alpha/tsunami_cchip.cc --- a/src/dev/alpha/tsunami_cchip.cc +++ b/src/dev/alpha/tsunami_cchip.cc @@ -33,6 +33,8 @@ * Emulation of the Tsunami CChip CSRs */ +#include "dev/alpha/tsunami_cchip.hh" + #include #include #include @@ -45,7 +47,6 @@ #include "debug/IPI.hh" #include "debug/Tsunami.hh" #include "dev/alpha/tsunami.hh" -#include "dev/alpha/tsunami_cchip.hh" #include "dev/alpha/tsunamireg.h" #include "mem/packet.hh" #include "mem/packet_access.hh" diff --git a/src/dev/alpha/tsunami_io.cc b/src/dev/alpha/tsunami_io.cc --- a/src/dev/alpha/tsunami_io.cc +++ b/src/dev/alpha/tsunami_io.cc @@ -34,6 +34,8 @@ * Tsunami I/O including PIC, PIT, RTC, DMA */ +#include "dev/alpha/tsunami_io.hh" + #include #include @@ -46,7 +48,6 @@ #include "debug/Tsunami.hh" #include "dev/alpha/tsunami.hh" #include "dev/alpha/tsunami_cchip.hh" -#include "dev/alpha/tsunami_io.hh" #include "dev/alpha/tsunamireg.h" #include "dev/rtcreg.h" #include "mem/packet.hh" diff --git a/src/dev/arm/a9scu.cc b/src/dev/arm/a9scu.cc --- a/src/dev/arm/a9scu.cc +++ b/src/dev/arm/a9scu.cc @@ -37,9 +37,10 @@ * Authors: Ali Saidi */ +#include "dev/arm/a9scu.hh" + #include "base/intmath.hh" #include "base/trace.hh" -#include "dev/arm/a9scu.hh" #include "mem/packet.hh" #include "mem/packet_access.hh" #include "sim/system.hh" diff --git a/src/dev/arm/amba_device.cc b/src/dev/arm/amba_device.cc --- a/src/dev/arm/amba_device.cc +++ b/src/dev/arm/amba_device.cc @@ -40,9 +40,10 @@ * Authors: Ali Saidi */ +#include "dev/arm/amba_device.hh" + #include "base/trace.hh" #include "debug/AMBA.hh" -#include "dev/arm/amba_device.hh" #include "dev/arm/amba_fake.hh" #include "mem/packet.hh" #include "mem/packet_access.hh" diff --git a/src/dev/arm/amba_fake.cc b/src/dev/arm/amba_fake.cc --- a/src/dev/arm/amba_fake.cc +++ b/src/dev/arm/amba_fake.cc @@ -40,9 +40,10 @@ * Authors: Ali Saidi */ +#include "dev/arm/amba_fake.hh" + #include "base/trace.hh" #include "debug/AMBA.hh" -#include "dev/arm/amba_fake.hh" #include "mem/packet.hh" #include "mem/packet_access.hh" diff --git a/src/dev/arm/energy_ctrl.cc b/src/dev/arm/energy_ctrl.cc --- a/src/dev/arm/energy_ctrl.cc +++ b/src/dev/arm/energy_ctrl.cc @@ -39,8 +39,9 @@ * Stephan Diestelhorst */ +#include "dev/arm/energy_ctrl.hh" + #include "debug/EnergyCtrl.hh" -#include "dev/arm/energy_ctrl.hh" #include "mem/packet.hh" #include "mem/packet_access.hh" #include "params/EnergyCtrl.hh" diff --git a/src/dev/arm/gic_pl390.cc b/src/dev/arm/gic_pl390.cc --- a/src/dev/arm/gic_pl390.cc +++ b/src/dev/arm/gic_pl390.cc @@ -41,12 +41,13 @@ * Prakash Ramrakhyani */ +#include "dev/arm/gic_pl390.hh" + #include "base/trace.hh" #include "debug/Checkpoint.hh" #include "debug/GIC.hh" #include "debug/IPI.hh" #include "debug/Interrupt.hh" -#include "dev/arm/gic_pl390.hh" #include "dev/terminal.hh" #include "mem/packet.hh" #include "mem/packet_access.hh" diff --git a/src/dev/arm/hdlcd.cc b/src/dev/arm/hdlcd.cc --- a/src/dev/arm/hdlcd.cc +++ b/src/dev/arm/hdlcd.cc @@ -40,9 +40,9 @@ #include "dev/arm/hdlcd.hh" -#include "base/vnc/vncinput.hh" #include "base/output.hh" #include "base/trace.hh" +#include "base/vnc/vncinput.hh" #include "debug/Checkpoint.hh" #include "debug/HDLcd.hh" #include "dev/arm/amba_device.hh" diff --git a/src/dev/arm/kmi.cc b/src/dev/arm/kmi.cc --- a/src/dev/arm/kmi.cc +++ b/src/dev/arm/kmi.cc @@ -41,11 +41,12 @@ * William Wang */ +#include "dev/arm/kmi.hh" + +#include "base/trace.hh" #include "base/vnc/vncinput.hh" -#include "base/trace.hh" #include "debug/Pl050.hh" #include "dev/arm/amba_device.hh" -#include "dev/arm/kmi.hh" #include "dev/ps2.hh" #include "mem/packet.hh" #include "mem/packet_access.hh" diff --git a/src/dev/arm/pl011.cc b/src/dev/arm/pl011.cc --- a/src/dev/arm/pl011.cc +++ b/src/dev/arm/pl011.cc @@ -51,8 +51,8 @@ #include "dev/terminal.hh" #include "mem/packet.hh" #include "mem/packet_access.hh" +#include "params/Pl011.hh" #include "sim/sim_exit.hh" -#include "params/Pl011.hh" Pl011::Pl011(const Pl011Params *p) : Uart(p, 0xfff), diff --git a/src/dev/arm/pl111.cc b/src/dev/arm/pl111.cc --- a/src/dev/arm/pl111.cc +++ b/src/dev/arm/pl111.cc @@ -38,14 +38,15 @@ * Ali Saidi */ -#include "base/vnc/vncinput.hh" +#include "dev/arm/pl111.hh" + #include "base/output.hh" #include "base/trace.hh" +#include "base/vnc/vncinput.hh" #include "debug/PL111.hh" #include "debug/Uart.hh" #include "dev/arm/amba_device.hh" #include "dev/arm/base_gic.hh" -#include "dev/arm/pl111.hh" #include "mem/packet.hh" #include "mem/packet_access.hh" #include "sim/system.hh" diff --git a/src/dev/arm/realview.cc b/src/dev/arm/realview.cc --- a/src/dev/arm/realview.cc +++ b/src/dev/arm/realview.cc @@ -44,6 +44,8 @@ * Implementation of RealView platform. */ +#include "dev/arm/realview.hh" + #include #include #include @@ -51,7 +53,6 @@ #include "config/the_isa.hh" #include "cpu/intr_control.hh" #include "dev/arm/base_gic.hh" -#include "dev/arm/realview.hh" #include "dev/terminal.hh" #include "sim/system.hh" diff --git a/src/dev/arm/rtc_pl031.cc b/src/dev/arm/rtc_pl031.cc --- a/src/dev/arm/rtc_pl031.cc +++ b/src/dev/arm/rtc_pl031.cc @@ -37,13 +37,14 @@ * Authors: Ali Saidi */ +#include "dev/arm/rtc_pl031.hh" + #include "base/intmath.hh" #include "base/time.hh" #include "base/trace.hh" #include "debug/Checkpoint.hh" #include "debug/Timer.hh" #include "dev/arm/amba_device.hh" -#include "dev/arm/rtc_pl031.hh" #include "mem/packet.hh" #include "mem/packet_access.hh" diff --git a/src/dev/arm/timer_cpulocal.cc b/src/dev/arm/timer_cpulocal.cc --- a/src/dev/arm/timer_cpulocal.cc +++ b/src/dev/arm/timer_cpulocal.cc @@ -38,12 +38,13 @@ * Geoffrey Blake */ +#include "dev/arm/timer_cpulocal.hh" + #include "base/intmath.hh" #include "base/trace.hh" #include "debug/Checkpoint.hh" #include "debug/Timer.hh" #include "dev/arm/base_gic.hh" -#include "dev/arm/timer_cpulocal.hh" #include "mem/packet.hh" #include "mem/packet_access.hh" diff --git a/src/dev/arm/timer_sp804.cc b/src/dev/arm/timer_sp804.cc --- a/src/dev/arm/timer_sp804.cc +++ b/src/dev/arm/timer_sp804.cc @@ -37,12 +37,13 @@ * Authors: Ali Saidi */ +#include "dev/arm/timer_sp804.hh" + #include "base/intmath.hh" #include "base/trace.hh" #include "debug/Checkpoint.hh" #include "debug/Timer.hh" #include "dev/arm/base_gic.hh" -#include "dev/arm/timer_sp804.hh" #include "mem/packet.hh" #include "mem/packet_access.hh" diff --git a/src/dev/arm/vgic.cc b/src/dev/arm/vgic.cc --- a/src/dev/arm/vgic.cc +++ b/src/dev/arm/vgic.cc @@ -37,11 +37,12 @@ * Authors: Matt Evans */ +#include "dev/arm/vgic.hh" + #include "base/trace.hh" #include "debug/Checkpoint.hh" #include "debug/VGIC.hh" #include "dev/arm/base_gic.hh" -#include "dev/arm/vgic.hh" #include "dev/terminal.hh" #include "mem/packet.hh" #include "mem/packet_access.hh" diff --git a/src/dev/baddev.cc b/src/dev/baddev.cc --- a/src/dev/baddev.cc +++ b/src/dev/baddev.cc @@ -32,10 +32,11 @@ * BadDevice implemenation */ +#include "dev/baddev.hh" + #include #include "base/trace.hh" -#include "dev/baddev.hh" #include "params/BadDevice.hh" #include "sim/system.hh" diff --git a/src/dev/intel_8254_timer.cc b/src/dev/intel_8254_timer.cc --- a/src/dev/intel_8254_timer.cc +++ b/src/dev/intel_8254_timer.cc @@ -30,9 +30,10 @@ * Miguel J. Serrano */ +#include "dev/intel_8254_timer.hh" + #include "base/misc.hh" #include "debug/Intel8254Timer.hh" -#include "dev/intel_8254_timer.hh" using namespace std; diff --git a/src/dev/io_device.cc b/src/dev/io_device.cc --- a/src/dev/io_device.cc +++ b/src/dev/io_device.cc @@ -41,9 +41,10 @@ * Nathan Binkert */ +#include "dev/io_device.hh" + #include "base/trace.hh" #include "debug/AddrRanges.hh" -#include "dev/io_device.hh" #include "sim/system.hh" PioPort::PioPort(PioDevice *dev) diff --git a/src/dev/isa_fake.cc b/src/dev/isa_fake.cc --- a/src/dev/isa_fake.cc +++ b/src/dev/isa_fake.cc @@ -32,9 +32,10 @@ * Isa Fake Device implementation */ +#include "dev/isa_fake.hh" + #include "base/trace.hh" #include "debug/IsaFake.hh" -#include "dev/isa_fake.hh" #include "mem/packet.hh" #include "mem/packet_access.hh" #include "sim/system.hh" diff --git a/src/dev/mc146818.cc b/src/dev/mc146818.cc --- a/src/dev/mc146818.cc +++ b/src/dev/mc146818.cc @@ -30,6 +30,8 @@ * Miguel Serrano */ +#include "dev/mc146818.hh" + #include #include @@ -39,7 +41,6 @@ #include "base/time.hh" #include "base/trace.hh" #include "debug/MC146818.hh" -#include "dev/mc146818.hh" #include "dev/rtcreg.h" using namespace std; diff --git a/src/dev/mips/malta.cc b/src/dev/mips/malta.cc --- a/src/dev/mips/malta.cc +++ b/src/dev/mips/malta.cc @@ -33,6 +33,8 @@ * Implementation of Malta platform. */ +#include "dev/mips/malta.hh" + #include #include #include @@ -40,7 +42,6 @@ #include "config/the_isa.hh" #include "cpu/intr_control.hh" #include "debug/Malta.hh" -#include "dev/mips/malta.hh" #include "dev/mips/malta_cchip.hh" #include "dev/mips/malta_io.hh" #include "dev/terminal.hh" diff --git a/src/dev/mips/malta_cchip.cc b/src/dev/mips/malta_cchip.cc --- a/src/dev/mips/malta_cchip.cc +++ b/src/dev/mips/malta_cchip.cc @@ -33,6 +33,8 @@ * Emulation of the Malta CChip CSRs */ +#include "dev/mips/malta_cchip.hh" + #include #include #include @@ -43,7 +45,6 @@ #include "cpu/thread_context.hh" #include "debug/Malta.hh" #include "dev/mips/malta.hh" -#include "dev/mips/malta_cchip.hh" #include "dev/mips/maltareg.h" #include "mem/packet.hh" #include "mem/packet_access.hh" diff --git a/src/dev/mips/malta_io.cc b/src/dev/mips/malta_io.cc --- a/src/dev/mips/malta_io.cc +++ b/src/dev/mips/malta_io.cc @@ -34,6 +34,8 @@ * Malta I/O including PIC, PIT, RTC, DMA */ +#include "dev/mips/malta_io.hh" + #include #include @@ -46,7 +48,6 @@ #include "debug/Malta.hh" #include "dev/mips/malta.hh" #include "dev/mips/malta_cchip.hh" -#include "dev/mips/malta_io.hh" #include "dev/mips/maltareg.h" #include "dev/rtcreg.h" #include "mem/packet.hh" diff --git a/src/dev/pci/device.cc b/src/dev/pci/device.cc --- a/src/dev/pci/device.cc +++ b/src/dev/pci/device.cc @@ -63,7 +63,6 @@ #include "sim/byteswap.hh" #include "sim/core.hh" - PciDevice::PciDevice(const PciDeviceParams *p) : DmaDevice(p), _busAddr(p->pci_bus, p->pci_dev, p->pci_func), diff --git a/src/dev/pci/host.cc b/src/dev/pci/host.cc --- a/src/dev/pci/host.cc +++ b/src/dev/pci/host.cc @@ -47,7 +47,6 @@ #include "params/GenericPciHost.hh" #include "params/PciHost.hh" - PciHost::PciHost(const PciHostParams *p) : PioDevice(p) { diff --git a/src/dev/platform.cc b/src/dev/platform.cc --- a/src/dev/platform.cc +++ b/src/dev/platform.cc @@ -29,9 +29,10 @@ * Nathan Binkert */ +#include "dev/platform.hh" + #include "base/misc.hh" #include "config/the_isa.hh" -#include "dev/platform.hh" #include "sim/sim_exit.hh" using namespace std; diff --git a/src/dev/ps2.hh b/src/dev/ps2.hh --- a/src/dev/ps2.hh +++ b/src/dev/ps2.hh @@ -41,6 +41,7 @@ #define __DEV_PS2_HH__ #include +#include #include "base/bitunion.hh" diff --git a/src/dev/ps2.cc b/src/dev/ps2.cc --- a/src/dev/ps2.cc +++ b/src/dev/ps2.cc @@ -37,10 +37,11 @@ * Authors: Ali Saidi */ +#include "dev/ps2.hh" + #include #include "base/misc.hh" -#include "dev/ps2.hh" #include "x11keysym/keysym.h" namespace Ps2 { diff --git a/src/dev/sparc/dtod.cc b/src/dev/sparc/dtod.cc --- a/src/dev/sparc/dtod.cc +++ b/src/dev/sparc/dtod.cc @@ -31,6 +31,8 @@ /** @file * Time of date device implementation */ +#include "dev/sparc/dtod.hh" + #include #include @@ -40,7 +42,6 @@ #include "base/time.hh" #include "base/trace.hh" #include "config/the_isa.hh" -#include "dev/sparc/dtod.hh" #include "dev/platform.hh" #include "mem/packet_access.hh" #include "mem/port.hh" diff --git a/src/dev/sparc/iob.cc b/src/dev/sparc/iob.cc --- a/src/dev/sparc/iob.cc +++ b/src/dev/sparc/iob.cc @@ -35,6 +35,8 @@ * well as facilities to send IPIs to other cpus. */ +#include "dev/sparc/iob.hh" + #include #include "arch/sparc/faults.hh" @@ -44,7 +46,6 @@ #include "cpu/intr_control.hh" #include "cpu/thread_context.hh" #include "debug/Iob.hh" -#include "dev/sparc/iob.hh" #include "dev/platform.hh" #include "mem/packet_access.hh" #include "mem/port.hh" diff --git a/src/dev/sparc/mm_disk.cc b/src/dev/sparc/mm_disk.cc --- a/src/dev/sparc/mm_disk.cc +++ b/src/dev/sparc/mm_disk.cc @@ -33,11 +33,12 @@ * in legion. Any access is translated to an offset in the disk image. */ +#include "dev/sparc/mm_disk.hh" + #include #include "base/trace.hh" #include "debug/IdeDisk.hh" -#include "dev/sparc/mm_disk.hh" #include "dev/platform.hh" #include "mem/packet_access.hh" #include "mem/port.hh" diff --git a/src/dev/sparc/t1000.cc b/src/dev/sparc/t1000.cc --- a/src/dev/sparc/t1000.cc +++ b/src/dev/sparc/t1000.cc @@ -32,13 +32,14 @@ * Implementation of T1000 platform. */ +#include "dev/sparc/t1000.hh" + #include #include #include #include "config/the_isa.hh" #include "cpu/intr_control.hh" -#include "dev/sparc/t1000.hh" #include "dev/terminal.hh" #include "sim/system.hh" diff --git a/src/dev/uart.cc b/src/dev/uart.cc --- a/src/dev/uart.cc +++ b/src/dev/uart.cc @@ -32,9 +32,10 @@ * Implements a base class for UARTs */ +#include "dev/uart.hh" + #include "dev/platform.hh" #include "dev/terminal.hh" -#include "dev/uart.hh" using namespace std; diff --git a/src/dev/uart8250.cc b/src/dev/uart8250.cc --- a/src/dev/uart8250.cc +++ b/src/dev/uart8250.cc @@ -32,6 +32,8 @@ * Implements a 8250 UART */ +#include "dev/uart8250.hh" + #include #include @@ -41,7 +43,6 @@ #include "debug/Uart.hh" #include "dev/platform.hh" #include "dev/terminal.hh" -#include "dev/uart8250.hh" #include "mem/packet.hh" #include "mem/packet_access.hh" diff --git a/src/dev/virtio/base.cc b/src/dev/virtio/base.cc --- a/src/dev/virtio/base.cc +++ b/src/dev/virtio/base.cc @@ -37,8 +37,9 @@ * Authors: Andreas Sandberg */ +#include "dev/virtio/base.hh" + #include "debug/VIO.hh" -#include "dev/virtio/base.hh" #include "params/VirtIODeviceBase.hh" VirtDescriptor::VirtDescriptor(PortProxy &_memProxy, VirtQueue &_queue, diff --git a/src/dev/virtio/block.cc b/src/dev/virtio/block.cc --- a/src/dev/virtio/block.cc +++ b/src/dev/virtio/block.cc @@ -37,8 +37,9 @@ * Authors: Andreas Sandberg */ +#include "dev/virtio/block.hh" + #include "debug/VIOBlock.hh" -#include "dev/virtio/block.hh" #include "params/VirtIOBlock.hh" #include "sim/system.hh" diff --git a/src/dev/virtio/console.cc b/src/dev/virtio/console.cc --- a/src/dev/virtio/console.cc +++ b/src/dev/virtio/console.cc @@ -37,12 +37,12 @@ * Authors: Andreas Sandberg */ +#include "dev/virtio/console.hh" + #include "debug/VIOConsole.hh" -#include "dev/virtio/console.hh" #include "params/VirtIOConsole.hh" #include "sim/system.hh" - VirtIOConsole::VirtIOConsole(Params *params) : VirtIODeviceBase(params, ID_CONSOLE, sizeof(Config), F_SIZE), qRecv(params->system->physProxy, params->qRecvSize, *this), diff --git a/src/dev/virtio/fs9p.cc b/src/dev/virtio/fs9p.cc --- a/src/dev/virtio/fs9p.cc +++ b/src/dev/virtio/fs9p.cc @@ -37,16 +37,17 @@ * Authors: Andreas Sandberg */ +#include "dev/virtio/fs9p.hh" + +#include +#include #include #include #include -#include -#include #include #include "debug/VIO9P.hh" #include "debug/VIO9PData.hh" -#include "dev/virtio/fs9p.hh" #include "params/VirtIO9PBase.hh" #include "params/VirtIO9PDiod.hh" #include "params/VirtIO9PProxy.hh" diff --git a/src/dev/virtio/pci.cc b/src/dev/virtio/pci.cc --- a/src/dev/virtio/pci.cc +++ b/src/dev/virtio/pci.cc @@ -37,8 +37,9 @@ * Authors: Andreas Sandberg */ +#include "dev/virtio/pci.hh" + #include "debug/VIOPci.hh" -#include "dev/virtio/pci.hh" #include "mem/packet_access.hh" #include "params/PciVirtIO.hh" diff --git a/src/dev/x86/cmos.cc b/src/dev/x86/cmos.cc --- a/src/dev/x86/cmos.cc +++ b/src/dev/x86/cmos.cc @@ -28,8 +28,9 @@ * Authors: Gabe Black */ +#include "dev/x86/cmos.hh" + #include "debug/CMOS.hh" -#include "dev/x86/cmos.hh" #include "dev/x86/intdev.hh" #include "mem/packet_access.hh" diff --git a/src/dev/x86/i8042.cc b/src/dev/x86/i8042.cc --- a/src/dev/x86/i8042.cc +++ b/src/dev/x86/i8042.cc @@ -28,9 +28,10 @@ * Authors: Gabe Black */ +#include "dev/x86/i8042.hh" + #include "base/bitunion.hh" #include "debug/I8042.hh" -#include "dev/x86/i8042.hh" #include "mem/packet.hh" #include "mem/packet_access.hh" diff --git a/src/dev/x86/i82094aa.cc b/src/dev/x86/i82094aa.cc --- a/src/dev/x86/i82094aa.cc +++ b/src/dev/x86/i82094aa.cc @@ -28,11 +28,12 @@ * Authors: Gabe Black */ +#include "dev/x86/i82094aa.hh" + #include "arch/x86/interrupts.hh" #include "arch/x86/intmessage.hh" #include "cpu/base.hh" #include "debug/I82094AA.hh" -#include "dev/x86/i82094aa.hh" #include "dev/x86/i8259.hh" #include "mem/packet.hh" #include "mem/packet_access.hh" diff --git a/src/dev/x86/i8237.cc b/src/dev/x86/i8237.cc --- a/src/dev/x86/i8237.cc +++ b/src/dev/x86/i8237.cc @@ -29,6 +29,7 @@ */ #include "dev/x86/i8237.hh" + #include "mem/packet.hh" #include "mem/packet_access.hh" diff --git a/src/dev/x86/i8254.cc b/src/dev/x86/i8254.cc --- a/src/dev/x86/i8254.cc +++ b/src/dev/x86/i8254.cc @@ -28,8 +28,9 @@ * Authors: Gabe Black */ +#include "dev/x86/i8254.hh" + #include "debug/I8254.hh" -#include "dev/x86/i8254.hh" #include "dev/x86/intdev.hh" #include "mem/packet.hh" #include "mem/packet_access.hh" diff --git a/src/dev/x86/i8259.cc b/src/dev/x86/i8259.cc --- a/src/dev/x86/i8259.cc +++ b/src/dev/x86/i8259.cc @@ -28,10 +28,11 @@ * Authors: Gabe Black */ +#include "dev/x86/i8259.hh" + #include "base/bitfield.hh" #include "debug/I8259.hh" #include "dev/x86/i82094aa.hh" -#include "dev/x86/i8259.hh" #include "mem/packet.hh" #include "mem/packet_access.hh" diff --git a/src/dev/x86/pc.cc b/src/dev/x86/pc.cc --- a/src/dev/x86/pc.cc +++ b/src/dev/x86/pc.cc @@ -32,6 +32,8 @@ * Implementation of PC platform. */ +#include "dev/x86/pc.hh" + #include #include #include @@ -40,12 +42,11 @@ #include "arch/x86/x86_traits.hh" #include "config/the_isa.hh" #include "cpu/intr_control.hh" +#include "dev/terminal.hh" #include "dev/x86/i82094aa.hh" #include "dev/x86/i8254.hh" #include "dev/x86/i8259.hh" -#include "dev/x86/pc.hh" #include "dev/x86/south_bridge.hh" -#include "dev/terminal.hh" #include "sim/system.hh" using namespace std; diff --git a/src/dev/x86/south_bridge.cc b/src/dev/x86/south_bridge.cc --- a/src/dev/x86/south_bridge.cc +++ b/src/dev/x86/south_bridge.cc @@ -28,10 +28,11 @@ * Authors: Gabe Black */ +#include "dev/x86/south_bridge.hh" + #include #include "dev/x86/pc.hh" -#include "dev/x86/south_bridge.hh" using namespace X86ISA; diff --git a/src/dev/x86/speaker.cc b/src/dev/x86/speaker.cc --- a/src/dev/x86/speaker.cc +++ b/src/dev/x86/speaker.cc @@ -28,11 +28,12 @@ * Authors: Gabe Black */ +#include "dev/x86/speaker.hh" + #include "base/bitunion.hh" #include "base/trace.hh" #include "debug/PcSpeaker.hh" #include "dev/x86/i8254.hh" -#include "dev/x86/speaker.hh" #include "mem/packet.hh" #include "mem/packet_access.hh" diff --git a/src/kern/kernel_stats.cc b/src/kern/kernel_stats.cc --- a/src/kern/kernel_stats.cc +++ b/src/kern/kernel_stats.cc @@ -29,13 +29,16 @@ * Nathan Binkert */ +#include "kern/kernel_stats.hh" + #include #include "base/trace.hh" #include "cpu/thread_context.hh" -#include "kern/kernel_stats.hh" + #if THE_ISA == ALPHA_ISA #include "kern/tru64/tru64_syscalls.hh" + #endif #include "sim/system.hh" diff --git a/src/kern/linux/linux.cc b/src/kern/linux/linux.cc --- a/src/kern/linux/linux.cc +++ b/src/kern/linux/linux.cc @@ -28,12 +28,13 @@ * Authors: Ali Saidi */ +#include "kern/linux/linux.hh" + #include #include #include "cpu/thread_context.hh" #include "debug/SyscallVerbose.hh" -#include "kern/linux/linux.hh" #include "sim/process.hh" #include "sim/system.hh" diff --git a/src/kern/linux/printk.cc b/src/kern/linux/printk.cc --- a/src/kern/linux/printk.cc +++ b/src/kern/linux/printk.cc @@ -29,13 +29,14 @@ * Ali Saidi */ +#include "kern/linux/printk.hh" + #include #include #include "base/trace.hh" #include "cpu/thread_context.hh" -#include "kern/linux/printk.hh" #include "sim/arguments.hh" using namespace std; diff --git a/src/kern/operatingsystem.cc b/src/kern/operatingsystem.cc --- a/src/kern/operatingsystem.cc +++ b/src/kern/operatingsystem.cc @@ -29,8 +29,9 @@ */ +#include "kern/operatingsystem.hh" + #include "base/misc.hh" -#include "kern/operatingsystem.hh" int OperatingSystem::openSpecialFile(std::string path, LiveProcess *process, diff --git a/src/kern/system_events.cc b/src/kern/system_events.cc --- a/src/kern/system_events.cc +++ b/src/kern/system_events.cc @@ -29,13 +29,14 @@ * Nathan Binkert */ +#include "kern/system_events.hh" + #include "arch/isa_traits.hh" #include "arch/utility.hh" #include "base/trace.hh" #include "config/the_isa.hh" #include "cpu/thread_context.hh" #include "debug/PCEvent.hh" -#include "kern/system_events.hh" using namespace TheISA; diff --git a/src/kern/tru64/dump_mbuf.cc b/src/kern/tru64/dump_mbuf.cc --- a/src/kern/tru64/dump_mbuf.cc +++ b/src/kern/tru64/dump_mbuf.cc @@ -28,19 +28,20 @@ * Authors: Nathan Binkert */ +#include "kern/tru64/dump_mbuf.hh" + #include #include #include "arch/isa_traits.hh" #include "arch/vtophys.hh" +#include "base/cprintf.hh" #include "base/loader/symtab.hh" -#include "base/cprintf.hh" #include "base/trace.hh" #include "base/types.hh" #include "config/the_isa.hh" #include "cpu/thread_context.hh" -#include "kern/tru64/dump_mbuf.hh" #include "kern/tru64/mbuf.hh" #include "sim/arguments.hh" #include "sim/system.hh" diff --git a/src/kern/tru64/printf.cc b/src/kern/tru64/printf.cc --- a/src/kern/tru64/printf.cc +++ b/src/kern/tru64/printf.cc @@ -28,6 +28,8 @@ * Authors: Nathan Binkert */ +#include "kern/tru64/printf.hh" + #include #include @@ -36,7 +38,6 @@ #include "base/cprintf.hh" #include "base/trace.hh" #include "base/types.hh" -#include "kern/tru64/printf.hh" #include "sim/arguments.hh" using namespace std; diff --git a/src/kern/tru64/tru64_events.cc b/src/kern/tru64/tru64_events.cc --- a/src/kern/tru64/tru64_events.cc +++ b/src/kern/tru64/tru64_events.cc @@ -29,6 +29,8 @@ * Lisa Hsu */ +#include "kern/tru64/tru64_events.hh" + #include "arch/alpha/ev5.hh" #include "arch/isa_traits.hh" #include "config/the_isa.hh" @@ -37,10 +39,9 @@ #include "debug/BADADDR.hh" #include "debug/DebugPrintf.hh" #include "debug/Printf.hh" +#include "kern/system_events.hh" #include "kern/tru64/dump_mbuf.hh" #include "kern/tru64/printf.hh" -#include "kern/tru64/tru64_events.hh" -#include "kern/system_events.hh" #include "sim/arguments.hh" #include "sim/system.hh" diff --git a/src/mem/abstract_mem.cc b/src/mem/abstract_mem.cc --- a/src/mem/abstract_mem.cc +++ b/src/mem/abstract_mem.cc @@ -42,13 +42,14 @@ * Andreas Hansson */ +#include "mem/abstract_mem.hh" + #include #include "cpu/base.hh" #include "cpu/thread_context.hh" #include "debug/LLSC.hh" #include "debug/MemoryAccess.hh" -#include "mem/abstract_mem.hh" #include "mem/packet_access.hh" #include "sim/system.hh" diff --git a/src/mem/bridge.cc b/src/mem/bridge.cc --- a/src/mem/bridge.cc +++ b/src/mem/bridge.cc @@ -48,9 +48,10 @@ * and a slave through a request and response queue. */ +#include "mem/bridge.hh" + #include "base/trace.hh" #include "debug/Bridge.hh" -#include "mem/bridge.hh" #include "params/Bridge.hh" Bridge::BridgeSlavePort::BridgeSlavePort(const std::string& _name, diff --git a/src/mem/cache/prefetch/base.cc b/src/mem/cache/prefetch/base.cc --- a/src/mem/cache/prefetch/base.cc +++ b/src/mem/cache/prefetch/base.cc @@ -46,10 +46,11 @@ * Hardware Prefetcher Definition. */ +#include "mem/cache/prefetch/base.hh" + #include #include "base/intmath.hh" -#include "mem/cache/prefetch/base.hh" #include "mem/cache/base.hh" #include "sim/system.hh" diff --git a/src/mem/cache/prefetch/queued.cc b/src/mem/cache/prefetch/queued.cc --- a/src/mem/cache/prefetch/queued.cc +++ b/src/mem/cache/prefetch/queued.cc @@ -37,8 +37,9 @@ * Authors: Mitch Hayenga */ +#include "mem/cache/prefetch/queued.hh" + #include "debug/HWPrefetch.hh" -#include "mem/cache/prefetch/queued.hh" #include "mem/cache/base.hh" QueuedPrefetcher::QueuedPrefetcher(const QueuedPrefetcherParams *p) diff --git a/src/mem/cache/prefetch/stride.cc b/src/mem/cache/prefetch/stride.cc --- a/src/mem/cache/prefetch/stride.cc +++ b/src/mem/cache/prefetch/stride.cc @@ -46,9 +46,10 @@ * Stride Prefetcher template instantiations. */ +#include "mem/cache/prefetch/stride.hh" + #include "base/random.hh" #include "debug/HWPrefetch.hh" -#include "mem/cache/prefetch/stride.hh" StridePrefetcher::StridePrefetcher(const StridePrefetcherParams *p) : QueuedPrefetcher(p), diff --git a/src/mem/coherent_xbar.cc b/src/mem/coherent_xbar.cc --- a/src/mem/coherent_xbar.cc +++ b/src/mem/coherent_xbar.cc @@ -47,11 +47,12 @@ * Definition of a crossbar object. */ +#include "mem/coherent_xbar.hh" + #include "base/misc.hh" #include "base/trace.hh" #include "debug/AddrRanges.hh" #include "debug/CoherentXBar.hh" -#include "mem/coherent_xbar.hh" #include "sim/system.hh" CoherentXBar::CoherentXBar(const CoherentXBarParams *p) diff --git a/src/mem/comm_monitor.cc b/src/mem/comm_monitor.cc --- a/src/mem/comm_monitor.cc +++ b/src/mem/comm_monitor.cc @@ -38,9 +38,10 @@ * Andreas Hansson */ +#include "mem/comm_monitor.hh" + #include "base/trace.hh" #include "debug/CommMonitor.hh" -#include "mem/comm_monitor.hh" #include "sim/stats.hh" CommMonitor::CommMonitor(Params* params) diff --git a/src/mem/dram_ctrl.cc b/src/mem/dram_ctrl.cc --- a/src/mem/dram_ctrl.cc +++ b/src/mem/dram_ctrl.cc @@ -44,13 +44,14 @@ * Wendy Elsasser */ +#include "mem/dram_ctrl.hh" + #include "base/bitfield.hh" #include "base/trace.hh" #include "debug/DRAM.hh" #include "debug/DRAMPower.hh" #include "debug/DRAMState.hh" #include "debug/Drain.hh" -#include "mem/dram_ctrl.hh" #include "sim/system.hh" using namespace std; diff --git a/src/mem/drampower.cc b/src/mem/drampower.cc --- a/src/mem/drampower.cc +++ b/src/mem/drampower.cc @@ -37,8 +37,9 @@ * Authors: Omar Naji */ +#include "mem/drampower.hh" + #include "base/intmath.hh" -#include "mem/drampower.hh" #include "sim/core.hh" using namespace Data; diff --git a/src/mem/dramsim2.cc b/src/mem/dramsim2.cc --- a/src/mem/dramsim2.cc +++ b/src/mem/dramsim2.cc @@ -37,12 +37,13 @@ * Authors: Andreas Hansson */ +#include "mem/dramsim2.hh" + #include "DRAMSim2/Callback.h" #include "base/callback.hh" #include "base/trace.hh" #include "debug/DRAMSim2.hh" #include "debug/Drain.hh" -#include "mem/dramsim2.hh" #include "sim/system.hh" DRAMSim2::DRAMSim2(const Params* p) : diff --git a/src/mem/dramsim2_wrapper.cc b/src/mem/dramsim2_wrapper.cc --- a/src/mem/dramsim2_wrapper.cc +++ b/src/mem/dramsim2_wrapper.cc @@ -48,12 +48,13 @@ #undef DEBUG #endif +#include "mem/dramsim2_wrapper.hh" + #include #include "DRAMSim2/MultiChannelMemorySystem.h" #include "base/compiler.hh" #include "base/misc.hh" -#include "mem/dramsim2_wrapper.hh" /** * DRAMSim2 requires SHOW_SIM_OUTPUT to be defined (declared extern in diff --git a/src/mem/external_master.cc b/src/mem/external_master.cc --- a/src/mem/external_master.cc +++ b/src/mem/external_master.cc @@ -38,11 +38,12 @@ * Curtis Dunham */ +#include "mem/external_master.hh" + #include #include #include "debug/ExternalPort.hh" -#include "mem/external_master.hh" std::map ExternalMaster::portHandlers; diff --git a/src/mem/external_slave.cc b/src/mem/external_slave.cc --- a/src/mem/external_slave.cc +++ b/src/mem/external_slave.cc @@ -37,11 +37,12 @@ * Authors: Andrew Bardsley */ +#include "mem/external_slave.hh" + #include #include #include "debug/ExternalPort.hh" -#include "mem/external_slave.hh" /** Implement a `stub' port which just responds to requests by printing * a message. The stub port can be used to configure and test a system diff --git a/src/mem/fs_translating_port_proxy.cc b/src/mem/fs_translating_port_proxy.cc --- a/src/mem/fs_translating_port_proxy.cc +++ b/src/mem/fs_translating_port_proxy.cc @@ -46,11 +46,12 @@ * Port object definitions. */ +#include "mem/fs_translating_port_proxy.hh" + #include "arch/vtophys.hh" #include "base/chunk_generator.hh" #include "cpu/base.hh" #include "cpu/thread_context.hh" -#include "mem/fs_translating_port_proxy.hh" #include "sim/system.hh" using namespace TheISA; diff --git a/src/mem/hmc_controller.cc b/src/mem/hmc_controller.cc --- a/src/mem/hmc_controller.cc +++ b/src/mem/hmc_controller.cc @@ -1,6 +1,7 @@ +#include "mem/hmc_controller.hh" + #include "base/random.hh" #include "debug/HMCController.hh" -#include "mem/hmc_controller.hh" HMCController::HMCController(const HMCControllerParams* p) : NoncoherentXBar(p), diff --git a/src/mem/mem_checker.cc b/src/mem/mem_checker.cc --- a/src/mem/mem_checker.cc +++ b/src/mem/mem_checker.cc @@ -38,10 +38,10 @@ * Marco Elver */ +#include "mem/mem_checker.hh" + #include -#include "mem/mem_checker.hh" - void MemChecker::WriteCluster::startWrite(MemChecker::Serial serial, Tick _start, uint8_t data) diff --git a/src/mem/mem_checker_monitor.cc b/src/mem/mem_checker_monitor.cc --- a/src/mem/mem_checker_monitor.cc +++ b/src/mem/mem_checker_monitor.cc @@ -39,12 +39,13 @@ * Marco Elver */ +#include "mem/mem_checker_monitor.hh" + #include #include "base/output.hh" #include "base/trace.hh" #include "debug/MemCheckerMonitor.hh" -#include "mem/mem_checker_monitor.hh" using namespace std; diff --git a/src/mem/noncoherent_xbar.cc b/src/mem/noncoherent_xbar.cc --- a/src/mem/noncoherent_xbar.cc +++ b/src/mem/noncoherent_xbar.cc @@ -47,11 +47,12 @@ * Definition of a non-coherent crossbar object. */ +#include "mem/noncoherent_xbar.hh" + #include "base/misc.hh" #include "base/trace.hh" #include "debug/NoncoherentXBar.hh" #include "debug/XBar.hh" -#include "mem/noncoherent_xbar.hh" NoncoherentXBar::NoncoherentXBar(const NoncoherentXBarParams *p) : BaseXBar(p) diff --git a/src/mem/packet.cc b/src/mem/packet.cc --- a/src/mem/packet.cc +++ b/src/mem/packet.cc @@ -48,13 +48,14 @@ * between a single level of the memory heirarchy (ie L1->L2). */ +#include "mem/packet.hh" + #include #include #include "base/cprintf.hh" #include "base/misc.hh" #include "base/trace.hh" -#include "mem/packet.hh" using namespace std; diff --git a/src/mem/packet_queue.cc b/src/mem/packet_queue.cc --- a/src/mem/packet_queue.cc +++ b/src/mem/packet_queue.cc @@ -41,10 +41,11 @@ * Andreas Hansson */ +#include "mem/packet_queue.hh" + #include "base/trace.hh" #include "debug/Drain.hh" #include "debug/PacketQueue.hh" -#include "mem/packet_queue.hh" using namespace std; diff --git a/src/mem/page_table.cc b/src/mem/page_table.cc --- a/src/mem/page_table.cc +++ b/src/mem/page_table.cc @@ -35,6 +35,8 @@ * @file * Definitions of functional page table. */ +#include "mem/page_table.hh" + #include #include #include @@ -45,7 +47,6 @@ #include "base/trace.hh" #include "config/the_isa.hh" #include "debug/MMU.hh" -#include "mem/page_table.hh" #include "sim/faults.hh" #include "sim/sim_object.hh" diff --git a/src/mem/physical.cc b/src/mem/physical.cc --- a/src/mem/physical.cc +++ b/src/mem/physical.cc @@ -37,10 +37,12 @@ * Authors: Andreas Hansson */ +#include "mem/physical.hh" + +#include #include #include #include -#include #include #include @@ -54,7 +56,6 @@ #include "debug/AddrRanges.hh" #include "debug/Checkpoint.hh" #include "mem/abstract_mem.hh" -#include "mem/physical.hh" /** * On Linux, MAP_NORESERVE allow us to simulate a very large memory diff --git a/src/mem/port.cc b/src/mem/port.cc --- a/src/mem/port.cc +++ b/src/mem/port.cc @@ -46,9 +46,10 @@ * @file * Port object definitions. */ +#include "mem/port.hh" + #include "base/trace.hh" #include "mem/mem_object.hh" -#include "mem/port.hh" Port::Port(const std::string &_name, MemObject& _owner, PortID _id) : portName(_name), id(_id), owner(_owner) diff --git a/src/mem/port_proxy.cc b/src/mem/port_proxy.cc --- a/src/mem/port_proxy.cc +++ b/src/mem/port_proxy.cc @@ -37,8 +37,9 @@ * Authors: Andreas Hansson */ +#include "mem/port_proxy.hh" + #include "base/chunk_generator.hh" -#include "mem/port_proxy.hh" void PortProxy::readBlob(Addr addr, uint8_t *p, int size) const diff --git a/src/mem/probes/base.cc b/src/mem/probes/base.cc --- a/src/mem/probes/base.cc +++ b/src/mem/probes/base.cc @@ -41,7 +41,6 @@ #include "params/BaseMemProbe.hh" - BaseMemProbe::BaseMemProbe(BaseMemProbeParams *p) : SimObject(p) { diff --git a/src/mem/ruby/common/Histogram.cc b/src/mem/ruby/common/Histogram.cc --- a/src/mem/ruby/common/Histogram.cc +++ b/src/mem/ruby/common/Histogram.cc @@ -26,11 +26,12 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "mem/ruby/common/Histogram.hh" + #include #include #include "base/intmath.hh" -#include "mem/ruby/common/Histogram.hh" using namespace std; diff --git a/src/mem/ruby/common/NetDest.cc b/src/mem/ruby/common/NetDest.cc --- a/src/mem/ruby/common/NetDest.cc +++ b/src/mem/ruby/common/NetDest.cc @@ -26,10 +26,10 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "mem/ruby/common/NetDest.hh" + #include -#include "mem/ruby/common/NetDest.hh" - NetDest::NetDest() { resize(); diff --git a/src/mem/ruby/common/SubBlock.cc b/src/mem/ruby/common/SubBlock.cc --- a/src/mem/ruby/common/SubBlock.cc +++ b/src/mem/ruby/common/SubBlock.cc @@ -26,8 +26,9 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "mem/ruby/common/SubBlock.hh" + #include "base/stl_helpers.hh" -#include "mem/ruby/common/SubBlock.hh" using m5::stl_helpers::operator<<; diff --git a/src/mem/ruby/filters/BlockBloomFilter.cc b/src/mem/ruby/filters/BlockBloomFilter.cc --- a/src/mem/ruby/filters/BlockBloomFilter.cc +++ b/src/mem/ruby/filters/BlockBloomFilter.cc @@ -26,9 +26,10 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "mem/ruby/filters/BlockBloomFilter.hh" + #include "base/intmath.hh" #include "base/str.hh" -#include "mem/ruby/filters/BlockBloomFilter.hh" #include "mem/ruby/system/RubySystem.hh" using namespace std; diff --git a/src/mem/ruby/filters/BulkBloomFilter.cc b/src/mem/ruby/filters/BulkBloomFilter.cc --- a/src/mem/ruby/filters/BulkBloomFilter.cc +++ b/src/mem/ruby/filters/BulkBloomFilter.cc @@ -26,11 +26,12 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "mem/ruby/filters/BulkBloomFilter.hh" + #include #include "base/intmath.hh" #include "base/str.hh" -#include "mem/ruby/filters/BulkBloomFilter.hh" #include "mem/ruby/system/RubySystem.hh" using namespace std; diff --git a/src/mem/ruby/filters/H3BloomFilter.cc b/src/mem/ruby/filters/H3BloomFilter.cc --- a/src/mem/ruby/filters/H3BloomFilter.cc +++ b/src/mem/ruby/filters/H3BloomFilter.cc @@ -26,8 +26,9 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "mem/ruby/filters/H3BloomFilter.hh" + #include "base/intmath.hh" -#include "mem/ruby/filters/H3BloomFilter.hh" using namespace std; diff --git a/src/mem/ruby/filters/LSB_CountingBloomFilter.cc b/src/mem/ruby/filters/LSB_CountingBloomFilter.cc --- a/src/mem/ruby/filters/LSB_CountingBloomFilter.cc +++ b/src/mem/ruby/filters/LSB_CountingBloomFilter.cc @@ -26,8 +26,9 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "mem/ruby/filters/LSB_CountingBloomFilter.hh" + #include "base/intmath.hh" -#include "mem/ruby/filters/LSB_CountingBloomFilter.hh" #include "mem/ruby/system/RubySystem.hh" using namespace std; diff --git a/src/mem/ruby/filters/MultiBitSelBloomFilter.cc b/src/mem/ruby/filters/MultiBitSelBloomFilter.cc --- a/src/mem/ruby/filters/MultiBitSelBloomFilter.cc +++ b/src/mem/ruby/filters/MultiBitSelBloomFilter.cc @@ -26,11 +26,12 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "mem/ruby/filters/MultiBitSelBloomFilter.hh" + #include #include "base/intmath.hh" #include "base/str.hh" -#include "mem/ruby/filters/MultiBitSelBloomFilter.hh" using namespace std; diff --git a/src/mem/ruby/filters/MultiGrainBloomFilter.cc b/src/mem/ruby/filters/MultiGrainBloomFilter.cc --- a/src/mem/ruby/filters/MultiGrainBloomFilter.cc +++ b/src/mem/ruby/filters/MultiGrainBloomFilter.cc @@ -26,9 +26,10 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "mem/ruby/filters/MultiGrainBloomFilter.hh" + #include "base/intmath.hh" #include "base/str.hh" -#include "mem/ruby/filters/MultiGrainBloomFilter.hh" #include "mem/ruby/system/RubySystem.hh" using namespace std; diff --git a/src/mem/ruby/filters/NonCountingBloomFilter.cc b/src/mem/ruby/filters/NonCountingBloomFilter.cc --- a/src/mem/ruby/filters/NonCountingBloomFilter.cc +++ b/src/mem/ruby/filters/NonCountingBloomFilter.cc @@ -26,9 +26,10 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "mem/ruby/filters/NonCountingBloomFilter.hh" + #include "base/intmath.hh" #include "base/str.hh" -#include "mem/ruby/filters/NonCountingBloomFilter.hh" #include "mem/ruby/system/RubySystem.hh" using namespace std; diff --git a/src/mem/ruby/network/MessageBuffer.cc b/src/mem/ruby/network/MessageBuffer.cc --- a/src/mem/ruby/network/MessageBuffer.cc +++ b/src/mem/ruby/network/MessageBuffer.cc @@ -26,6 +26,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "mem/ruby/network/MessageBuffer.hh" + #include #include "base/cprintf.hh" @@ -33,7 +35,6 @@ #include "base/random.hh" #include "base/stl_helpers.hh" #include "debug/RubyQueue.hh" -#include "mem/ruby/network/MessageBuffer.hh" #include "mem/ruby/system/RubySystem.hh" using namespace std; diff --git a/src/mem/ruby/network/Network.cc b/src/mem/ruby/network/Network.cc --- a/src/mem/ruby/network/Network.cc +++ b/src/mem/ruby/network/Network.cc @@ -26,9 +26,10 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "mem/ruby/network/Network.hh" + #include "base/misc.hh" #include "mem/ruby/network/BasicLink.hh" -#include "mem/ruby/network/Network.hh" #include "mem/ruby/system/RubySystem.hh" uint32_t Network::m_virtual_networks; diff --git a/src/mem/ruby/network/Topology.cc b/src/mem/ruby/network/Topology.cc --- a/src/mem/ruby/network/Topology.cc +++ b/src/mem/ruby/network/Topology.cc @@ -26,13 +26,15 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "mem/ruby/network/Topology.hh" + #include #include "base/trace.hh" #include "debug/RubyNetwork.hh" #include "mem/ruby/common/NetDest.hh" #include "mem/ruby/network/BasicLink.hh" -#include "mem/ruby/network/Topology.hh" +#include "mem/ruby/network/Network.hh" #include "mem/ruby/slicc_interface/AbstractController.hh" using namespace std; diff --git a/src/mem/ruby/network/simple/PerfectSwitch.hh b/src/mem/ruby/network/simple/PerfectSwitch.hh --- a/src/mem/ruby/network/simple/PerfectSwitch.hh +++ b/src/mem/ruby/network/simple/PerfectSwitch.hh @@ -41,6 +41,7 @@ #include #include "mem/ruby/common/Consumer.hh" +#include "mem/ruby/common/TypeDefines.hh" class MessageBuffer; class NetDest; diff --git a/src/mem/ruby/network/simple/PerfectSwitch.cc b/src/mem/ruby/network/simple/PerfectSwitch.cc --- a/src/mem/ruby/network/simple/PerfectSwitch.cc +++ b/src/mem/ruby/network/simple/PerfectSwitch.cc @@ -26,13 +26,14 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "mem/ruby/network/simple/PerfectSwitch.hh" + #include #include "base/cast.hh" #include "base/random.hh" #include "debug/RubyNetwork.hh" #include "mem/ruby/network/MessageBuffer.hh" -#include "mem/ruby/network/simple/PerfectSwitch.hh" #include "mem/ruby/network/simple/SimpleNetwork.hh" #include "mem/ruby/network/simple/Switch.hh" #include "mem/ruby/slicc_interface/Message.hh" diff --git a/src/mem/ruby/network/simple/SimpleNetwork.cc b/src/mem/ruby/network/simple/SimpleNetwork.cc --- a/src/mem/ruby/network/simple/SimpleNetwork.cc +++ b/src/mem/ruby/network/simple/SimpleNetwork.cc @@ -26,6 +26,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "mem/ruby/network/simple/SimpleNetwork.hh" + #include #include @@ -34,7 +36,6 @@ #include "mem/ruby/common/NetDest.hh" #include "mem/ruby/network/MessageBuffer.hh" #include "mem/ruby/network/simple/SimpleLink.hh" -#include "mem/ruby/network/simple/SimpleNetwork.hh" #include "mem/ruby/network/simple/Switch.hh" #include "mem/ruby/network/simple/Throttle.hh" #include "mem/ruby/profiler/Profiler.hh" diff --git a/src/mem/ruby/network/simple/Switch.cc b/src/mem/ruby/network/simple/Switch.cc --- a/src/mem/ruby/network/simple/Switch.cc +++ b/src/mem/ruby/network/simple/Switch.cc @@ -26,6 +26,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "mem/ruby/network/simple/Switch.hh" + #include #include "base/cast.hh" @@ -33,7 +35,6 @@ #include "mem/ruby/network/MessageBuffer.hh" #include "mem/ruby/network/simple/PerfectSwitch.hh" #include "mem/ruby/network/simple/SimpleNetwork.hh" -#include "mem/ruby/network/simple/Switch.hh" #include "mem/ruby/network/simple/Throttle.hh" using namespace std; diff --git a/src/mem/ruby/network/simple/Throttle.cc b/src/mem/ruby/network/simple/Throttle.cc --- a/src/mem/ruby/network/simple/Throttle.cc +++ b/src/mem/ruby/network/simple/Throttle.cc @@ -26,15 +26,16 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "mem/ruby/network/simple/Throttle.hh" + #include #include "base/cast.hh" #include "base/cprintf.hh" #include "debug/RubyNetwork.hh" -#include "mem/ruby/network/simple/Switch.hh" -#include "mem/ruby/network/simple/Throttle.hh" #include "mem/ruby/network/MessageBuffer.hh" #include "mem/ruby/network/Network.hh" +#include "mem/ruby/network/simple/Switch.hh" #include "mem/ruby/slicc_interface/Message.hh" #include "mem/ruby/system/RubySystem.hh" diff --git a/src/mem/ruby/profiler/AccessTraceForAddress.cc b/src/mem/ruby/profiler/AccessTraceForAddress.cc --- a/src/mem/ruby/profiler/AccessTraceForAddress.cc +++ b/src/mem/ruby/profiler/AccessTraceForAddress.cc @@ -26,8 +26,9 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "mem/ruby/profiler/AccessTraceForAddress.hh" + #include "mem/ruby/common/Histogram.hh" -#include "mem/ruby/profiler/AccessTraceForAddress.hh" AccessTraceForAddress::~AccessTraceForAddress() { diff --git a/src/mem/ruby/profiler/AddressProfiler.cc b/src/mem/ruby/profiler/AddressProfiler.cc --- a/src/mem/ruby/profiler/AddressProfiler.cc +++ b/src/mem/ruby/profiler/AddressProfiler.cc @@ -26,11 +26,12 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "mem/ruby/profiler/AddressProfiler.hh" + #include #include "base/stl_helpers.hh" #include "mem/protocol/RubyRequest.hh" -#include "mem/ruby/profiler/AddressProfiler.hh" #include "mem/ruby/profiler/Profiler.hh" using namespace std; diff --git a/src/mem/ruby/profiler/StoreTrace.cc b/src/mem/ruby/profiler/StoreTrace.cc --- a/src/mem/ruby/profiler/StoreTrace.cc +++ b/src/mem/ruby/profiler/StoreTrace.cc @@ -27,6 +27,7 @@ */ #include "mem/ruby/profiler/StoreTrace.hh" + #include "sim/core.hh" using namespace std; diff --git a/src/mem/ruby/slicc_interface/AbstractController.hh b/src/mem/ruby/slicc_interface/AbstractController.hh --- a/src/mem/ruby/slicc_interface/AbstractController.hh +++ b/src/mem/ruby/slicc_interface/AbstractController.hh @@ -41,7 +41,6 @@ #include "mem/ruby/common/Histogram.hh" #include "mem/ruby/common/MachineID.hh" #include "mem/ruby/network/MessageBuffer.hh" -#include "mem/ruby/network/Network.hh" #include "mem/ruby/system/CacheRecorder.hh" #include "mem/packet.hh" #include "mem/qport.hh" diff --git a/src/mem/ruby/slicc_interface/AbstractController.cc b/src/mem/ruby/slicc_interface/AbstractController.cc --- a/src/mem/ruby/slicc_interface/AbstractController.cc +++ b/src/mem/ruby/slicc_interface/AbstractController.cc @@ -30,9 +30,10 @@ #include "debug/RubyQueue.hh" #include "mem/protocol/MemoryMsg.hh" +#include "mem/ruby/network/Network.hh" +#include "mem/ruby/system/GPUCoalescer.hh" #include "mem/ruby/system/RubySystem.hh" #include "mem/ruby/system/Sequencer.hh" -#include "mem/ruby/system/GPUCoalescer.hh" #include "sim/system.hh" AbstractController::AbstractController(const Params *p) diff --git a/src/mem/ruby/slicc_interface/RubyRequest.cc b/src/mem/ruby/slicc_interface/RubyRequest.cc --- a/src/mem/ruby/slicc_interface/RubyRequest.cc +++ b/src/mem/ruby/slicc_interface/RubyRequest.cc @@ -26,10 +26,10 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "mem/ruby/slicc_interface/RubyRequest.hh" + #include -#include "mem/ruby/slicc_interface/RubyRequest.hh" - using namespace std; void diff --git a/src/mem/ruby/structures/BankedArray.cc b/src/mem/ruby/structures/BankedArray.cc --- a/src/mem/ruby/structures/BankedArray.cc +++ b/src/mem/ruby/structures/BankedArray.cc @@ -29,8 +29,9 @@ * */ +#include "mem/ruby/structures/BankedArray.hh" + #include "base/intmath.hh" -#include "mem/ruby/structures/BankedArray.hh" #include "mem/ruby/system/RubySystem.hh" BankedArray::BankedArray(unsigned int banks, Cycles accessLatency, diff --git a/src/mem/ruby/structures/CacheMemory.cc b/src/mem/ruby/structures/CacheMemory.cc --- a/src/mem/ruby/structures/CacheMemory.cc +++ b/src/mem/ruby/structures/CacheMemory.cc @@ -27,13 +27,14 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "mem/ruby/structures/CacheMemory.hh" + #include "base/intmath.hh" #include "debug/RubyCache.hh" #include "debug/RubyCacheTrace.hh" #include "debug/RubyResourceStalls.hh" #include "debug/RubyStats.hh" #include "mem/protocol/AccessPermission.hh" -#include "mem/ruby/structures/CacheMemory.hh" #include "mem/ruby/system/RubySystem.hh" #include "mem/ruby/system/WeightedLRUPolicy.hh" diff --git a/src/mem/ruby/structures/DirectoryMemory.cc b/src/mem/ruby/structures/DirectoryMemory.cc --- a/src/mem/ruby/structures/DirectoryMemory.cc +++ b/src/mem/ruby/structures/DirectoryMemory.cc @@ -26,11 +26,12 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "mem/ruby/structures/DirectoryMemory.hh" + #include "base/intmath.hh" #include "debug/RubyCache.hh" #include "debug/RubyStats.hh" #include "mem/ruby/slicc_interface/RubySlicc_Util.hh" -#include "mem/ruby/structures/DirectoryMemory.hh" #include "mem/ruby/system/RubySystem.hh" using namespace std; diff --git a/src/mem/ruby/structures/LRUPolicy.cc b/src/mem/ruby/structures/LRUPolicy.cc --- a/src/mem/ruby/structures/LRUPolicy.cc +++ b/src/mem/ruby/structures/LRUPolicy.cc @@ -30,8 +30,6 @@ #include "mem/ruby/structures/LRUPolicy.hh" - - LRUPolicy::LRUPolicy(const Params * p) : AbstractReplacementPolicy(p) { diff --git a/src/mem/ruby/structures/Prefetcher.cc b/src/mem/ruby/structures/Prefetcher.cc --- a/src/mem/ruby/structures/Prefetcher.cc +++ b/src/mem/ruby/structures/Prefetcher.cc @@ -26,9 +26,10 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "mem/ruby/structures/Prefetcher.hh" + #include "debug/RubyPrefetcher.hh" #include "mem/ruby/slicc_interface/RubySlicc_ComponentMapping.hh" -#include "mem/ruby/structures/Prefetcher.hh" #include "mem/ruby/system/RubySystem.hh" Prefetcher* diff --git a/src/mem/ruby/structures/PseudoLRUPolicy.cc b/src/mem/ruby/structures/PseudoLRUPolicy.cc --- a/src/mem/ruby/structures/PseudoLRUPolicy.cc +++ b/src/mem/ruby/structures/PseudoLRUPolicy.cc @@ -30,8 +30,6 @@ #include "mem/ruby/structures/PseudoLRUPolicy.hh" - - PseudoLRUPolicy::PseudoLRUPolicy(const Params * p) : AbstractReplacementPolicy(p) { diff --git a/src/mem/ruby/structures/RubyMemoryControl.cc b/src/mem/ruby/structures/RubyMemoryControl.cc --- a/src/mem/ruby/structures/RubyMemoryControl.cc +++ b/src/mem/ruby/structures/RubyMemoryControl.cc @@ -105,6 +105,8 @@ * */ +#include "mem/ruby/structures/RubyMemoryControl.hh" + #include "base/cast.hh" #include "base/cprintf.hh" #include "base/random.hh" @@ -113,7 +115,6 @@ #include "mem/ruby/profiler/Profiler.hh" #include "mem/ruby/slicc_interface/Message.hh" #include "mem/ruby/slicc_interface/RubySlicc_ComponentMapping.hh" -#include "mem/ruby/structures/RubyMemoryControl.hh" #include "mem/ruby/system/RubySystem.hh" using namespace std; diff --git a/src/mem/ruby/structures/WireBuffer.cc b/src/mem/ruby/structures/WireBuffer.cc --- a/src/mem/ruby/structures/WireBuffer.cc +++ b/src/mem/ruby/structures/WireBuffer.cc @@ -29,12 +29,13 @@ * */ +#include "mem/ruby/structures/WireBuffer.hh" + #include #include #include "base/cprintf.hh" #include "base/stl_helpers.hh" -#include "mem/ruby/structures/WireBuffer.hh" #include "mem/ruby/system/RubySystem.hh" using namespace std; diff --git a/src/mem/ruby/system/CacheRecorder.cc b/src/mem/ruby/system/CacheRecorder.cc --- a/src/mem/ruby/system/CacheRecorder.cc +++ b/src/mem/ruby/system/CacheRecorder.cc @@ -27,8 +27,9 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "mem/ruby/system/CacheRecorder.hh" + #include "debug/RubyCacheTrace.hh" -#include "mem/ruby/system/CacheRecorder.hh" #include "mem/ruby/system/RubySystem.hh" #include "mem/ruby/system/Sequencer.hh" diff --git a/src/mem/ruby/system/DMASequencer.cc b/src/mem/ruby/system/DMASequencer.cc --- a/src/mem/ruby/system/DMASequencer.cc +++ b/src/mem/ruby/system/DMASequencer.cc @@ -26,13 +26,14 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "mem/ruby/system/DMASequencer.hh" + #include #include "debug/RubyDma.hh" #include "debug/RubyStats.hh" #include "mem/protocol/SequencerMsg.hh" #include "mem/protocol/SequencerRequestType.hh" -#include "mem/ruby/system/DMASequencer.hh" #include "mem/ruby/system/RubySystem.hh" DMASequencer::DMASequencer(const Params *p) diff --git a/src/mem/ruby/system/RubyPort.cc b/src/mem/ruby/system/RubyPort.cc --- a/src/mem/ruby/system/RubyPort.cc +++ b/src/mem/ruby/system/RubyPort.cc @@ -39,13 +39,14 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "mem/ruby/system/RubyPort.hh" + #include "cpu/testers/rubytest/RubyTester.hh" #include "debug/Config.hh" #include "debug/Drain.hh" #include "debug/Ruby.hh" #include "mem/protocol/AccessPermission.hh" #include "mem/ruby/slicc_interface/AbstractController.hh" -#include "mem/ruby/system/RubyPort.hh" #include "mem/simple_mem.hh" #include "sim/full_system.hh" #include "sim/system.hh" diff --git a/src/mem/ruby/system/Sequencer.cc b/src/mem/ruby/system/Sequencer.cc --- a/src/mem/ruby/system/Sequencer.cc +++ b/src/mem/ruby/system/Sequencer.cc @@ -26,6 +26,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "mem/ruby/system/Sequencer.hh" + #include "arch/x86/ldstflags.hh" #include "base/misc.hh" #include "base/str.hh" @@ -34,13 +36,12 @@ #include "debug/ProtocolTrace.hh" #include "debug/RubySequencer.hh" #include "debug/RubyStats.hh" +#include "mem/packet.hh" #include "mem/protocol/PrefetchBit.hh" #include "mem/protocol/RubyAccessMode.hh" #include "mem/ruby/profiler/Profiler.hh" #include "mem/ruby/slicc_interface/RubyRequest.hh" #include "mem/ruby/system/RubySystem.hh" -#include "mem/ruby/system/Sequencer.hh" -#include "mem/packet.hh" #include "sim/system.hh" using namespace std; diff --git a/src/mem/se_translating_port_proxy.cc b/src/mem/se_translating_port_proxy.cc --- a/src/mem/se_translating_port_proxy.cc +++ b/src/mem/se_translating_port_proxy.cc @@ -42,13 +42,14 @@ * Andreas Hansson */ +#include "mem/se_translating_port_proxy.hh" + #include #include "arch/isa_traits.hh" #include "base/chunk_generator.hh" #include "config/the_isa.hh" #include "mem/page_table.hh" -#include "mem/se_translating_port_proxy.hh" #include "sim/process.hh" #include "sim/system.hh" diff --git a/src/mem/serial_link.cc b/src/mem/serial_link.cc --- a/src/mem/serial_link.cc +++ b/src/mem/serial_link.cc @@ -56,7 +56,6 @@ #include "debug/SerialLink.hh" #include "params/SerialLink.hh" - SerialLink::SerialLinkSlavePort::SerialLinkSlavePort(const std::string& _name, SerialLink& _serial_link, SerialLinkMasterPort& _masterPort, diff --git a/src/mem/simple_mem.cc b/src/mem/simple_mem.cc --- a/src/mem/simple_mem.cc +++ b/src/mem/simple_mem.cc @@ -42,8 +42,9 @@ * Andreas Hansson */ +#include "mem/simple_mem.hh" + #include "base/random.hh" -#include "mem/simple_mem.hh" #include "debug/Drain.hh" using namespace std; diff --git a/src/mem/slicc/symbols/StateMachine.py b/src/mem/slicc/symbols/StateMachine.py --- a/src/mem/slicc/symbols/StateMachine.py +++ b/src/mem/slicc/symbols/StateMachine.py @@ -469,6 +469,7 @@ #include "mem/protocol/${ident}_Event.hh" #include "mem/protocol/${ident}_State.hh" #include "mem/protocol/Types.hh" +#include "mem/ruby/network/Network.hh" #include "mem/ruby/system/RubySystem.hh" ''') diff --git a/src/mem/snoop_filter.cc b/src/mem/snoop_filter.cc --- a/src/mem/snoop_filter.cc +++ b/src/mem/snoop_filter.cc @@ -42,10 +42,11 @@ * Implementation of a snoop filter. */ +#include "mem/snoop_filter.hh" + #include "base/misc.hh" #include "base/trace.hh" #include "debug/SnoopFilter.hh" -#include "mem/snoop_filter.hh" #include "sim/system.hh" void diff --git a/src/mem/tport.cc b/src/mem/tport.cc --- a/src/mem/tport.cc +++ b/src/mem/tport.cc @@ -41,8 +41,9 @@ * Andreas Hansson */ +#include "mem/tport.hh" + #include "mem/mem_object.hh" -#include "mem/tport.hh" SimpleTimingPort::SimpleTimingPort(const std::string& _name, MemObject* _owner) : diff --git a/src/mem/xbar.cc b/src/mem/xbar.cc --- a/src/mem/xbar.cc +++ b/src/mem/xbar.cc @@ -47,12 +47,13 @@ * Definition of a crossbar object. */ +#include "mem/xbar.hh" + #include "base/misc.hh" #include "base/trace.hh" #include "debug/AddrRanges.hh" #include "debug/Drain.hh" #include "debug/XBar.hh" -#include "mem/xbar.hh" BaseXBar::BaseXBar(const BaseXBarParams *p) : MemObject(p), diff --git a/src/proto/protoio.cc b/src/proto/protoio.cc --- a/src/proto/protoio.cc +++ b/src/proto/protoio.cc @@ -37,8 +37,9 @@ * Authors: Andreas Hansson */ +#include "proto/protoio.hh" + #include "base/misc.hh" -#include "proto/protoio.hh" using namespace std; using namespace google::protobuf; diff --git a/src/python/swig/pyevent.hh b/src/python/swig/pyevent.hh --- a/src/python/swig/pyevent.hh +++ b/src/python/swig/pyevent.hh @@ -32,6 +32,7 @@ #define __PYTHON_SWIG_PYEVENT_HH__ #include "sim/eventq.hh" +#include "sim/init.hh" #include "sim/sim_events.hh" class PythonEvent : public Event diff --git a/src/python/swig/pyevent.cc b/src/python/swig/pyevent.cc --- a/src/python/swig/pyevent.cc +++ b/src/python/swig/pyevent.cc @@ -28,9 +28,10 @@ * Authors: Nathan Binkert */ +#include "python/swig/pyevent.hh" + #include -#include "python/swig/pyevent.hh" #include "sim/async.hh" #include "sim/eventq.hh" diff --git a/src/python/swig/pyobject.cc b/src/python/swig/pyobject.cc --- a/src/python/swig/pyobject.cc +++ b/src/python/swig/pyobject.cc @@ -35,13 +35,16 @@ #include "base/inifile.hh" #include "base/output.hh" #include "config/the_isa.hh" + #if THE_ISA != NULL_ISA #include "dev/net/etherdevice.hh" #include "dev/net/etherobject.hh" + #endif +#include "python/swig/pyobject.hh" + +#include "mem/mem_object.hh" #include "mem/ruby/slicc_interface/AbstractController.hh" -#include "mem/mem_object.hh" -#include "python/swig/pyobject.hh" #include "sim/full_system.hh" #include "sim/sim_object.hh" diff --git a/src/sim/arguments.cc b/src/sim/arguments.cc --- a/src/sim/arguments.cc +++ b/src/sim/arguments.cc @@ -28,10 +28,11 @@ * Authors: Nathan Binkert */ +#include "sim/arguments.hh" + #include "arch/utility.hh" #include "config/the_isa.hh" #include "cpu/thread_context.hh" -#include "sim/arguments.hh" Arguments::Data::~Data() { diff --git a/src/sim/backtrace_glibc.cc b/src/sim/backtrace_glibc.cc --- a/src/sim/backtrace_glibc.cc +++ b/src/sim/backtrace_glibc.cc @@ -37,12 +37,11 @@ * Authors: Andreas Sandberg */ -#include "sim/backtrace.hh" - #include #include #include "base/atomicio.hh" +#include "sim/backtrace.hh" #define SAFE_MSG(m) \ do { \ diff --git a/src/sim/clock_domain.cc b/src/sim/clock_domain.cc --- a/src/sim/clock_domain.cc +++ b/src/sim/clock_domain.cc @@ -42,6 +42,8 @@ * Stephan Diestelhorst */ +#include "sim/clock_domain.hh" + #include #include @@ -49,9 +51,8 @@ #include "params/ClockDomain.hh" #include "params/DerivedClockDomain.hh" #include "params/SrcClockDomain.hh" -#include "sim/clock_domain.hh" +#include "sim/clocked_object.hh" #include "sim/voltage_domain.hh" -#include "sim/clocked_object.hh" void ClockDomain::regStats() diff --git a/src/sim/core.cc b/src/sim/core.cc --- a/src/sim/core.cc +++ b/src/sim/core.cc @@ -31,12 +31,13 @@ * Steve Reinhardt */ +#include "sim/core.hh" + #include #include #include "base/callback.hh" #include "base/output.hh" -#include "sim/core.hh" #include "sim/eventq.hh" using namespace std; diff --git a/src/sim/cxx_manager.cc b/src/sim/cxx_manager.cc --- a/src/sim/cxx_manager.cc +++ b/src/sim/cxx_manager.cc @@ -37,13 +37,14 @@ * Authors: Andrew Bardsley */ +#include "sim/cxx_manager.hh" + #include #include #include "base/str.hh" #include "debug/CxxConfig.hh" #include "mem/mem_object.hh" -#include "sim/cxx_manager.hh" #include "sim/serialize.hh" CxxConfigManager::CxxConfigManager(CxxConfigFileBase &configFile_) : diff --git a/src/sim/debug.cc b/src/sim/debug.cc --- a/src/sim/debug.cc +++ b/src/sim/debug.cc @@ -29,16 +29,17 @@ * Steve Reinhardt */ +#include "sim/debug.hh" + #include #include #include "base/debug.hh" -#include "sim/debug.hh" +#include "cpu/pc_event.hh" #include "sim/eventq_impl.hh" #include "sim/global_event.hh" #include "sim/sim_events.hh" #include "sim/sim_exit.hh" -#include "cpu/pc_event.hh" #include "sim/system.hh" using namespace std; diff --git a/src/sim/dvfs_handler.cc b/src/sim/dvfs_handler.cc --- a/src/sim/dvfs_handler.cc +++ b/src/sim/dvfs_handler.cc @@ -39,6 +39,8 @@ * Stephan Diestelhorst */ +#include "sim/dvfs_handler.hh" + #include #include @@ -46,7 +48,6 @@ #include "debug/DVFS.hh" #include "params/DVFSHandler.hh" #include "sim/clock_domain.hh" -#include "sim/dvfs_handler.hh" #include "sim/stat_control.hh" #include "sim/voltage_domain.hh" diff --git a/src/sim/faults.cc b/src/sim/faults.cc --- a/src/sim/faults.cc +++ b/src/sim/faults.cc @@ -29,13 +29,14 @@ * Gabe Black */ +#include "sim/faults.hh" + #include "arch/isa_traits.hh" #include "base/misc.hh" #include "cpu/base.hh" #include "cpu/thread_context.hh" #include "debug/Fault.hh" #include "mem/page_table.hh" -#include "sim/faults.hh" #include "sim/full_system.hh" #include "sim/process.hh" diff --git a/src/sim/init.cc b/src/sim/init.cc --- a/src/sim/init.cc +++ b/src/sim/init.cc @@ -41,6 +41,8 @@ * Authors: Nathan Binkert */ +#include "sim/init.hh" + #include #include @@ -56,10 +58,10 @@ #include "config/have_protobuf.hh" #include "sim/async.hh" #include "sim/core.hh" -#include "sim/init.hh" #if HAVE_PROTOBUF #include + #endif using namespace std; diff --git a/src/sim/probe/probe.cc b/src/sim/probe/probe.cc --- a/src/sim/probe/probe.cc +++ b/src/sim/probe/probe.cc @@ -37,8 +37,9 @@ * Authors: Matt Horsnell */ +#include "sim/probe/probe.hh" + #include "debug/ProbeVerbose.hh" -#include "sim/probe/probe.hh" ProbePoint::ProbePoint(ProbeManager *manager, const std::string& _name) : name(_name) diff --git a/src/sim/process.cc b/src/sim/process.cc --- a/src/sim/process.cc +++ b/src/sim/process.cc @@ -43,6 +43,8 @@ * Ali Saidi */ +#include "sim/process.hh" + #include #include @@ -50,19 +52,18 @@ #include #include +#include "base/intmath.hh" #include "base/loader/object_file.hh" #include "base/loader/symtab.hh" -#include "base/intmath.hh" #include "base/statistics.hh" #include "config/the_isa.hh" #include "cpu/thread_context.hh" +#include "mem/multi_level_page_table.hh" #include "mem/page_table.hh" -#include "mem/multi_level_page_table.hh" #include "mem/se_translating_port_proxy.hh" #include "params/LiveProcess.hh" #include "params/Process.hh" #include "sim/debug.hh" -#include "sim/process.hh" #include "sim/process_impl.hh" #include "sim/stats.hh" #include "sim/syscall_emul.hh" @@ -71,18 +72,24 @@ #if THE_ISA == ALPHA_ISA #include "arch/alpha/linux/process.hh" #include "arch/alpha/tru64/process.hh" + #elif THE_ISA == SPARC_ISA #include "arch/sparc/linux/process.hh" #include "arch/sparc/solaris/process.hh" + #elif THE_ISA == MIPS_ISA #include "arch/mips/linux/process.hh" + #elif THE_ISA == ARM_ISA +#include "arch/arm/freebsd/process.hh" #include "arch/arm/linux/process.hh" -#include "arch/arm/freebsd/process.hh" + #elif THE_ISA == X86_ISA #include "arch/x86/linux/process.hh" + #elif THE_ISA == POWER_ISA #include "arch/power/linux/process.hh" + #else #error "THE_ISA not set" #endif diff --git a/src/sim/pseudo_inst.cc b/src/sim/pseudo_inst.cc --- a/src/sim/pseudo_inst.cc +++ b/src/sim/pseudo_inst.cc @@ -41,6 +41,8 @@ * Authors: Nathan Binkert */ +#include "sim/pseudo_inst.hh" + #include #include @@ -50,9 +52,9 @@ #include #include "arch/kernel_stats.hh" +#include "arch/pseudo_inst.hh" #include "arch/utility.hh" #include "arch/vtophys.hh" -#include "arch/pseudo_inst.hh" #include "base/debug.hh" #include "base/output.hh" #include "config/the_isa.hh" @@ -68,7 +70,6 @@ #include "sim/full_system.hh" #include "sim/initparam_keys.hh" #include "sim/process.hh" -#include "sim/pseudo_inst.hh" #include "sim/serialize.hh" #include "sim/sim_events.hh" #include "sim/sim_exit.hh" diff --git a/src/sim/py_interact.cc b/src/sim/py_interact.cc --- a/src/sim/py_interact.cc +++ b/src/sim/py_interact.cc @@ -29,10 +29,10 @@ * Steve Reinhardt */ +#include "sim/py_interact.hh" + #include -#include "sim/py_interact.hh" - void py_interact() { diff --git a/src/sim/root.cc b/src/sim/root.cc --- a/src/sim/root.cc +++ b/src/sim/root.cc @@ -31,12 +31,13 @@ * Gabe Black */ +#include "sim/root.hh" + #include "base/misc.hh" #include "base/trace.hh" #include "config/the_isa.hh" #include "debug/TimeSync.hh" #include "sim/full_system.hh" -#include "sim/root.hh" Root *Root::_root = NULL; diff --git a/src/sim/serialize.cc b/src/sim/serialize.cc --- a/src/sim/serialize.cc +++ b/src/sim/serialize.cc @@ -45,6 +45,8 @@ * Andreas Sandberg */ +#include "sim/serialize.hh" + #include #include #include @@ -63,7 +65,6 @@ #include "base/trace.hh" #include "debug/Checkpoint.hh" #include "sim/eventq.hh" -#include "sim/serialize.hh" #include "sim/sim_events.hh" #include "sim/sim_exit.hh" #include "sim/sim_object.hh" diff --git a/src/sim/sim_events.cc b/src/sim/sim_events.cc --- a/src/sim/sim_events.cc +++ b/src/sim/sim_events.cc @@ -42,12 +42,13 @@ * Authors: Nathan Binkert */ +#include "sim/sim_events.hh" + #include #include "base/callback.hh" #include "base/hostinfo.hh" #include "sim/eventq_impl.hh" -#include "sim/sim_events.hh" #include "sim/sim_exit.hh" #include "sim/stats.hh" diff --git a/src/sim/sim_object.cc b/src/sim/sim_object.cc --- a/src/sim/sim_object.cc +++ b/src/sim/sim_object.cc @@ -30,6 +30,8 @@ * Nathan Binkert */ +#include "sim/sim_object.hh" + #include #include "base/callback.hh" @@ -40,7 +42,6 @@ #include "base/types.hh" #include "debug/Checkpoint.hh" #include "sim/probe/probe.hh" -#include "sim/sim_object.hh" #include "sim/stats.hh" using namespace std; diff --git a/src/sim/simulate.cc b/src/sim/simulate.cc --- a/src/sim/simulate.cc +++ b/src/sim/simulate.cc @@ -31,6 +31,8 @@ * Steve Reinhardt */ +#include "sim/simulate.hh" + #include #include @@ -41,7 +43,6 @@ #include "sim/eventq_impl.hh" #include "sim/sim_events.hh" #include "sim/sim_exit.hh" -#include "sim/simulate.hh" #include "sim/stat_control.hh" //! Mutex for handling async events. diff --git a/src/sim/stat_control.hh b/src/sim/stat_control.hh --- a/src/sim/stat_control.hh +++ b/src/sim/stat_control.hh @@ -44,6 +44,9 @@ #ifndef __SIM_STAT_CONTROL_HH__ #define __SIM_STAT_CONTROL_HH__ +#include "base/types.hh" +#include "sim/core.hh" + namespace Stats { double statElapsedTime(); diff --git a/src/sim/stat_control.cc b/src/sim/stat_control.cc --- a/src/sim/stat_control.cc +++ b/src/sim/stat_control.cc @@ -46,6 +46,8 @@ // This file will contain default statistics for the simulator that // don't really belong to a specific simulator object +#include "sim/stat_control.hh" + #include #include #include @@ -56,7 +58,6 @@ #include "base/time.hh" #include "cpu/base.hh" #include "sim/global_event.hh" -#include "sim/stat_control.hh" using namespace std; diff --git a/src/sim/sub_system.cc b/src/sim/sub_system.cc --- a/src/sim/sub_system.cc +++ b/src/sim/sub_system.cc @@ -40,7 +40,6 @@ #include "sim/sub_system.hh" #include "params/SubSystem.hh" -#include "sim/sub_system.hh" #include "sim/power/power_model.hh" #include "sim/power/thermal_domain.hh" diff --git a/src/sim/syscall_emul.cc b/src/sim/syscall_emul.cc --- a/src/sim/syscall_emul.cc +++ b/src/sim/syscall_emul.cc @@ -29,6 +29,8 @@ * Ali Saidi */ +#include "sim/syscall_emul.hh" + #include #include @@ -47,7 +49,6 @@ #include "mem/page_table.hh" #include "sim/process.hh" #include "sim/sim_exit.hh" -#include "sim/syscall_emul.hh" #include "sim/system.hh" using namespace std; diff --git a/src/sim/system.cc b/src/sim/system.cc --- a/src/sim/system.cc +++ b/src/sim/system.cc @@ -45,6 +45,8 @@ * Rick Strong */ +#include "sim/system.hh" + #include "arch/remote_gdb.hh" #include "arch/utility.hh" #include "base/loader/object_file.hh" @@ -60,7 +62,6 @@ #include "sim/byteswap.hh" #include "sim/debug.hh" #include "sim/full_system.hh" -#include "sim/system.hh" /** * To avoid linking errors with LTO, only include the header if we @@ -68,6 +69,7 @@ */ #if THE_ISA != NULL_ISA #include "kern/kernel_stats.hh" + #endif using namespace std; diff --git a/src/sim/voltage_domain.cc b/src/sim/voltage_domain.cc --- a/src/sim/voltage_domain.cc +++ b/src/sim/voltage_domain.cc @@ -38,13 +38,14 @@ * Akash Bagdia */ +#include "sim/voltage_domain.hh" + #include #include "base/statistics.hh" #include "debug/VoltageDomain.hh" #include "params/VoltageDomain.hh" #include "sim/sim_object.hh" -#include "sim/voltage_domain.hh" VoltageDomain::VoltageDomain(const Params *p) : SimObject(p), voltageOpPoints(p->voltage), _perfLevel(0) diff --git a/src/unittest/circlebuf.cc b/src/unittest/circlebuf.cc --- a/src/unittest/circlebuf.cc +++ b/src/unittest/circlebuf.cc @@ -38,7 +38,6 @@ */ #include "base/circlebuf.hh" - #include "unittest/unittest.hh" const char data[] = { diff --git a/src/unittest/unittest.cc b/src/unittest/unittest.cc --- a/src/unittest/unittest.cc +++ b/src/unittest/unittest.cc @@ -28,10 +28,11 @@ * Authors: Gabe Black */ +#include "unittest/unittest.hh" + #include #include "base/cprintf.hh" -#include "unittest/unittest.hh" namespace { # Node ID 579f5d74b7a61e925c09c6eec191c5e6d2bdcc59 # Parent 360ae78f47bb66007c168bbaa5f16af7c4f4cae7 diff --git a/src/arch/alpha/faults.cc b/src/arch/alpha/faults.cc --- a/src/arch/alpha/faults.cc +++ b/src/arch/alpha/faults.cc @@ -29,15 +29,16 @@ * Kevin Lim */ +#include "arch/alpha/faults.hh" + #include "arch/alpha/ev5.hh" -#include "arch/alpha/faults.hh" #include "arch/alpha/tlb.hh" #include "base/trace.hh" #include "cpu/base.hh" #include "cpu/thread_context.hh" #include "mem/page_table.hh" +#include "sim/full_system.hh" #include "sim/process.hh" -#include "sim/full_system.hh" namespace AlphaISA { diff --git a/src/arch/alpha/freebsd/system.cc b/src/arch/alpha/freebsd/system.cc --- a/src/arch/alpha/freebsd/system.cc +++ b/src/arch/alpha/freebsd/system.cc @@ -36,6 +36,7 @@ */ #include "arch/alpha/freebsd/system.hh" + #include "arch/alpha/system.hh" #include "arch/isa_traits.hh" #include "arch/vtophys.hh" diff --git a/src/arch/alpha/idle_event.cc b/src/arch/alpha/idle_event.cc --- a/src/arch/alpha/idle_event.cc +++ b/src/arch/alpha/idle_event.cc @@ -30,6 +30,7 @@ */ #include "arch/alpha/idle_event.hh" + #include "arch/alpha/kernel_stats.hh" #include "cpu/thread_context.hh" diff --git a/src/arch/alpha/ipr.cc b/src/arch/alpha/ipr.cc --- a/src/arch/alpha/ipr.cc +++ b/src/arch/alpha/ipr.cc @@ -28,11 +28,11 @@ * Authors: Gabe Black */ +#include "arch/alpha/ipr.hh" + #include #include -#include "arch/alpha/ipr.hh" - namespace AlphaISA { md_ipr_names MiscRegIndexToIpr[NumInternalProcRegs] = { diff --git a/src/arch/alpha/isa.cc b/src/arch/alpha/isa.cc --- a/src/arch/alpha/isa.cc +++ b/src/arch/alpha/isa.cc @@ -28,9 +28,10 @@ * Authors: Gabe Black */ +#include "arch/alpha/isa.hh" + #include -#include "arch/alpha/isa.hh" #include "base/misc.hh" #include "cpu/thread_context.hh" #include "params/AlphaISA.hh" diff --git a/src/arch/alpha/kernel_stats.cc b/src/arch/alpha/kernel_stats.cc --- a/src/arch/alpha/kernel_stats.cc +++ b/src/arch/alpha/kernel_stats.cc @@ -29,13 +29,14 @@ * Nathan Binkert */ +#include "arch/alpha/kernel_stats.hh" + #include #include #include +#include "arch/alpha/osfpal.hh" #include "arch/generic/linux/threadinfo.hh" -#include "arch/alpha/kernel_stats.hh" -#include "arch/alpha/osfpal.hh" #include "base/trace.hh" #include "cpu/thread_context.hh" #include "debug/Context.hh" diff --git a/src/arch/alpha/linux/process.cc b/src/arch/alpha/linux/process.cc --- a/src/arch/alpha/linux/process.cc +++ b/src/arch/alpha/linux/process.cc @@ -29,9 +29,10 @@ * Ali Saidi */ +#include "arch/alpha/linux/process.hh" + +#include "arch/alpha/isa_traits.hh" #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 "debug/SyscallVerbose.hh" diff --git a/src/arch/alpha/linux/system.cc b/src/arch/alpha/linux/system.cc --- a/src/arch/alpha/linux/system.cc +++ b/src/arch/alpha/linux/system.cc @@ -41,6 +41,7 @@ */ #include "arch/alpha/linux/system.hh" + #include "arch/alpha/idle_event.hh" #include "arch/alpha/system.hh" #include "arch/generic/linux/threadinfo.hh" diff --git a/src/arch/alpha/pagetable.cc b/src/arch/alpha/pagetable.cc --- a/src/arch/alpha/pagetable.cc +++ b/src/arch/alpha/pagetable.cc @@ -29,6 +29,7 @@ */ #include "arch/alpha/pagetable.hh" + #include "sim/serialize.hh" namespace AlphaISA { diff --git a/src/arch/alpha/process.cc b/src/arch/alpha/process.cc --- a/src/arch/alpha/process.cc +++ b/src/arch/alpha/process.cc @@ -29,8 +29,9 @@ * Ali Saidi */ +#include "arch/alpha/process.hh" + #include "arch/alpha/isa_traits.hh" -#include "arch/alpha/process.hh" #include "base/loader/elf_object.hh" #include "base/loader/object_file.hh" #include "base/misc.hh" diff --git a/src/arch/alpha/remote_gdb.cc b/src/arch/alpha/remote_gdb.cc --- a/src/arch/alpha/remote_gdb.cc +++ b/src/arch/alpha/remote_gdb.cc @@ -117,15 +117,15 @@ * "Stub" to allow remote cpu to debug over a serial line using gdb. */ +#include "arch/alpha/remote_gdb.hh" + #include #include #include - #include "arch/alpha/decoder.hh" #include "arch/alpha/regredir.hh" -#include "arch/alpha/remote_gdb.hh" #include "arch/alpha/utility.hh" #include "arch/alpha/vtophys.hh" #include "base/intmath.hh" @@ -138,8 +138,8 @@ #include "debug/GDBMisc.hh" #include "mem/physical.hh" #include "mem/port.hh" +#include "sim/full_system.hh" #include "sim/system.hh" -#include "sim/full_system.hh" using namespace std; using namespace AlphaISA; diff --git a/src/arch/alpha/stacktrace.cc b/src/arch/alpha/stacktrace.cc --- a/src/arch/alpha/stacktrace.cc +++ b/src/arch/alpha/stacktrace.cc @@ -28,10 +28,11 @@ * Authors: Nathan Binkert */ +#include "arch/alpha/stacktrace.hh" + #include #include "arch/alpha/isa_traits.hh" -#include "arch/alpha/stacktrace.hh" #include "arch/alpha/vtophys.hh" #include "base/bitfield.hh" #include "base/trace.hh" diff --git a/src/arch/alpha/system.cc b/src/arch/alpha/system.cc --- a/src/arch/alpha/system.cc +++ b/src/arch/alpha/system.cc @@ -29,10 +29,11 @@ * Nathan Binkert */ +#include "arch/alpha/system.hh" + #include #include "arch/alpha/ev5.hh" -#include "arch/alpha/system.hh" #include "arch/vtophys.hh" #include "base/loader/object_file.hh" #include "base/loader/symtab.hh" diff --git a/src/arch/alpha/tru64/process.cc b/src/arch/alpha/tru64/process.cc --- a/src/arch/alpha/tru64/process.cc +++ b/src/arch/alpha/tru64/process.cc @@ -30,8 +30,9 @@ */ #include "arch/alpha/tru64/process.hh" + +#include "arch/alpha/isa_traits.hh" #include "arch/alpha/tru64/tru64.hh" -#include "arch/alpha/isa_traits.hh" #include "cpu/thread_context.hh" #include "kern/tru64/tru64.hh" #include "sim/byteswap.hh" diff --git a/src/arch/alpha/tru64/system.cc b/src/arch/alpha/tru64/system.cc --- a/src/arch/alpha/tru64/system.cc +++ b/src/arch/alpha/tru64/system.cc @@ -30,14 +30,15 @@ */ #include "arch/alpha/tru64/system.hh" + #include "arch/isa_traits.hh" #include "arch/vtophys.hh" #include "base/loader/symtab.hh" #include "base/trace.hh" #include "cpu/base.hh" #include "cpu/thread_context.hh" +#include "kern/system_events.hh" #include "kern/tru64/tru64_events.hh" -#include "kern/system_events.hh" #include "mem/fs_translating_port_proxy.hh" using namespace std; diff --git a/src/arch/alpha/utility.cc b/src/arch/alpha/utility.cc --- a/src/arch/alpha/utility.cc +++ b/src/arch/alpha/utility.cc @@ -30,6 +30,7 @@ */ #include "arch/alpha/utility.hh" + #include "arch/alpha/vtophys.hh" #include "mem/fs_translating_port_proxy.hh" #include "sim/full_system.hh" diff --git a/src/arch/alpha/vtophys.cc b/src/arch/alpha/vtophys.cc --- a/src/arch/alpha/vtophys.cc +++ b/src/arch/alpha/vtophys.cc @@ -30,10 +30,11 @@ * Ali Saidi */ +#include "arch/alpha/vtophys.hh" + #include #include "arch/alpha/ev5.hh" -#include "arch/alpha/vtophys.hh" #include "base/chunk_generator.hh" #include "base/trace.hh" #include "cpu/thread_context.hh" diff --git a/src/arch/arm/faults.cc b/src/arch/arm/faults.cc --- a/src/arch/arm/faults.cc +++ b/src/arch/arm/faults.cc @@ -45,9 +45,10 @@ */ #include "arch/arm/faults.hh" + +#include "arch/arm/insts/static_inst.hh" #include "arch/arm/system.hh" #include "arch/arm/utility.hh" -#include "arch/arm/insts/static_inst.hh" #include "base/compiler.hh" #include "base/trace.hh" #include "cpu/base.hh" diff --git a/src/arch/arm/insts/macromem.cc b/src/arch/arm/insts/macromem.cc --- a/src/arch/arm/insts/macromem.cc +++ b/src/arch/arm/insts/macromem.cc @@ -40,10 +40,10 @@ * Authors: Stephen Hines */ +#include "arch/arm/insts/macromem.hh" + #include -#include "arch/arm/insts/macromem.hh" - #include "arch/arm/generated/decoder.hh" #include "arch/arm/insts/neon64_mem.hh" diff --git a/src/arch/arm/insts/mem.cc b/src/arch/arm/insts/mem.cc --- a/src/arch/arm/insts/mem.cc +++ b/src/arch/arm/insts/mem.cc @@ -41,6 +41,7 @@ */ #include "arch/arm/insts/mem.hh" + #include "base/loader/symtab.hh" using namespace std; diff --git a/src/arch/arm/insts/mem64.cc b/src/arch/arm/insts/mem64.cc --- a/src/arch/arm/insts/mem64.cc +++ b/src/arch/arm/insts/mem64.cc @@ -38,6 +38,7 @@ */ #include "arch/arm/insts/mem64.hh" + #include "arch/arm/tlb.hh" #include "base/loader/symtab.hh" #include "mem/request.hh" diff --git a/src/arch/arm/insts/misc.cc b/src/arch/arm/insts/misc.cc --- a/src/arch/arm/insts/misc.cc +++ b/src/arch/arm/insts/misc.cc @@ -39,6 +39,7 @@ */ #include "arch/arm/insts/misc.hh" + #include "cpu/reg_class.hh" std::string diff --git a/src/arch/arm/insts/pseudo.cc b/src/arch/arm/insts/pseudo.cc --- a/src/arch/arm/insts/pseudo.cc +++ b/src/arch/arm/insts/pseudo.cc @@ -42,6 +42,7 @@ */ #include "arch/arm/insts/pseudo.hh" + #include "cpu/exec_context.hh" DecoderFaultInst::DecoderFaultInst(ExtMachInst _machInst) diff --git a/src/arch/arm/insts/static_inst.cc b/src/arch/arm/insts/static_inst.cc --- a/src/arch/arm/insts/static_inst.cc +++ b/src/arch/arm/insts/static_inst.cc @@ -42,10 +42,11 @@ */ #include "arch/arm/insts/static_inst.hh" + #include "arch/arm/faults.hh" -#include "base/loader/symtab.hh" #include "base/condcodes.hh" #include "base/cprintf.hh" +#include "base/loader/symtab.hh" #include "cpu/reg_class.hh" namespace ArmISA diff --git a/src/arch/arm/interrupts.cc b/src/arch/arm/interrupts.cc --- a/src/arch/arm/interrupts.cc +++ b/src/arch/arm/interrupts.cc @@ -38,6 +38,7 @@ */ #include "arch/arm/interrupts.hh" + #include "arch/arm/system.hh" ArmISA::Interrupts * diff --git a/src/arch/arm/isa.cc b/src/arch/arm/isa.cc --- a/src/arch/arm/isa.cc +++ b/src/arch/arm/isa.cc @@ -39,10 +39,11 @@ */ #include "arch/arm/isa.hh" + #include "arch/arm/pmu.hh" #include "arch/arm/system.hh" +#include "cpu/base.hh" #include "cpu/checker/cpu.hh" -#include "cpu/base.hh" #include "debug/Arm.hh" #include "debug/MiscRegs.hh" #include "dev/arm/generic_timer.hh" diff --git a/src/arch/arm/kvm/base_cpu.cc b/src/arch/arm/kvm/base_cpu.cc --- a/src/arch/arm/kvm/base_cpu.cc +++ b/src/arch/arm/kvm/base_cpu.cc @@ -44,7 +44,6 @@ #include "debug/KvmInt.hh" #include "params/BaseArmKvmCPU.hh" - #define INTERRUPT_ID(type, vcpu, irq) ( \ ((type) << KVM_ARM_IRQ_TYPE_SHIFT) | \ ((vcpu) << KVM_ARM_IRQ_VCPU_SHIFT) | \ diff --git a/src/arch/arm/linux/process.cc b/src/arch/arm/linux/process.cc --- a/src/arch/arm/linux/process.cc +++ b/src/arch/arm/linux/process.cc @@ -44,9 +44,10 @@ * Giacomo Gabrielli */ +#include "arch/arm/linux/process.hh" + +#include "arch/arm/isa_traits.hh" #include "arch/arm/linux/linux.hh" -#include "arch/arm/linux/process.hh" -#include "arch/arm/isa_traits.hh" #include "base/trace.hh" #include "cpu/thread_context.hh" #include "kern/linux/linux.hh" diff --git a/src/arch/arm/linux/system.cc b/src/arch/arm/linux/system.cc --- a/src/arch/arm/linux/system.cc +++ b/src/arch/arm/linux/system.cc @@ -40,9 +40,10 @@ * Authors: Ali Saidi */ +#include "arch/arm/linux/system.hh" + +#include "arch/arm/isa_traits.hh" #include "arch/arm/linux/atag.hh" -#include "arch/arm/linux/system.hh" -#include "arch/arm/isa_traits.hh" #include "arch/arm/utility.hh" #include "arch/generic/linux/threadinfo.hh" #include "base/loader/dtb_object.hh" diff --git a/src/arch/arm/miscregs.cc b/src/arch/arm/miscregs.cc --- a/src/arch/arm/miscregs.cc +++ b/src/arch/arm/miscregs.cc @@ -39,8 +39,9 @@ * Giacomo Gabrielli */ +#include "arch/arm/miscregs.hh" + #include "arch/arm/isa.hh" -#include "arch/arm/miscregs.hh" #include "base/misc.hh" #include "cpu/thread_context.hh" #include "sim/full_system.hh" diff --git a/src/arch/arm/nativetrace.cc b/src/arch/arm/nativetrace.cc --- a/src/arch/arm/nativetrace.cc +++ b/src/arch/arm/nativetrace.cc @@ -40,9 +40,10 @@ * Authors: Gabe Black */ +#include "arch/arm/nativetrace.hh" + #include "arch/arm/isa_traits.hh" #include "arch/arm/miscregs.hh" -#include "arch/arm/nativetrace.hh" #include "cpu/thread_context.hh" #include "debug/ExecRegDelta.hh" #include "params/ArmNativeTrace.hh" diff --git a/src/arch/arm/process.cc b/src/arch/arm/process.cc --- a/src/arch/arm/process.cc +++ b/src/arch/arm/process.cc @@ -41,8 +41,9 @@ * Ali Saidi */ +#include "arch/arm/process.hh" + #include "arch/arm/isa_traits.hh" -#include "arch/arm/process.hh" #include "arch/arm/types.hh" #include "base/loader/elf_object.hh" #include "base/loader/object_file.hh" diff --git a/src/arch/arm/remote_gdb.cc b/src/arch/arm/remote_gdb.cc --- a/src/arch/arm/remote_gdb.cc +++ b/src/arch/arm/remote_gdb.cc @@ -132,6 +132,8 @@ * "Stub" to allow remote cpu to debug over a serial line using gdb. */ +#include "arch/arm/remote_gdb.hh" + #include #include @@ -140,7 +142,6 @@ #include "arch/arm/decoder.hh" #include "arch/arm/pagetable.hh" #include "arch/arm/registers.hh" -#include "arch/arm/remote_gdb.hh" #include "arch/arm/system.hh" #include "arch/arm/utility.hh" #include "arch/arm/vtophys.hh" diff --git a/src/arch/arm/stacktrace.cc b/src/arch/arm/stacktrace.cc --- a/src/arch/arm/stacktrace.cc +++ b/src/arch/arm/stacktrace.cc @@ -28,10 +28,11 @@ * Authors: Nathan Binkert */ +#include "arch/arm/stacktrace.hh" + #include #include "arch/arm/isa_traits.hh" -#include "arch/arm/stacktrace.hh" #include "arch/arm/vtophys.hh" #include "base/bitfield.hh" #include "base/trace.hh" diff --git a/src/arch/arm/stage2_lookup.cc b/src/arch/arm/stage2_lookup.cc --- a/src/arch/arm/stage2_lookup.cc +++ b/src/arch/arm/stage2_lookup.cc @@ -38,8 +38,9 @@ * Giacomo Gabrielli */ +#include "arch/arm/stage2_lookup.hh" + #include "arch/arm/faults.hh" -#include "arch/arm/stage2_lookup.hh" #include "arch/arm/system.hh" #include "arch/arm/table_walker.hh" #include "arch/arm/tlb.hh" diff --git a/src/arch/arm/system.cc b/src/arch/arm/system.cc --- a/src/arch/arm/system.cc +++ b/src/arch/arm/system.cc @@ -40,14 +40,15 @@ * Authors: Ali Saidi */ +#include "arch/arm/system.hh" + #include -#include "arch/arm/system.hh" #include "base/loader/object_file.hh" #include "base/loader/symtab.hh" #include "cpu/thread_context.hh" +#include "mem/fs_translating_port_proxy.hh" #include "mem/physical.hh" -#include "mem/fs_translating_port_proxy.hh" #include "sim/full_system.hh" using namespace std; diff --git a/src/arch/arm/tlb.cc b/src/arch/arm/tlb.cc --- a/src/arch/arm/tlb.cc +++ b/src/arch/arm/tlb.cc @@ -50,10 +50,10 @@ #include "arch/arm/faults.hh" #include "arch/arm/pagetable.hh" +#include "arch/arm/stage2_lookup.hh" +#include "arch/arm/stage2_mmu.hh" #include "arch/arm/system.hh" #include "arch/arm/table_walker.hh" -#include "arch/arm/stage2_lookup.hh" -#include "arch/arm/stage2_mmu.hh" #include "arch/arm/utility.hh" #include "base/inifile.hh" #include "base/str.hh" diff --git a/src/arch/arm/utility.cc b/src/arch/arm/utility.cc --- a/src/arch/arm/utility.cc +++ b/src/arch/arm/utility.cc @@ -37,16 +37,17 @@ * Authors: Ali Saidi */ +#include "arch/arm/utility.hh" + #include #include "arch/arm/faults.hh" #include "arch/arm/isa_traits.hh" #include "arch/arm/system.hh" #include "arch/arm/tlb.hh" -#include "arch/arm/utility.hh" #include "arch/arm/vtophys.hh" +#include "cpu/base.hh" #include "cpu/checker/cpu.hh" -#include "cpu/base.hh" #include "cpu/thread_context.hh" #include "mem/fs_translating_port_proxy.hh" #include "sim/full_system.hh" diff --git a/src/arch/arm/vtophys.cc b/src/arch/arm/vtophys.cc --- a/src/arch/arm/vtophys.cc +++ b/src/arch/arm/vtophys.cc @@ -43,12 +43,13 @@ * Stephen Hines */ +#include "arch/arm/vtophys.hh" + #include #include "arch/arm/faults.hh" #include "arch/arm/table_walker.hh" #include "arch/arm/tlb.hh" -#include "arch/arm/vtophys.hh" #include "base/chunk_generator.hh" #include "base/trace.hh" #include "cpu/thread_context.hh" diff --git a/src/arch/generic/decode_cache.cc b/src/arch/generic/decode_cache.cc --- a/src/arch/generic/decode_cache.cc +++ b/src/arch/generic/decode_cache.cc @@ -29,6 +29,7 @@ */ #include "arch/generic/decode_cache.hh" + #include "arch/decoder.hh" #include "arch/types.hh" #include "config/the_isa.hh" diff --git a/src/arch/generic/mmapped_ipr.cc b/src/arch/generic/mmapped_ipr.cc --- a/src/arch/generic/mmapped_ipr.cc +++ b/src/arch/generic/mmapped_ipr.cc @@ -29,6 +29,7 @@ */ #include "arch/generic/mmapped_ipr.hh" + #include "mem/packet.hh" #include "mem/packet_access.hh" #include "sim/pseudo_inst.hh" diff --git a/src/arch/generic/pseudo_inst.cc b/src/arch/generic/pseudo_inst.cc --- a/src/arch/generic/pseudo_inst.cc +++ b/src/arch/generic/pseudo_inst.cc @@ -29,6 +29,7 @@ */ #include "arch/generic/pseudo_inst.hh" + #include "base/misc.hh" class ThreadContext; diff --git a/src/arch/hsail/generic_types.cc b/src/arch/hsail/generic_types.cc --- a/src/arch/hsail/generic_types.cc +++ b/src/arch/hsail/generic_types.cc @@ -1,4 +1,5 @@ #include "arch/hsail/generic_types.hh" + #include "base/misc.hh" using namespace Brig; diff --git a/src/arch/mips/bare_iron/system.cc b/src/arch/mips/bare_iron/system.cc --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- a/src/arch/mips/linux/process.cc +++ b/src/arch/mips/linux/process.cc @@ -30,9 +30,10 @@ * Korey Sewell */ +#include "arch/mips/linux/process.hh" + +#include "arch/mips/isa_traits.hh" #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 "debug/SyscallVerbose.hh" diff --git a/src/arch/mips/linux/system.cc b/src/arch/mips/linux/system.cc --- a/src/arch/mips/linux/system.cc +++ b/src/arch/mips/linux/system.cc @@ -39,8 +39,9 @@ * up boot time. */ +#include "arch/mips/linux/system.hh" + #include "arch/generic/linux/threadinfo.hh" -#include "arch/mips/linux/system.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 --- 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 --- a/src/arch/mips/process.cc +++ b/src/arch/mips/process.cc @@ -30,8 +30,9 @@ * Korey Sewell */ +#include "arch/mips/process.hh" + #include "arch/mips/isa_traits.hh" -#include "arch/mips/process.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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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" diff --git a/src/arch/power/insts/branch.cc b/src/arch/power/insts/branch.cc --- a/src/arch/power/insts/branch.cc +++ b/src/arch/power/insts/branch.cc @@ -29,6 +29,7 @@ */ #include "arch/power/insts/branch.hh" + #include "base/loader/symtab.hh" #include "cpu/thread_context.hh" diff --git a/src/arch/power/insts/mem.cc b/src/arch/power/insts/mem.cc --- a/src/arch/power/insts/mem.cc +++ b/src/arch/power/insts/mem.cc @@ -29,6 +29,7 @@ */ #include "arch/power/insts/mem.hh" + #include "base/loader/symtab.hh" using namespace PowerISA; diff --git a/src/arch/power/insts/static_inst.cc b/src/arch/power/insts/static_inst.cc --- a/src/arch/power/insts/static_inst.cc +++ b/src/arch/power/insts/static_inst.cc @@ -30,6 +30,7 @@ */ #include "arch/power/insts/static_inst.hh" + #include "cpu/reg_class.hh" using namespace PowerISA; diff --git a/src/arch/power/isa.cc b/src/arch/power/isa.cc --- a/src/arch/power/isa.cc +++ b/src/arch/power/isa.cc @@ -38,6 +38,7 @@ */ #include "arch/power/isa.hh" + #include "params/PowerISA.hh" namespace PowerISA diff --git a/src/arch/power/linux/process.cc b/src/arch/power/linux/process.cc --- a/src/arch/power/linux/process.cc +++ b/src/arch/power/linux/process.cc @@ -32,9 +32,10 @@ * Timothy M. Jones */ +#include "arch/power/linux/process.hh" + +#include "arch/power/isa_traits.hh" #include "arch/power/linux/linux.hh" -#include "arch/power/linux/process.hh" -#include "arch/power/isa_traits.hh" #include "base/trace.hh" #include "cpu/thread_context.hh" #include "kern/linux/linux.hh" diff --git a/src/arch/power/pagetable.cc b/src/arch/power/pagetable.cc --- a/src/arch/power/pagetable.cc +++ b/src/arch/power/pagetable.cc @@ -36,6 +36,7 @@ */ #include "arch/power/pagetable.hh" + #include "sim/serialize.hh" namespace PowerISA diff --git a/src/arch/power/process.cc b/src/arch/power/process.cc --- a/src/arch/power/process.cc +++ b/src/arch/power/process.cc @@ -30,8 +30,9 @@ * Timothy M. Jones */ +#include "arch/power/process.hh" + #include "arch/power/isa_traits.hh" -#include "arch/power/process.hh" #include "arch/power/types.hh" #include "base/loader/elf_object.hh" #include "base/loader/object_file.hh" diff --git a/src/arch/power/stacktrace.cc b/src/arch/power/stacktrace.cc --- a/src/arch/power/stacktrace.cc +++ b/src/arch/power/stacktrace.cc @@ -28,9 +28,10 @@ * Authors: Nathan Binkert */ +#include "arch/power/stacktrace.hh" + #include -#include "arch/power/stacktrace.hh" #include "base/trace.hh" using namespace std; diff --git a/src/arch/power/tlb.cc b/src/arch/power/tlb.cc --- a/src/arch/power/tlb.cc +++ b/src/arch/power/tlb.cc @@ -35,12 +35,13 @@ * Timothy M. Jones */ +#include "arch/power/tlb.hh" + #include #include #include "arch/power/faults.hh" #include "arch/power/pagetable.hh" -#include "arch/power/tlb.hh" #include "arch/power/utility.hh" #include "base/inifile.hh" #include "base/str.hh" diff --git a/src/arch/power/utility.cc b/src/arch/power/utility.cc --- a/src/arch/power/utility.cc +++ b/src/arch/power/utility.cc @@ -33,6 +33,7 @@ */ #include "arch/power/utility.hh" + #include "base/misc.hh" namespace PowerISA { diff --git a/src/arch/sparc/faults.cc b/src/arch/sparc/faults.cc --- a/src/arch/sparc/faults.cc +++ b/src/arch/sparc/faults.cc @@ -29,20 +29,20 @@ * Kevin Lim */ +#include "arch/sparc/faults.hh" + #include -#include "arch/sparc/faults.hh" #include "arch/sparc/isa_traits.hh" #include "arch/sparc/process.hh" #include "arch/sparc/types.hh" #include "base/bitfield.hh" #include "base/trace.hh" -#include "sim/full_system.hh" #include "cpu/base.hh" #include "cpu/thread_context.hh" #include "mem/page_table.hh" +#include "sim/full_system.hh" #include "sim/process.hh" -#include "sim/full_system.hh" using namespace std; diff --git a/src/arch/sparc/isa.cc b/src/arch/sparc/isa.cc --- a/src/arch/sparc/isa.cc +++ b/src/arch/sparc/isa.cc @@ -28,9 +28,10 @@ * Authors: Gabe Black */ +#include "arch/sparc/isa.hh" + #include "arch/sparc/asi.hh" #include "arch/sparc/decoder.hh" -#include "arch/sparc/isa.hh" #include "base/bitfield.hh" #include "base/trace.hh" #include "cpu/base.hh" diff --git a/src/arch/sparc/linux/process.cc b/src/arch/sparc/linux/process.cc --- a/src/arch/sparc/linux/process.cc +++ b/src/arch/sparc/linux/process.cc @@ -31,6 +31,7 @@ */ #include "arch/sparc/linux/process.hh" + #include "arch/sparc/isa_traits.hh" #include "arch/sparc/registers.hh" #include "base/trace.hh" diff --git a/src/arch/sparc/nativetrace.cc b/src/arch/sparc/nativetrace.cc --- a/src/arch/sparc/nativetrace.cc +++ b/src/arch/sparc/nativetrace.cc @@ -28,8 +28,9 @@ * Authors: Gabe Black */ +#include "arch/sparc/nativetrace.hh" + #include "arch/sparc/isa_traits.hh" -#include "arch/sparc/nativetrace.hh" #include "arch/sparc/registers.hh" #include "cpu/thread_context.hh" #include "params/SparcNativeTrace.hh" diff --git a/src/arch/sparc/pagetable.cc b/src/arch/sparc/pagetable.cc --- a/src/arch/sparc/pagetable.cc +++ b/src/arch/sparc/pagetable.cc @@ -29,6 +29,7 @@ */ #include "arch/sparc/pagetable.hh" + #include "sim/serialize.hh" namespace SparcISA diff --git a/src/arch/sparc/process.cc b/src/arch/sparc/process.cc --- a/src/arch/sparc/process.cc +++ b/src/arch/sparc/process.cc @@ -29,10 +29,11 @@ * Ali Saidi */ +#include "arch/sparc/process.hh" + #include "arch/sparc/asi.hh" #include "arch/sparc/handlers.hh" #include "arch/sparc/isa_traits.hh" -#include "arch/sparc/process.hh" #include "arch/sparc/registers.hh" #include "arch/sparc/types.hh" #include "base/loader/elf_object.hh" diff --git a/src/arch/sparc/remote_gdb.cc b/src/arch/sparc/remote_gdb.cc --- a/src/arch/sparc/remote_gdb.cc +++ b/src/arch/sparc/remote_gdb.cc @@ -119,13 +119,14 @@ * "Stub" to allow remote cpu to debug over a serial line using gdb. */ -#include +#include "arch/sparc/remote_gdb.hh" + #include #include +#include #include -#include "arch/sparc/remote_gdb.hh" #include "arch/vtophys.hh" #include "base/intmath.hh" #include "base/remote_gdb.hh" diff --git a/src/arch/sparc/solaris/process.cc b/src/arch/sparc/solaris/process.cc --- a/src/arch/sparc/solaris/process.cc +++ b/src/arch/sparc/solaris/process.cc @@ -29,6 +29,7 @@ */ #include "arch/sparc/solaris/process.hh" + #include "arch/sparc/isa_traits.hh" #include "arch/sparc/registers.hh" #include "base/trace.hh" diff --git a/src/arch/sparc/system.cc b/src/arch/sparc/system.cc --- a/src/arch/sparc/system.cc +++ b/src/arch/sparc/system.cc @@ -29,6 +29,7 @@ */ #include "arch/sparc/system.hh" + #include "arch/vtophys.hh" #include "base/loader/object_file.hh" #include "base/loader/symtab.hh" diff --git a/src/arch/sparc/tlb.cc b/src/arch/sparc/tlb.cc --- a/src/arch/sparc/tlb.cc +++ b/src/arch/sparc/tlb.cc @@ -28,12 +28,13 @@ * Authors: Ali Saidi */ +#include "arch/sparc/tlb.hh" + #include #include "arch/sparc/asi.hh" #include "arch/sparc/faults.hh" #include "arch/sparc/registers.hh" -#include "arch/sparc/tlb.hh" #include "base/bitfield.hh" #include "base/trace.hh" #include "cpu/base.hh" diff --git a/src/arch/sparc/ua2005.cc b/src/arch/sparc/ua2005.cc --- a/src/arch/sparc/ua2005.cc +++ b/src/arch/sparc/ua2005.cc @@ -35,8 +35,8 @@ #include "cpu/thread_context.hh" #include "debug/Quiesce.hh" #include "debug/Timer.hh" +#include "sim/full_system.hh" #include "sim/system.hh" -#include "sim/full_system.hh" using namespace SparcISA; using namespace std; diff --git a/src/arch/sparc/utility.cc b/src/arch/sparc/utility.cc --- a/src/arch/sparc/utility.cc +++ b/src/arch/sparc/utility.cc @@ -29,8 +29,9 @@ * Ali Saidi */ +#include "arch/sparc/utility.hh" + #include "arch/sparc/faults.hh" -#include "arch/sparc/utility.hh" #include "arch/sparc/vtophys.hh" #include "mem/fs_translating_port_proxy.hh" diff --git a/src/arch/sparc/vtophys.cc b/src/arch/sparc/vtophys.cc --- a/src/arch/sparc/vtophys.cc +++ b/src/arch/sparc/vtophys.cc @@ -28,10 +28,11 @@ * Authors: Ali Saidi */ +#include "arch/sparc/vtophys.hh" + #include #include "arch/sparc/tlb.hh" -#include "arch/sparc/vtophys.hh" #include "base/chunk_generator.hh" #include "base/compiler.hh" #include "base/trace.hh" diff --git a/src/arch/x86/bios/acpi.cc b/src/arch/x86/bios/acpi.cc --- a/src/arch/x86/bios/acpi.cc +++ b/src/arch/x86/bios/acpi.cc @@ -38,6 +38,7 @@ */ #include "arch/x86/bios/acpi.hh" + #include "mem/port.hh" #include "params/X86ACPIRSDP.hh" #include "params/X86ACPIRSDT.hh" diff --git a/src/arch/x86/bios/e820.cc b/src/arch/x86/bios/e820.cc --- a/src/arch/x86/bios/e820.cc +++ b/src/arch/x86/bios/e820.cc @@ -38,6 +38,7 @@ */ #include "arch/x86/bios/e820.hh" + #include "arch/x86/isa_traits.hh" #include "mem/port_proxy.hh" #include "sim/byteswap.hh" diff --git a/src/arch/x86/bios/intelmp.cc b/src/arch/x86/bios/intelmp.cc --- a/src/arch/x86/bios/intelmp.cc +++ b/src/arch/x86/bios/intelmp.cc @@ -38,6 +38,7 @@ */ #include "arch/x86/bios/intelmp.hh" + #include "arch/x86/isa_traits.hh" #include "base/misc.hh" #include "base/types.hh" diff --git a/src/arch/x86/bios/smbios.cc b/src/arch/x86/bios/smbios.cc --- a/src/arch/x86/bios/smbios.cc +++ b/src/arch/x86/bios/smbios.cc @@ -41,6 +41,7 @@ */ #include "arch/x86/bios/smbios.hh" + #include "arch/x86/isa_traits.hh" #include "base/types.hh" #include "mem/port_proxy.hh" diff --git a/src/arch/x86/cpuid.cc b/src/arch/x86/cpuid.cc --- a/src/arch/x86/cpuid.cc +++ b/src/arch/x86/cpuid.cc @@ -29,6 +29,7 @@ */ #include "arch/x86/cpuid.hh" + #include "base/bitfield.hh" #include "cpu/thread_context.hh" diff --git a/src/arch/x86/decoder.cc b/src/arch/x86/decoder.cc --- a/src/arch/x86/decoder.cc +++ b/src/arch/x86/decoder.cc @@ -29,6 +29,7 @@ */ #include "arch/x86/decoder.hh" + #include "arch/x86/regs/misc.hh" #include "base/misc.hh" #include "base/trace.hh" diff --git a/src/arch/x86/emulenv.cc b/src/arch/x86/emulenv.cc --- a/src/arch/x86/emulenv.cc +++ b/src/arch/x86/emulenv.cc @@ -37,9 +37,10 @@ * Authors: Gabe Black */ +#include "arch/x86/emulenv.hh" + #include -#include "arch/x86/emulenv.hh" #include "base/misc.hh" using namespace X86ISA; diff --git a/src/arch/x86/faults.cc b/src/arch/x86/faults.cc --- a/src/arch/x86/faults.cc +++ b/src/arch/x86/faults.cc @@ -40,8 +40,9 @@ * Authors: Gabe Black */ +#include "arch/x86/faults.hh" + #include "arch/x86/generated/decoder.hh" -#include "arch/x86/faults.hh" #include "arch/x86/isa_traits.hh" #include "base/trace.hh" #include "cpu/thread_context.hh" diff --git a/src/arch/x86/insts/badmicroop.cc b/src/arch/x86/insts/badmicroop.cc --- a/src/arch/x86/insts/badmicroop.cc +++ b/src/arch/x86/insts/badmicroop.cc @@ -37,8 +37,9 @@ * Authors: Gabe Black */ +#include "arch/x86/insts/badmicroop.hh" + #include "arch/x86/generated/decoder.hh" -#include "arch/x86/insts/badmicroop.hh" #include "arch/x86/isa_traits.hh" namespace X86ISA diff --git a/src/arch/x86/insts/microfpop.cc b/src/arch/x86/insts/microfpop.cc --- a/src/arch/x86/insts/microfpop.cc +++ b/src/arch/x86/insts/microfpop.cc @@ -37,9 +37,10 @@ * Authors: Gabe Black */ +#include "arch/x86/insts/microfpop.hh" + #include -#include "arch/x86/insts/microfpop.hh" #include "arch/x86/regs/misc.hh" namespace X86ISA diff --git a/src/arch/x86/insts/microldstop.cc b/src/arch/x86/insts/microldstop.cc --- a/src/arch/x86/insts/microldstop.cc +++ b/src/arch/x86/insts/microldstop.cc @@ -38,10 +38,10 @@ * Authors: Gabe Black */ +#include "arch/x86/insts/microldstop.hh" + #include -#include "arch/x86/insts/microldstop.hh" - namespace X86ISA { std::string LdStOp::generateDisassembly(Addr pc, diff --git a/src/arch/x86/insts/micromediaop.cc b/src/arch/x86/insts/micromediaop.cc --- a/src/arch/x86/insts/micromediaop.cc +++ b/src/arch/x86/insts/micromediaop.cc @@ -28,9 +28,10 @@ * Authors: Gabe Black */ +#include "arch/x86/insts/micromediaop.hh" + #include -#include "arch/x86/insts/micromediaop.hh" #include "arch/x86/regs/misc.hh" namespace X86ISA diff --git a/src/arch/x86/insts/microop.cc b/src/arch/x86/insts/microop.cc --- a/src/arch/x86/insts/microop.cc +++ b/src/arch/x86/insts/microop.cc @@ -38,6 +38,7 @@ */ #include "arch/x86/insts/microop.hh" + #include "arch/x86/regs/misc.hh" namespace X86ISA diff --git a/src/arch/x86/insts/microregop.cc b/src/arch/x86/insts/microregop.cc --- a/src/arch/x86/insts/microregop.cc +++ b/src/arch/x86/insts/microregop.cc @@ -37,9 +37,10 @@ * Authors: Gabe Black */ +#include "arch/x86/insts/microregop.hh" + #include -#include "arch/x86/insts/microregop.hh" #include "arch/x86/regs/misc.hh" #include "base/condcodes.hh" #include "debug/X86.hh" diff --git a/src/arch/x86/insts/static_inst.cc b/src/arch/x86/insts/static_inst.cc --- a/src/arch/x86/insts/static_inst.cc +++ b/src/arch/x86/insts/static_inst.cc @@ -39,6 +39,7 @@ */ #include "arch/x86/insts/static_inst.hh" + #include "arch/x86/regs/segment.hh" #include "cpu/reg_class.hh" diff --git a/src/arch/x86/interrupts.cc b/src/arch/x86/interrupts.cc --- a/src/arch/x86/interrupts.cc +++ b/src/arch/x86/interrupts.cc @@ -49,19 +49,20 @@ * Authors: Gabe Black */ +#include "arch/x86/interrupts.hh" + #include +#include "arch/x86/intmessage.hh" #include "arch/x86/regs/apic.hh" -#include "arch/x86/interrupts.hh" -#include "arch/x86/intmessage.hh" #include "cpu/base.hh" #include "debug/LocalApic.hh" #include "dev/x86/i82094aa.hh" #include "dev/x86/pc.hh" #include "dev/x86/south_bridge.hh" #include "mem/packet_access.hh" +#include "sim/full_system.hh" #include "sim/system.hh" -#include "sim/full_system.hh" int divideFromConf(uint32_t conf) diff --git a/src/arch/x86/isa.cc b/src/arch/x86/isa.cc --- a/src/arch/x86/isa.cc +++ b/src/arch/x86/isa.cc @@ -28,8 +28,9 @@ * Authors: Gabe Black */ +#include "arch/x86/isa.hh" + #include "arch/x86/decoder.hh" -#include "arch/x86/isa.hh" #include "arch/x86/tlb.hh" #include "cpu/base.hh" #include "cpu/thread_context.hh" diff --git a/src/arch/x86/linux/process.cc b/src/arch/x86/linux/process.cc --- a/src/arch/x86/linux/process.cc +++ b/src/arch/x86/linux/process.cc @@ -37,9 +37,10 @@ * Authors: Gabe Black */ +#include "arch/x86/linux/process.hh" + +#include "arch/x86/isa_traits.hh" #include "arch/x86/linux/linux.hh" -#include "arch/x86/linux/process.hh" -#include "arch/x86/isa_traits.hh" #include "arch/x86/registers.hh" #include "base/trace.hh" #include "cpu/thread_context.hh" diff --git a/src/arch/x86/linux/system.cc b/src/arch/x86/linux/system.cc --- a/src/arch/x86/linux/system.cc +++ b/src/arch/x86/linux/system.cc @@ -38,9 +38,10 @@ */ #include "arch/x86/linux/system.hh" + +#include "arch/vtophys.hh" +#include "arch/x86/isa_traits.hh" #include "arch/x86/regs/int.hh" -#include "arch/x86/isa_traits.hh" -#include "arch/vtophys.hh" #include "base/trace.hh" #include "cpu/thread_context.hh" #include "mem/port_proxy.hh" diff --git a/src/arch/x86/nativetrace.cc b/src/arch/x86/nativetrace.cc --- a/src/arch/x86/nativetrace.cc +++ b/src/arch/x86/nativetrace.cc @@ -28,10 +28,11 @@ * Authors: Gabe Black */ +#include "arch/x86/nativetrace.hh" + +#include "arch/x86/isa_traits.hh" #include "arch/x86/regs/float.hh" #include "arch/x86/regs/int.hh" -#include "arch/x86/isa_traits.hh" -#include "arch/x86/nativetrace.hh" #include "cpu/thread_context.hh" #include "debug/ExecRegDelta.hh" #include "params/X86NativeTrace.hh" diff --git a/src/arch/x86/pagetable.cc b/src/arch/x86/pagetable.cc --- a/src/arch/x86/pagetable.cc +++ b/src/arch/x86/pagetable.cc @@ -37,9 +37,11 @@ * Authors: Gabe Black */ +#include "arch/x86/pagetable.hh" + #include + #include "arch/x86/isa_traits.hh" -#include "arch/x86/pagetable.hh" #include "sim/serialize.hh" namespace X86ISA diff --git a/src/arch/x86/pagetable_walker.cc b/src/arch/x86/pagetable_walker.cc --- a/src/arch/x86/pagetable_walker.cc +++ b/src/arch/x86/pagetable_walker.cc @@ -49,10 +49,11 @@ * Authors: Gabe Black */ +#include "arch/x86/pagetable_walker.hh" + #include #include "arch/x86/pagetable.hh" -#include "arch/x86/pagetable_walker.hh" #include "arch/x86/tlb.hh" #include "arch/x86/vtophys.hh" #include "base/bitfield.hh" diff --git a/src/arch/x86/process.cc b/src/arch/x86/process.cc --- a/src/arch/x86/process.cc +++ b/src/arch/x86/process.cc @@ -42,10 +42,11 @@ * Ali Saidi */ +#include "arch/x86/process.hh" + +#include "arch/x86/isa_traits.hh" #include "arch/x86/regs/misc.hh" #include "arch/x86/regs/segment.hh" -#include "arch/x86/isa_traits.hh" -#include "arch/x86/process.hh" #include "arch/x86/system.hh" #include "arch/x86/types.hh" #include "base/loader/elf_object.hh" diff --git a/src/arch/x86/pseudo_inst.cc b/src/arch/x86/pseudo_inst.cc --- a/src/arch/x86/pseudo_inst.cc +++ b/src/arch/x86/pseudo_inst.cc @@ -29,6 +29,7 @@ */ #include "arch/x86/pseudo_inst.hh" + #include "arch/x86/system.hh" #include "debug/PseudoInst.hh" #include "sim/process.hh" diff --git a/src/arch/x86/remote_gdb.cc b/src/arch/x86/remote_gdb.cc --- a/src/arch/x86/remote_gdb.cc +++ b/src/arch/x86/remote_gdb.cc @@ -40,17 +40,18 @@ * Boris Shingarov */ +#include "arch/x86/remote_gdb.hh" + #include #include #include +#include "arch/vtophys.hh" +#include "arch/x86/pagetable_walker.hh" +#include "arch/x86/process.hh" #include "arch/x86/regs/int.hh" #include "arch/x86/regs/misc.hh" -#include "arch/x86/pagetable_walker.hh" -#include "arch/x86/process.hh" -#include "arch/x86/remote_gdb.hh" -#include "arch/vtophys.hh" #include "base/remote_gdb.hh" #include "base/socket.hh" #include "base/trace.hh" diff --git a/src/arch/x86/stacktrace.cc b/src/arch/x86/stacktrace.cc --- a/src/arch/x86/stacktrace.cc +++ b/src/arch/x86/stacktrace.cc @@ -28,10 +28,11 @@ * Authors: Nathan Binkert */ +#include "arch/x86/stacktrace.hh" + #include #include "arch/x86/isa_traits.hh" -#include "arch/x86/stacktrace.hh" #include "arch/x86/vtophys.hh" #include "base/bitfield.hh" #include "base/trace.hh" diff --git a/src/arch/x86/system.cc b/src/arch/x86/system.cc --- a/src/arch/x86/system.cc +++ b/src/arch/x86/system.cc @@ -37,15 +37,16 @@ * Authors: Gabe Black */ +#include "arch/x86/system.hh" + +#include "arch/vtophys.hh" #include "arch/x86/bios/intelmp.hh" #include "arch/x86/bios/smbios.hh" +#include "arch/x86/isa_traits.hh" #include "arch/x86/regs/misc.hh" -#include "arch/x86/isa_traits.hh" -#include "arch/x86/system.hh" -#include "arch/vtophys.hh" +#include "base/intmath.hh" #include "base/loader/object_file.hh" #include "base/loader/symtab.hh" -#include "base/intmath.hh" #include "base/trace.hh" #include "cpu/thread_context.hh" #include "mem/port_proxy.hh" diff --git a/src/arch/x86/tlb.cc b/src/arch/x86/tlb.cc --- a/src/arch/x86/tlb.cc +++ b/src/arch/x86/tlb.cc @@ -37,17 +37,18 @@ * Authors: Gabe Black */ +#include "arch/x86/tlb.hh" + #include #include #include "arch/generic/mmapped_ipr.hh" +#include "arch/x86/faults.hh" #include "arch/x86/insts/microldstop.hh" +#include "arch/x86/pagetable.hh" +#include "arch/x86/pagetable_walker.hh" #include "arch/x86/regs/misc.hh" #include "arch/x86/regs/msr.hh" -#include "arch/x86/faults.hh" -#include "arch/x86/pagetable.hh" -#include "arch/x86/pagetable_walker.hh" -#include "arch/x86/tlb.hh" #include "arch/x86/x86_traits.hh" #include "base/bitfield.hh" #include "base/trace.hh" diff --git a/src/arch/x86/types.cc b/src/arch/x86/types.cc --- a/src/arch/x86/types.cc +++ b/src/arch/x86/types.cc @@ -29,6 +29,7 @@ */ #include "arch/x86/types.hh" + #include "sim/serialize.hh" using namespace X86ISA; diff --git a/src/arch/x86/utility.cc b/src/arch/x86/utility.cc --- a/src/arch/x86/utility.cc +++ b/src/arch/x86/utility.cc @@ -38,10 +38,11 @@ * Authors: Gabe Black */ +#include "arch/x86/utility.hh" + #include "arch/x86/interrupts.hh" #include "arch/x86/registers.hh" #include "arch/x86/tlb.hh" -#include "arch/x86/utility.hh" #include "arch/x86/x86_traits.hh" #include "cpu/base.hh" #include "fputils/fp80.h" diff --git a/src/arch/x86/vtophys.cc b/src/arch/x86/vtophys.cc --- a/src/arch/x86/vtophys.cc +++ b/src/arch/x86/vtophys.cc @@ -37,11 +37,12 @@ * Authors: Gabe Black */ +#include "arch/x86/vtophys.hh" + #include #include "arch/x86/pagetable_walker.hh" #include "arch/x86/tlb.hh" -#include "arch/x86/vtophys.hh" #include "base/trace.hh" #include "cpu/thread_context.hh" #include "debug/VtoPhys.hh" diff --git a/src/base/atomicio.cc b/src/base/atomicio.cc --- a/src/base/atomicio.cc +++ b/src/base/atomicio.cc @@ -28,11 +28,11 @@ * Authors: Nathan Binkert */ +#include "base/atomicio.hh" + #include #include -#include "base/atomicio.hh" - ssize_t atomic_read(int fd, void *s, size_t n) { diff --git a/src/base/bigint.cc b/src/base/bigint.cc --- a/src/base/bigint.cc +++ b/src/base/bigint.cc @@ -28,10 +28,10 @@ * Authors: Gabe Black */ +#include "base/bigint.hh" + #include -#include "base/bigint.hh" - using namespace std; ostream & operator << (ostream & os, const Twin64_t & t) diff --git a/src/base/cp_annotate.cc b/src/base/cp_annotate.cc --- a/src/base/cp_annotate.cc +++ b/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/callback.hh" #include "base/loader/object_file.hh" -#include "base/callback.hh" -#include "base/cp_annotate.hh" #include "base/output.hh" #include "base/trace.hh" #include "config/the_isa.hh" diff --git a/src/base/cprintf.cc b/src/base/cprintf.cc --- a/src/base/cprintf.cc +++ b/src/base/cprintf.cc @@ -28,13 +28,13 @@ * Authors: Nathan Binkert */ +#include "base/cprintf.hh" + #include #include #include #include -#include "base/cprintf.hh" - using namespace std; namespace cp { diff --git a/src/base/debug.cc b/src/base/debug.cc --- a/src/base/debug.cc +++ b/src/base/debug.cc @@ -28,6 +28,8 @@ * Authors: Nathan Binkert */ +#include "base/debug.hh" + #include #include @@ -35,7 +37,6 @@ #include #include "base/cprintf.hh" -#include "base/debug.hh" #include "base/misc.hh" using namespace std; diff --git a/src/base/hostinfo.cc b/src/base/hostinfo.cc --- a/src/base/hostinfo.cc +++ b/src/base/hostinfo.cc @@ -34,8 +34,11 @@ #include #include #include + #endif +#include "base/hostinfo.hh" + #include #include #include @@ -44,7 +47,6 @@ #include #include -#include "base/hostinfo.hh" #include "base/misc.hh" #include "base/str.hh" #include "base/types.hh" diff --git a/src/base/inet.cc b/src/base/inet.cc --- a/src/base/inet.cc +++ b/src/base/inet.cc @@ -43,13 +43,14 @@ * Geoffrey Blake */ +#include "base/inet.hh" + #include #include #include #include #include "base/cprintf.hh" -#include "base/inet.hh" #include "base/types.hh" using namespace std; diff --git a/src/base/inifile.cc b/src/base/inifile.cc --- a/src/base/inifile.cc +++ b/src/base/inifile.cc @@ -29,13 +29,14 @@ * Steve Reinhardt */ +#include "base/inifile.hh" + #include #include #include #include #include -#include "base/inifile.hh" #include "base/str.hh" using namespace std; diff --git a/src/base/loader/aout_object.cc b/src/base/loader/aout_object.cc --- a/src/base/loader/aout_object.cc +++ b/src/base/loader/aout_object.cc @@ -28,9 +28,10 @@ * Authors: Steve Reinhardt */ +#include "base/loader/aout_object.hh" + #include -#include "base/loader/aout_object.hh" #include "base/loader/exec_aout.h" #include "base/loader/symtab.hh" #include "base/trace.hh" diff --git a/src/base/loader/dtb_object.cc b/src/base/loader/dtb_object.cc --- a/src/base/loader/dtb_object.cc +++ b/src/base/loader/dtb_object.cc @@ -35,9 +35,9 @@ #include -#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) diff --git a/src/base/loader/ecoff_object.cc b/src/base/loader/ecoff_object.cc --- a/src/base/loader/ecoff_object.cc +++ b/src/base/loader/ecoff_object.cc @@ -28,9 +28,10 @@ * Authors: Steve Reinhardt */ +#include "base/loader/ecoff_object.hh" + #include -#include "base/loader/ecoff_object.hh" #include "base/loader/symtab.hh" #include "base/misc.hh" #include "base/trace.hh" diff --git a/src/base/loader/hex_file.cc b/src/base/loader/hex_file.cc --- a/src/base/loader/hex_file.cc +++ b/src/base/loader/hex_file.cc @@ -28,14 +28,15 @@ * Authors: Jaidev Patwardhan */ +#include "base/loader/hex_file.hh" + #include #include #include #include -#include "base/loader/hex_file.hh" +#include "base/cprintf.hh" #include "base/loader/symtab.hh" -#include "base/cprintf.hh" #include "mem/port_proxy.hh" using namespace std; diff --git a/src/base/loader/object_file.cc b/src/base/loader/object_file.cc --- a/src/base/loader/object_file.cc +++ b/src/base/loader/object_file.cc @@ -29,9 +29,11 @@ * Steve Reinhardt */ +#include "base/loader/object_file.hh" + +#include #include #include -#include #include #include @@ -39,14 +41,13 @@ #include #include +#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; diff --git a/src/base/loader/raw_object.cc b/src/base/loader/raw_object.cc --- a/src/base/loader/raw_object.cc +++ b/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" diff --git a/src/base/loader/symtab.cc b/src/base/loader/symtab.cc --- a/src/base/loader/symtab.cc +++ b/src/base/loader/symtab.cc @@ -28,12 +28,13 @@ * Authors: Nathan Binkert */ +#include "base/loader/symtab.hh" + #include #include #include #include -#include "base/loader/symtab.hh" #include "base/misc.hh" #include "base/str.hh" #include "base/types.hh" diff --git a/src/base/match.cc b/src/base/match.cc --- a/src/base/match.cc +++ b/src/base/match.cc @@ -29,6 +29,7 @@ */ #include "base/match.hh" + #include "base/str.hh" using namespace std; diff --git a/src/base/misc.cc b/src/base/misc.cc --- a/src/base/misc.cc +++ b/src/base/misc.cc @@ -41,13 +41,14 @@ * Andreas Sandberg */ +#include "base/misc.hh" + #include #include #include #include "base/cprintf.hh" #include "base/hostinfo.hh" -#include "base/misc.hh" #include "base/output.hh" #include "base/trace.hh" #include "base/types.hh" diff --git a/src/base/output.cc b/src/base/output.cc --- a/src/base/output.cc +++ b/src/base/output.cc @@ -44,10 +44,13 @@ * Sascha Bischoff */ +#include "base/output.hh" + +#include #include #include -#include #include +#include #include #include @@ -55,10 +58,7 @@ #include #include -#include - #include "base/misc.hh" -#include "base/output.hh" using namespace std; diff --git a/src/base/pollevent.cc b/src/base/pollevent.cc --- a/src/base/pollevent.cc +++ b/src/base/pollevent.cc @@ -30,17 +30,20 @@ #include #include + #if defined(__sun__) || defined(__SUNPRO_CC) #include + #endif +#include "base/pollevent.hh" + #include #include #include #include "base/misc.hh" -#include "base/pollevent.hh" #include "base/types.hh" #include "sim/async.hh" #include "sim/core.hh" diff --git a/src/base/random.cc b/src/base/random.cc --- a/src/base/random.cc +++ b/src/base/random.cc @@ -42,10 +42,11 @@ * Andreas Hansson */ +#include "base/random.hh" + #include #include "base/misc.hh" -#include "base/random.hh" #include "sim/serialize.hh" Random::Random() diff --git a/src/base/remote_gdb.cc b/src/base/remote_gdb.cc --- a/src/base/remote_gdb.cc +++ b/src/base/remote_gdb.cc @@ -119,16 +119,17 @@ * "Stub" to allow remote cpu to debug over a serial line using gdb. */ -#include +#include "base/remote_gdb.hh" + #include #include +#include #include #include #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/fs_translating_port_proxy.hh" #include "mem/port.hh" -#include "mem/fs_translating_port_proxy.hh" #include "mem/se_translating_port_proxy.hh" #include "sim/full_system.hh" #include "sim/system.hh" diff --git a/src/base/socket.cc b/src/base/socket.cc --- a/src/base/socket.cc +++ b/src/base/socket.cc @@ -28,6 +28,8 @@ * Authors: Nathan Binkert */ +#include "base/socket.hh" + #include #include #include @@ -37,7 +39,6 @@ #include #include "base/misc.hh" -#include "base/socket.hh" #include "base/types.hh" using namespace std; diff --git a/src/base/statistics.cc b/src/base/statistics.cc --- a/src/base/statistics.cc +++ b/src/base/statistics.cc @@ -28,6 +28,8 @@ * Authors: Nathan Binkert */ +#include "base/statistics.hh" + #include #include #include @@ -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" diff --git a/src/base/stats/text.cc b/src/base/stats/text.cc --- a/src/base/stats/text.cc +++ b/src/base/stats/text.cc @@ -33,23 +33,27 @@ #endif #if defined(__sun) -#include +#include + #endif #include + #ifdef __SUNPRO_CC -#include +#include + #endif +#include "base/stats/text.hh" + #include #include #include #include #include -#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; diff --git a/src/base/str.cc b/src/base/str.cc --- a/src/base/str.cc +++ b/src/base/str.cc @@ -28,11 +28,11 @@ * Authors: Nathan Binkert */ +#include "base/str.hh" + #include #include -#include "base/str.hh" - using namespace std; bool diff --git a/src/base/time.cc b/src/base/time.cc --- a/src/base/time.cc +++ b/src/base/time.cc @@ -28,12 +28,13 @@ * Authors: Nathan Binkert */ +#include "base/time.hh" + #include #include #include #include -#include "base/time.hh" #include "config/use_posix_clock.hh" #include "sim/core.hh" #include "sim/serialize.hh" diff --git a/src/base/trace.cc b/src/base/trace.cc --- a/src/base/trace.cc +++ b/src/base/trace.cc @@ -33,6 +33,8 @@ * Andrew Bardsley */ +#include "base/trace.hh" + #include #include #include @@ -43,7 +45,6 @@ #include "base/misc.hh" #include "base/output.hh" #include "base/str.hh" -#include "base/trace.hh" const std::string &name() { diff --git a/src/base/vnc/vncinput.cc b/src/base/vnc/vncinput.cc --- a/src/base/vnc/vncinput.cc +++ b/src/base/vnc/vncinput.cc @@ -42,9 +42,10 @@ * Implementiation of a VNC input */ +#include "base/vnc/vncinput.hh" + #include -#include "base/vnc/vncinput.hh" #include "base/output.hh" //simout #include "base/trace.hh" #include "debug/VNC.hh" diff --git a/src/base/vnc/vncserver.cc b/src/base/vnc/vncserver.cc --- a/src/base/vnc/vncserver.cc +++ b/src/base/vnc/vncserver.cc @@ -60,8 +60,8 @@ #include #include +#include #include -#include #include "base/atomicio.hh" #include "base/bitmap.hh" diff --git a/src/cpu/activity.cc b/src/cpu/activity.cc --- a/src/cpu/activity.cc +++ b/src/cpu/activity.cc @@ -28,9 +28,10 @@ * Authors: Kevin Lim */ +#include "cpu/activity.hh" + #include -#include "cpu/activity.hh" #include "cpu/timebuf.hh" #include "debug/Activity.hh" diff --git a/src/cpu/base.cc b/src/cpu/base.cc --- a/src/cpu/base.cc +++ b/src/cpu/base.cc @@ -45,18 +45,19 @@ * Rick Strong */ +#include "cpu/base.hh" + #include #include #include #include "arch/tlb.hh" +#include "base/cprintf.hh" #include "base/loader/symtab.hh" -#include "base/cprintf.hh" #include "base/misc.hh" #include "base/output.hh" #include "base/trace.hh" #include "cpu/checker/cpu.hh" -#include "cpu/base.hh" #include "cpu/cpuevent.hh" #include "cpu/profile.hh" #include "cpu/thread_context.hh" diff --git a/src/cpu/checker/cpu.cc b/src/cpu/checker/cpu.cc --- a/src/cpu/checker/cpu.cc +++ b/src/cpu/checker/cpu.cc @@ -41,13 +41,14 @@ * Geoffrey Blake */ +#include "cpu/checker/cpu.hh" + #include #include #include "arch/generic/tlb.hh" #include "arch/kernel_stats.hh" #include "arch/vtophys.hh" -#include "cpu/checker/cpu.hh" #include "cpu/base.hh" #include "cpu/simple_thread.hh" #include "cpu/static_inst.hh" diff --git a/src/cpu/dummy_checker.cc b/src/cpu/dummy_checker.cc --- a/src/cpu/dummy_checker.cc +++ b/src/cpu/dummy_checker.cc @@ -38,6 +38,7 @@ */ #include "cpu/dummy_checker.hh" + #include "params/DummyChecker.hh" //////////////////////////////////////////////////////////////////////// diff --git a/src/cpu/exetrace.cc b/src/cpu/exetrace.cc --- a/src/cpu/exetrace.cc +++ b/src/cpu/exetrace.cc @@ -31,6 +31,8 @@ * Steve Raasch */ +#include "cpu/exetrace.hh" + #include #include "arch/isa_traits.hh" @@ -38,7 +40,6 @@ #include "base/loader/symtab.hh" #include "config/the_isa.hh" #include "cpu/base.hh" -#include "cpu/exetrace.hh" #include "cpu/static_inst.hh" #include "cpu/thread_context.hh" #include "debug/ExecAll.hh" diff --git a/src/cpu/func_unit.cc b/src/cpu/func_unit.cc --- a/src/cpu/func_unit.cc +++ b/src/cpu/func_unit.cc @@ -28,10 +28,11 @@ * Authors: Steve Raasch */ +#include "cpu/func_unit.hh" + #include #include "base/misc.hh" -#include "cpu/func_unit.hh" using namespace std; diff --git a/src/cpu/inteltrace.cc b/src/cpu/inteltrace.cc --- a/src/cpu/inteltrace.cc +++ b/src/cpu/inteltrace.cc @@ -31,11 +31,12 @@ * Steve Raasch */ +#include "cpu/inteltrace.hh" + #include #include "config/the_isa.hh" #include "cpu/exetrace.hh" -#include "cpu/inteltrace.hh" #include "cpu/static_inst.hh" using namespace std; diff --git a/src/cpu/intr_control.cc b/src/cpu/intr_control.cc --- a/src/cpu/intr_control.cc +++ b/src/cpu/intr_control.cc @@ -29,12 +29,13 @@ * Ron Dreslinski */ +#include "cpu/intr_control.hh" + #include #include #include "base/trace.hh" #include "cpu/base.hh" -#include "cpu/intr_control.hh" #include "cpu/thread_context.hh" #include "debug/IntrControl.hh" #include "sim/sim_object.hh" diff --git a/src/cpu/kvm/base.cc b/src/cpu/kvm/base.cc --- a/src/cpu/kvm/base.cc +++ b/src/cpu/kvm/base.cc @@ -37,6 +37,8 @@ * Authors: Andreas Sandberg */ +#include "cpu/kvm/base.hh" + #include #include #include @@ -48,7 +50,6 @@ #include "arch/mmapped_ipr.hh" #include "arch/utility.hh" -#include "cpu/kvm/base.hh" #include "debug/Checkpoint.hh" #include "debug/Drain.hh" #include "debug/Kvm.hh" @@ -58,8 +59,6 @@ #include "sim/process.hh" #include "sim/system.hh" -#include - /* Used by some KVM macros */ #define PAGE_SIZE pageSize diff --git a/src/cpu/kvm/perfevent.cc b/src/cpu/kvm/perfevent.cc --- a/src/cpu/kvm/perfevent.cc +++ b/src/cpu/kvm/perfevent.cc @@ -37,11 +37,11 @@ * Authors: Andreas Sandberg */ +#include #include #include #include #include -#include #include #include diff --git a/src/cpu/kvm/timer.cc b/src/cpu/kvm/timer.cc --- a/src/cpu/kvm/timer.cc +++ b/src/cpu/kvm/timer.cc @@ -37,15 +37,17 @@ * Authors: Andreas Sandberg */ +#include "cpu/kvm/timer.hh" + +#include +#include + #include #include #include -#include -#include #include "base/misc.hh" #include "base/trace.hh" -#include "cpu/kvm/timer.hh" #include "debug/KvmTimer.hh" /* According to timer_create(2), the value SIGEV_THREAD_ID can be used diff --git a/src/cpu/kvm/vm.cc b/src/cpu/kvm/vm.cc --- a/src/cpu/kvm/vm.cc +++ b/src/cpu/kvm/vm.cc @@ -38,17 +38,18 @@ * Authors: Andreas Sandberg */ +#include "cpu/kvm/vm.hh" + +#include #include #include #include #include -#include #include #include #include -#include "cpu/kvm/vm.hh" #include "debug/Kvm.hh" #include "params/KvmVM.hh" #include "sim/system.hh" diff --git a/src/cpu/kvm/x86_cpu.cc b/src/cpu/kvm/x86_cpu.cc --- a/src/cpu/kvm/x86_cpu.cc +++ b/src/cpu/kvm/x86_cpu.cc @@ -28,18 +28,19 @@ * Authors: Andreas Sandberg */ +#include "cpu/kvm/x86_cpu.hh" + #include #include #include #include +#include "arch/registers.hh" +#include "arch/x86/cpuid.hh" #include "arch/x86/regs/msr.hh" -#include "arch/x86/cpuid.hh" #include "arch/x86/utility.hh" -#include "arch/registers.hh" #include "cpu/kvm/base.hh" -#include "cpu/kvm/x86_cpu.hh" #include "debug/Drain.hh" #include "debug/Kvm.hh" #include "debug/KvmContext.hh" diff --git a/src/cpu/minor/activity.cc b/src/cpu/minor/activity.cc --- a/src/cpu/minor/activity.cc +++ b/src/cpu/minor/activity.cc @@ -37,9 +37,10 @@ * Authors: Andrew Bardsley */ +#include "cpu/minor/activity.hh" + #include -#include "cpu/minor/activity.hh" #include "cpu/minor/trace.hh" namespace Minor diff --git a/src/cpu/minor/cpu.cc b/src/cpu/minor/cpu.cc --- a/src/cpu/minor/cpu.cc +++ b/src/cpu/minor/cpu.cc @@ -37,8 +37,9 @@ * Authors: Andrew Bardsley */ +#include "cpu/minor/cpu.hh" + #include "arch/utility.hh" -#include "cpu/minor/cpu.hh" #include "cpu/minor/dyn_inst.hh" #include "cpu/minor/fetch1.hh" #include "cpu/minor/pipeline.hh" diff --git a/src/cpu/minor/decode.cc b/src/cpu/minor/decode.cc --- a/src/cpu/minor/decode.cc +++ b/src/cpu/minor/decode.cc @@ -38,6 +38,7 @@ */ #include "cpu/minor/decode.hh" + #include "cpu/minor/pipeline.hh" #include "debug/Decode.hh" diff --git a/src/cpu/minor/dyn_inst.cc b/src/cpu/minor/dyn_inst.cc --- a/src/cpu/minor/dyn_inst.cc +++ b/src/cpu/minor/dyn_inst.cc @@ -37,14 +37,15 @@ * Authors: Andrew Bardsley */ +#include "cpu/minor/dyn_inst.hh" + #include #include #include "arch/isa.hh" #include "arch/registers.hh" -#include "cpu/minor/dyn_inst.hh" +#include "cpu/base.hh" #include "cpu/minor/trace.hh" -#include "cpu/base.hh" #include "cpu/reg_class.hh" #include "debug/MinorExecute.hh" #include "enums/OpClass.hh" diff --git a/src/cpu/minor/execute.cc b/src/cpu/minor/execute.cc --- a/src/cpu/minor/execute.cc +++ b/src/cpu/minor/execute.cc @@ -37,12 +37,13 @@ * Authors: Andrew Bardsley */ +#include "cpu/minor/execute.hh" + #include "arch/locked_mem.hh" #include "arch/registers.hh" #include "arch/utility.hh" #include "cpu/minor/cpu.hh" #include "cpu/minor/exec_context.hh" -#include "cpu/minor/execute.hh" #include "cpu/minor/fetch1.hh" #include "cpu/minor/lsq.hh" #include "cpu/op_class.hh" diff --git a/src/cpu/minor/fetch1.cc b/src/cpu/minor/fetch1.cc --- a/src/cpu/minor/fetch1.cc +++ b/src/cpu/minor/fetch1.cc @@ -37,12 +37,13 @@ * Authors: Andrew Bardsley */ +#include "cpu/minor/fetch1.hh" + #include #include #include #include "base/cast.hh" -#include "cpu/minor/fetch1.hh" #include "cpu/minor/pipeline.hh" #include "debug/Drain.hh" #include "debug/Fetch.hh" diff --git a/src/cpu/minor/fetch2.cc b/src/cpu/minor/fetch2.cc --- a/src/cpu/minor/fetch2.cc +++ b/src/cpu/minor/fetch2.cc @@ -37,11 +37,12 @@ * Authors: Andrew Bardsley */ +#include "cpu/minor/fetch2.hh" + #include #include "arch/decoder.hh" #include "arch/utility.hh" -#include "cpu/minor/fetch2.hh" #include "cpu/minor/pipeline.hh" #include "cpu/pred/bpred_unit.hh" #include "debug/Branch.hh" diff --git a/src/cpu/minor/func_unit.cc b/src/cpu/minor/func_unit.cc --- a/src/cpu/minor/func_unit.cc +++ b/src/cpu/minor/func_unit.cc @@ -37,11 +37,12 @@ * Authors: Andrew Bardsley */ +#include "cpu/minor/func_unit.hh" + #include #include #include -#include "cpu/minor/func_unit.hh" #include "debug/MinorTiming.hh" #include "enums/OpClass.hh" diff --git a/src/cpu/minor/lsq.cc b/src/cpu/minor/lsq.cc --- a/src/cpu/minor/lsq.cc +++ b/src/cpu/minor/lsq.cc @@ -37,6 +37,8 @@ * Authors: Andrew Bardsley */ +#include "cpu/minor/lsq.hh" + #include #include @@ -45,7 +47,6 @@ #include "cpu/minor/cpu.hh" #include "cpu/minor/exec_context.hh" #include "cpu/minor/execute.hh" -#include "cpu/minor/lsq.hh" #include "cpu/minor/pipeline.hh" #include "debug/Activity.hh" #include "debug/MinorMem.hh" diff --git a/src/cpu/minor/pipeline.cc b/src/cpu/minor/pipeline.cc --- a/src/cpu/minor/pipeline.cc +++ b/src/cpu/minor/pipeline.cc @@ -37,13 +37,14 @@ * Authors: Andrew Bardsley */ +#include "cpu/minor/pipeline.hh" + #include #include "cpu/minor/decode.hh" #include "cpu/minor/execute.hh" #include "cpu/minor/fetch1.hh" #include "cpu/minor/fetch2.hh" -#include "cpu/minor/pipeline.hh" #include "debug/Drain.hh" #include "debug/MinorCPU.hh" #include "debug/MinorTrace.hh" diff --git a/src/cpu/minor/scoreboard.cc b/src/cpu/minor/scoreboard.cc --- a/src/cpu/minor/scoreboard.cc +++ b/src/cpu/minor/scoreboard.cc @@ -37,8 +37,9 @@ * Authors: Andrew Bardsley */ +#include "cpu/minor/scoreboard.hh" + #include "arch/registers.hh" -#include "cpu/minor/scoreboard.hh" #include "cpu/reg_class.hh" #include "debug/MinorScoreboard.hh" #include "debug/MinorTiming.hh" diff --git a/src/cpu/nativetrace.cc b/src/cpu/nativetrace.cc --- a/src/cpu/nativetrace.cc +++ b/src/cpu/nativetrace.cc @@ -28,8 +28,9 @@ * Authors: Gabe Black */ +#include "cpu/nativetrace.hh" + #include "base/socket.hh" -#include "cpu/nativetrace.hh" #include "cpu/static_inst.hh" #include "debug/GDBMisc.hh" #include "params/NativeTrace.hh" diff --git a/src/cpu/o3/base_dyn_inst.cc b/src/cpu/o3/base_dyn_inst.cc --- a/src/cpu/o3/base_dyn_inst.cc +++ b/src/cpu/o3/base_dyn_inst.cc @@ -28,9 +28,9 @@ * Authors: Kevin Lim */ +#include "cpu/base_dyn_inst_impl.hh" #include "cpu/o3/cpu.hh" #include "cpu/o3/isa_specific.hh" -#include "cpu/base_dyn_inst_impl.hh" // Explicit instantiation template class BaseDynInst; diff --git a/src/cpu/o3/checker.cc b/src/cpu/o3/checker.cc --- a/src/cpu/o3/checker.cc +++ b/src/cpu/o3/checker.cc @@ -40,8 +40,9 @@ * Authors: Kevin Lim */ +#include "cpu/o3/checker.hh" + #include "cpu/checker/cpu_impl.hh" -#include "cpu/o3/checker.hh" #include "params/O3Checker.hh" class MemObject; diff --git a/src/cpu/o3/cpu.cc b/src/cpu/o3/cpu.cc --- a/src/cpu/o3/cpu.cc +++ b/src/cpu/o3/cpu.cc @@ -44,14 +44,15 @@ * Rick Strong */ +#include "cpu/o3/cpu.hh" + #include "arch/kernel_stats.hh" #include "config/the_isa.hh" +#include "cpu/activity.hh" #include "cpu/checker/cpu.hh" #include "cpu/checker/thread_context.hh" -#include "cpu/o3/cpu.hh" #include "cpu/o3/isa_specific.hh" #include "cpu/o3/thread_context.hh" -#include "cpu/activity.hh" #include "cpu/quiesce_event.hh" #include "cpu/simple_thread.hh" #include "cpu/thread_context.hh" @@ -69,6 +70,7 @@ #if THE_ISA == ALPHA_ISA #include "arch/alpha/osfpal.hh" #include "debug/Activity.hh" + #endif struct BaseCPUParams; diff --git a/src/cpu/o3/deriv.cc b/src/cpu/o3/deriv.cc --- a/src/cpu/o3/deriv.cc +++ b/src/cpu/o3/deriv.cc @@ -28,9 +28,10 @@ * Authors: Kevin Lim */ +#include "cpu/o3/deriv.hh" + #include -#include "cpu/o3/deriv.hh" #include "params/DerivO3CPU.hh" DerivO3CPU * diff --git a/src/cpu/o3/free_list.cc b/src/cpu/o3/free_list.cc --- a/src/cpu/o3/free_list.cc +++ b/src/cpu/o3/free_list.cc @@ -29,10 +29,11 @@ * Authors: Kevin Lim */ +#include "cpu/o3/free_list.hh" + #include "arch/registers.hh" #include "base/trace.hh" #include "config/the_isa.hh" -#include "cpu/o3/free_list.hh" #include "debug/FreeList.hh" UnifiedFreeList::UnifiedFreeList(const std::string &_my_name, diff --git a/src/cpu/o3/fu_pool.cc b/src/cpu/o3/fu_pool.cc --- a/src/cpu/o3/fu_pool.cc +++ b/src/cpu/o3/fu_pool.cc @@ -40,9 +40,10 @@ * Authors: Kevin Lim */ +#include "cpu/o3/fu_pool.hh" + #include -#include "cpu/o3/fu_pool.hh" #include "cpu/func_unit.hh" using namespace std; diff --git a/src/cpu/o3/probe/simple_trace.cc b/src/cpu/o3/probe/simple_trace.cc --- a/src/cpu/o3/probe/simple_trace.cc +++ b/src/cpu/o3/probe/simple_trace.cc @@ -37,8 +37,9 @@ * Authors: Matt Horsnell */ +#include "cpu/o3/probe/simple_trace.hh" + #include "base/trace.hh" -#include "cpu/o3/probe/simple_trace.hh" #include "debug/SimpleTrace.hh" void SimpleTrace::traceCommit(const O3CPUImpl::DynInstPtr &dynInst) diff --git a/src/cpu/o3/regfile.cc b/src/cpu/o3/regfile.cc --- a/src/cpu/o3/regfile.cc +++ b/src/cpu/o3/regfile.cc @@ -31,9 +31,9 @@ * Steve Reinhardt */ -#include "cpu/o3/free_list.hh" #include "cpu/o3/regfile.hh" +#include "cpu/o3/free_list.hh" PhysRegFile::PhysRegFile(unsigned _numPhysicalIntRegs, unsigned _numPhysicalFloatRegs, diff --git a/src/cpu/o3/rename_map.cc b/src/cpu/o3/rename_map.cc --- a/src/cpu/o3/rename_map.cc +++ b/src/cpu/o3/rename_map.cc @@ -29,9 +29,10 @@ * Authors: Kevin Lim */ +#include "cpu/o3/rename_map.hh" + #include -#include "cpu/o3/rename_map.hh" #include "debug/Rename.hh" using namespace std; diff --git a/src/cpu/o3/scoreboard.cc b/src/cpu/o3/scoreboard.cc --- a/src/cpu/o3/scoreboard.cc +++ b/src/cpu/o3/scoreboard.cc @@ -30,8 +30,9 @@ * Kevin Lim */ +#include "cpu/o3/scoreboard.hh" + #include "config/the_isa.hh" -#include "cpu/o3/scoreboard.hh" #include "debug/Scoreboard.hh" Scoreboard::Scoreboard(const std::string &_my_name, diff --git a/src/cpu/o3/store_set.cc b/src/cpu/o3/store_set.cc --- a/src/cpu/o3/store_set.cc +++ b/src/cpu/o3/store_set.cc @@ -28,10 +28,11 @@ * Authors: Kevin Lim */ +#include "cpu/o3/store_set.hh" + #include "base/intmath.hh" #include "base/misc.hh" #include "base/trace.hh" -#include "cpu/o3/store_set.hh" #include "debug/StoreSet.hh" StoreSet::StoreSet(uint64_t clear_period, int _SSIT_size, int _LFST_size) diff --git a/src/cpu/o3/thread_context.cc b/src/cpu/o3/thread_context.cc --- a/src/cpu/o3/thread_context.cc +++ b/src/cpu/o3/thread_context.cc @@ -28,8 +28,9 @@ * Authors: Kevin Lim */ +#include "cpu/o3/thread_context.hh" + #include "cpu/o3/impl.hh" -#include "cpu/o3/thread_context.hh" #include "cpu/o3/thread_context_impl.hh" template class O3ThreadContext; diff --git a/src/cpu/pc_event.cc b/src/cpu/pc_event.cc --- a/src/cpu/pc_event.cc +++ b/src/cpu/pc_event.cc @@ -29,6 +29,8 @@ * Steve Reinhardt */ +#include "cpu/pc_event.hh" + #include #include #include @@ -36,7 +38,6 @@ #include "base/debug.hh" #include "base/trace.hh" #include "cpu/base.hh" -#include "cpu/pc_event.hh" #include "cpu/thread_context.hh" #include "debug/PCEvent.hh" #include "sim/core.hh" diff --git a/src/cpu/pred/2bit_local.cc b/src/cpu/pred/2bit_local.cc --- a/src/cpu/pred/2bit_local.cc +++ b/src/cpu/pred/2bit_local.cc @@ -28,10 +28,11 @@ * Authors: Kevin Lim */ +#include "cpu/pred/2bit_local.hh" + #include "base/intmath.hh" #include "base/misc.hh" #include "base/trace.hh" -#include "cpu/pred/2bit_local.hh" #include "debug/Fetch.hh" LocalBP::LocalBP(const LocalBPParams *params) diff --git a/src/cpu/pred/bi_mode.cc b/src/cpu/pred/bi_mode.cc --- a/src/cpu/pred/bi_mode.cc +++ b/src/cpu/pred/bi_mode.cc @@ -32,9 +32,10 @@ * Implementation of a bi-mode branch predictor */ +#include "cpu/pred/bi_mode.hh" + #include "base/bitfield.hh" #include "base/intmath.hh" -#include "cpu/pred/bi_mode.hh" BiModeBP::BiModeBP(const BiModeBPParams *params) : BPredUnit(params), diff --git a/src/cpu/pred/btb.cc b/src/cpu/pred/btb.cc --- a/src/cpu/pred/btb.cc +++ b/src/cpu/pred/btb.cc @@ -28,9 +28,10 @@ * Authors: Kevin Lim */ +#include "cpu/pred/btb.hh" + #include "base/intmath.hh" #include "base/trace.hh" -#include "cpu/pred/btb.hh" #include "debug/Fetch.hh" DefaultBTB::DefaultBTB(unsigned _numEntries, diff --git a/src/cpu/pred/tournament.cc b/src/cpu/pred/tournament.cc --- a/src/cpu/pred/tournament.cc +++ b/src/cpu/pred/tournament.cc @@ -40,9 +40,10 @@ * Authors: Kevin Lim */ +#include "cpu/pred/tournament.hh" + #include "base/bitfield.hh" #include "base/intmath.hh" -#include "cpu/pred/tournament.hh" TournamentBP::TournamentBP(const TournamentBPParams *params) : BPredUnit(params), diff --git a/src/cpu/profile.cc b/src/cpu/profile.cc --- a/src/cpu/profile.cc +++ b/src/cpu/profile.cc @@ -28,15 +28,16 @@ * Authors: Nathan Binkert */ +#include "cpu/profile.hh" + #include -#include "base/loader/symtab.hh" #include "base/bitfield.hh" #include "base/callback.hh" +#include "base/loader/symtab.hh" #include "base/statistics.hh" #include "base/trace.hh" #include "cpu/base.hh" -#include "cpu/profile.hh" #include "cpu/thread_context.hh" using namespace std; diff --git a/src/cpu/quiesce_event.cc b/src/cpu/quiesce_event.cc --- a/src/cpu/quiesce_event.cc +++ b/src/cpu/quiesce_event.cc @@ -28,8 +28,9 @@ * Authors: Kevin Lim */ +#include "cpu/quiesce_event.hh" + #include "cpu/base.hh" -#include "cpu/quiesce_event.hh" #include "cpu/thread_context.hh" #include "debug/Quiesce.hh" diff --git a/src/cpu/simple/atomic.cc b/src/cpu/simple/atomic.cc --- a/src/cpu/simple/atomic.cc +++ b/src/cpu/simple/atomic.cc @@ -41,13 +41,14 @@ * Authors: Steve Reinhardt */ +#include "cpu/simple/atomic.hh" + #include "arch/locked_mem.hh" #include "arch/mmapped_ipr.hh" #include "arch/utility.hh" #include "base/bigint.hh" #include "base/output.hh" #include "config/the_isa.hh" -#include "cpu/simple/atomic.hh" #include "cpu/exetrace.hh" #include "debug/Drain.hh" #include "debug/ExecFaulting.hh" @@ -57,8 +58,8 @@ #include "mem/physical.hh" #include "params/AtomicSimpleCPU.hh" #include "sim/faults.hh" +#include "sim/full_system.hh" #include "sim/system.hh" -#include "sim/full_system.hh" using namespace std; using namespace TheISA; diff --git a/src/cpu/simple/base.cc b/src/cpu/simple/base.cc --- a/src/cpu/simple/base.cc +++ b/src/cpu/simple/base.cc @@ -41,21 +41,22 @@ * Authors: Steve Reinhardt */ +#include "cpu/simple/base.hh" + #include "arch/kernel_stats.hh" #include "arch/stacktrace.hh" #include "arch/tlb.hh" #include "arch/utility.hh" #include "arch/vtophys.hh" -#include "base/loader/symtab.hh" #include "base/cp_annotate.hh" #include "base/cprintf.hh" #include "base/inifile.hh" +#include "base/loader/symtab.hh" #include "base/misc.hh" #include "base/pollevent.hh" #include "base/trace.hh" #include "base/types.hh" #include "config/the_isa.hh" -#include "cpu/simple/base.hh" #include "cpu/base.hh" #include "cpu/checker/cpu.hh" #include "cpu/checker/thread_context.hh" diff --git a/src/cpu/simple/probes/simpoint.cc b/src/cpu/simple/probes/simpoint.cc --- a/src/cpu/simple/probes/simpoint.cc +++ b/src/cpu/simple/probes/simpoint.cc @@ -38,8 +38,9 @@ * Curtis Dunham */ +#include "cpu/simple/probes/simpoint.hh" + #include "base/output.hh" -#include "cpu/simple/probes/simpoint.hh" SimPoint::SimPoint(const SimPointParams *p) : ProbeListenerObject(p), diff --git a/src/cpu/simple/timing.cc b/src/cpu/simple/timing.cc --- a/src/cpu/simple/timing.cc +++ b/src/cpu/simple/timing.cc @@ -41,16 +41,18 @@ * Authors: Steve Reinhardt */ +#include "cpu/simple/timing.hh" + #include "arch/locked_mem.hh" #include "arch/mmapped_ipr.hh" #include "arch/utility.hh" #include "base/bigint.hh" #include "config/the_isa.hh" -#include "cpu/simple/timing.hh" #include "cpu/exetrace.hh" #include "debug/Config.hh" #include "debug/Drain.hh" #include "debug/ExecFaulting.hh" +#include "debug/Mwait.hh" #include "debug/SimpleCPU.hh" #include "mem/packet.hh" #include "mem/packet_access.hh" @@ -59,8 +61,6 @@ #include "sim/full_system.hh" #include "sim/system.hh" -#include "debug/Mwait.hh" - using namespace std; using namespace TheISA; diff --git a/src/cpu/simple_thread.cc b/src/cpu/simple_thread.cc --- a/src/cpu/simple_thread.cc +++ b/src/cpu/simple_thread.cc @@ -31,6 +31,8 @@ * Kevin Lim */ +#include "cpu/simple_thread.hh" + #include #include "arch/isa_traits.hh" @@ -45,7 +47,6 @@ #include "cpu/base.hh" #include "cpu/profile.hh" #include "cpu/quiesce_event.hh" -#include "cpu/simple_thread.hh" #include "cpu/thread_context.hh" #include "mem/fs_translating_port_proxy.hh" #include "mem/se_translating_port_proxy.hh"