summaryrefslogtreecommitdiff
path: root/src/arch/sparc
diff options
context:
space:
mode:
Diffstat (limited to 'src/arch/sparc')
-rw-r--r--src/arch/sparc/isa.hh6
-rw-r--r--src/arch/sparc/isa/includes.isa14
-rw-r--r--src/arch/sparc/isa_traits.hh2
-rw-r--r--src/arch/sparc/linux/linux.cc3
-rw-r--r--src/arch/sparc/linux/process.cc4
-rw-r--r--src/arch/sparc/locked_mem.hh1
-rw-r--r--src/arch/sparc/mmapped_ipr.hh3
-rw-r--r--src/arch/sparc/nativetrace.cc2
-rw-r--r--src/arch/sparc/process.cc6
-rw-r--r--src/arch/sparc/process.hh1
-rw-r--r--src/arch/sparc/remote_gdb.cc6
-rw-r--r--src/arch/sparc/remote_gdb.hh2
-rw-r--r--src/arch/sparc/solaris/process.cc4
-rw-r--r--src/arch/sparc/solaris/solaris.cc4
-rw-r--r--src/arch/sparc/system.cc1
-rw-r--r--src/arch/sparc/tlb.cc2
-rw-r--r--src/arch/sparc/tlb_map.hh3
-rw-r--r--src/arch/sparc/types.hh2
-rw-r--r--src/arch/sparc/utility.hh2
-rw-r--r--src/arch/sparc/vtophys.cc4
20 files changed, 34 insertions, 38 deletions
diff --git a/src/arch/sparc/isa.hh b/src/arch/sparc/isa.hh
index 660f0c49d..f00068bbc 100644
--- a/src/arch/sparc/isa.hh
+++ b/src/arch/sparc/isa.hh
@@ -31,14 +31,14 @@
#ifndef __ARCH_SPARC_ISA_HH__
#define __ARCH_SPARC_ISA_HH__
+#include <ostream>
+#include <string>
+
#include "arch/sparc/registers.hh"
#include "arch/sparc/types.hh"
#include "config/full_system.hh"
#include "cpu/cpuevent.hh"
-#include <string>
-#include <ostream>
-
class Checkpoint;
class EventManager;
class ThreadContext;
diff --git a/src/arch/sparc/isa/includes.isa b/src/arch/sparc/isa/includes.isa
index bc9273ad3..8ef753d2e 100644
--- a/src/arch/sparc/isa/includes.isa
+++ b/src/arch/sparc/isa/includes.isa
@@ -35,8 +35,8 @@
output header {{
#include <cstring>
-#include <sstream>
#include <iostream>
+#include <sstream>
#include "arch/sparc/faults.hh"
#include "arch/sparc/isa_traits.hh"
@@ -49,14 +49,14 @@ output header {{
}};
output decoder {{
-#include "base/cprintf.hh"
+#include <algorithm>
+
#include "base/loader/symtab.hh"
+#include "base/cprintf.hh"
+#include "base/fenv.hh"
#include "cpu/thread_context.hh" // for Jump::branchTarget()
#include "mem/packet.hh"
-#include "base/fenv.hh"
-#include <algorithm>
-
using namespace SparcISA;
}};
@@ -67,16 +67,16 @@ output exec {{
#include "sim/pseudo_inst.hh"
#endif
+#include <cmath>
#include <limits>
-#include <cmath>
#include "arch/sparc/asi.hh"
#include "base/bigint.hh"
#include "cpu/base.hh"
#include "cpu/exetrace.hh"
-#include "sim/sim_exit.hh"
#include "mem/packet.hh"
#include "mem/packet_access.hh"
+#include "sim/sim_exit.hh"
using namespace SparcISA;
using namespace std;
diff --git a/src/arch/sparc/isa_traits.hh b/src/arch/sparc/isa_traits.hh
index 719127641..6992cfee1 100644
--- a/src/arch/sparc/isa_traits.hh
+++ b/src/arch/sparc/isa_traits.hh
@@ -32,8 +32,8 @@
#ifndef __ARCH_SPARC_ISA_TRAITS_HH__
#define __ARCH_SPARC_ISA_TRAITS_HH__
-#include "arch/sparc/types.hh"
#include "arch/sparc/sparc_traits.hh"
+#include "arch/sparc/types.hh"
#include "base/types.hh"
#include "config/full_system.hh"
diff --git a/src/arch/sparc/linux/linux.cc b/src/arch/sparc/linux/linux.cc
index 102e5af3b..6f8a05750 100644
--- a/src/arch/sparc/linux/linux.cc
+++ b/src/arch/sparc/linux/linux.cc
@@ -28,9 +28,10 @@
* Authors: Gabe Black
*/
-#include "arch/sparc/linux/linux.hh"
#include <fcntl.h>
+#include "arch/sparc/linux/linux.hh"
+
// open(2) flags translation table
OpenFlagTransTable SparcLinux::openFlagTable[] = {
#ifdef _MSC_VER
diff --git a/src/arch/sparc/linux/process.cc b/src/arch/sparc/linux/process.cc
index 2c9fe2ac0..ce6094060 100644
--- a/src/arch/sparc/linux/process.cc
+++ b/src/arch/sparc/linux/process.cc
@@ -30,14 +30,12 @@
* Ali Saidi
*/
-#include "arch/sparc/isa_traits.hh"
#include "arch/sparc/linux/process.hh"
+#include "arch/sparc/isa_traits.hh"
#include "arch/sparc/registers.hh"
-
#include "base/trace.hh"
#include "cpu/thread_context.hh"
#include "kern/linux/linux.hh"
-
#include "sim/process.hh"
#include "sim/syscall_emul.hh"
diff --git a/src/arch/sparc/locked_mem.hh b/src/arch/sparc/locked_mem.hh
index 291b2f422..556fbbdd9 100644
--- a/src/arch/sparc/locked_mem.hh
+++ b/src/arch/sparc/locked_mem.hh
@@ -39,7 +39,6 @@
#include "mem/request.hh"
-
namespace SparcISA
{
template <class XC>
diff --git a/src/arch/sparc/mmapped_ipr.hh b/src/arch/sparc/mmapped_ipr.hh
index 777242e7c..28e3ec259 100644
--- a/src/arch/sparc/mmapped_ipr.hh
+++ b/src/arch/sparc/mmapped_ipr.hh
@@ -37,11 +37,10 @@
* ISA-specific helper functions for memory mapped IPR accesses.
*/
+#include "arch/sparc/tlb.hh"
#include "config/full_system.hh"
#include "cpu/thread_context.hh"
#include "mem/packet.hh"
-#include "arch/sparc/tlb.hh"
-
namespace SparcISA
{
diff --git a/src/arch/sparc/nativetrace.cc b/src/arch/sparc/nativetrace.cc
index 7d8b96dc1..8987aa518 100644
--- a/src/arch/sparc/nativetrace.cc
+++ b/src/arch/sparc/nativetrace.cc
@@ -29,8 +29,8 @@
*/
#include "arch/sparc/isa_traits.hh"
-#include "arch/sparc/registers.hh"
#include "arch/sparc/nativetrace.hh"
+#include "arch/sparc/registers.hh"
#include "cpu/thread_context.hh"
#include "params/SparcNativeTrace.hh"
#include "sim/byteswap.hh"
diff --git a/src/arch/sparc/process.cc b/src/arch/sparc/process.cc
index ac42ccf64..bd3db92b6 100644
--- a/src/arch/sparc/process.cc
+++ b/src/arch/sparc/process.cc
@@ -32,16 +32,16 @@
#include "arch/sparc/asi.hh"
#include "arch/sparc/handlers.hh"
#include "arch/sparc/isa_traits.hh"
-#include "arch/sparc/registers.hh"
#include "arch/sparc/process.hh"
+#include "arch/sparc/registers.hh"
#include "arch/sparc/types.hh"
-#include "base/loader/object_file.hh"
#include "base/loader/elf_object.hh"
+#include "base/loader/object_file.hh"
#include "base/misc.hh"
#include "cpu/thread_context.hh"
#include "mem/page_table.hh"
-#include "sim/process_impl.hh"
#include "mem/translating_port.hh"
+#include "sim/process_impl.hh"
#include "sim/system.hh"
using namespace std;
diff --git a/src/arch/sparc/process.hh b/src/arch/sparc/process.hh
index 4ad8bb804..a9a4247fc 100644
--- a/src/arch/sparc/process.hh
+++ b/src/arch/sparc/process.hh
@@ -34,6 +34,7 @@
#include <string>
#include <vector>
+
#include "sim/byteswap.hh"
#include "sim/process.hh"
diff --git a/src/arch/sparc/remote_gdb.cc b/src/arch/sparc/remote_gdb.cc
index 932123548..86c287237 100644
--- a/src/arch/sparc/remote_gdb.cc
+++ b/src/arch/sparc/remote_gdb.cc
@@ -117,19 +117,19 @@
*/
#include <sys/signal.h>
+#include <unistd.h>
#include <string>
-#include <unistd.h>
-#include "arch/vtophys.hh"
#include "arch/sparc/remote_gdb.hh"
+#include "arch/vtophys.hh"
#include "base/intmath.hh"
#include "base/remote_gdb.hh"
#include "base/socket.hh"
#include "base/trace.hh"
#include "config/full_system.hh"
-#include "cpu/thread_context.hh"
#include "cpu/static_inst.hh"
+#include "cpu/thread_context.hh"
#include "mem/page_table.hh"
#include "mem/physical.hh"
#include "mem/port.hh"
diff --git a/src/arch/sparc/remote_gdb.hh b/src/arch/sparc/remote_gdb.hh
index 06f6b3896..6ada8bdca 100644
--- a/src/arch/sparc/remote_gdb.hh
+++ b/src/arch/sparc/remote_gdb.hh
@@ -34,9 +34,9 @@
#include <map>
#include "arch/sparc/types.hh"
+#include "base/pollevent.hh"
#include "base/remote_gdb.hh"
#include "cpu/pc_event.hh"
-#include "base/pollevent.hh"
class System;
class ThreadContext;
diff --git a/src/arch/sparc/solaris/process.cc b/src/arch/sparc/solaris/process.cc
index 24abd8687..e47377d42 100644
--- a/src/arch/sparc/solaris/process.cc
+++ b/src/arch/sparc/solaris/process.cc
@@ -28,14 +28,12 @@
* Authors: Ali Saidi
*/
-#include "arch/sparc/isa_traits.hh"
#include "arch/sparc/solaris/process.hh"
+#include "arch/sparc/isa_traits.hh"
#include "arch/sparc/registers.hh"
-
#include "base/trace.hh"
#include "cpu/thread_context.hh"
#include "kern/solaris/solaris.hh"
-
#include "sim/process.hh"
#include "sim/syscall_emul.hh"
diff --git a/src/arch/sparc/solaris/solaris.cc b/src/arch/sparc/solaris/solaris.cc
index 3cc910005..5474d8b17 100644
--- a/src/arch/sparc/solaris/solaris.cc
+++ b/src/arch/sparc/solaris/solaris.cc
@@ -28,10 +28,10 @@
* Authors: Ali Saidi
*/
-#include "arch/sparc/solaris/solaris.hh"
-
#include <fcntl.h>
+#include "arch/sparc/solaris/solaris.hh"
+
// open(2) flags translation table
OpenFlagTransTable SparcSolaris::openFlagTable[] = {
#ifdef _MSC_VER
diff --git a/src/arch/sparc/system.cc b/src/arch/sparc/system.cc
index e4ee3cacb..9988702d2 100644
--- a/src/arch/sparc/system.cc
+++ b/src/arch/sparc/system.cc
@@ -37,7 +37,6 @@
#include "params/SparcSystem.hh"
#include "sim/byteswap.hh"
-
using namespace BigEndianGuest;
SparcSystem::SparcSystem(Params *p)
diff --git a/src/arch/sparc/tlb.cc b/src/arch/sparc/tlb.cc
index 8aa007168..8742cfd32 100644
--- a/src/arch/sparc/tlb.cc
+++ b/src/arch/sparc/tlb.cc
@@ -36,8 +36,8 @@
#include "arch/sparc/tlb.hh"
#include "base/bitfield.hh"
#include "base/trace.hh"
-#include "cpu/thread_context.hh"
#include "cpu/base.hh"
+#include "cpu/thread_context.hh"
#include "mem/packet_access.hh"
#include "mem/request.hh"
#include "sim/system.hh"
diff --git a/src/arch/sparc/tlb_map.hh b/src/arch/sparc/tlb_map.hh
index 133443d5b..5541ff7e9 100644
--- a/src/arch/sparc/tlb_map.hh
+++ b/src/arch/sparc/tlb_map.hh
@@ -31,9 +31,10 @@
#ifndef __ARCH_SPARC_TLB_MAP_HH__
#define __ARCH_SPARC_TLB_MAP_HH__
-#include "arch/sparc/pagetable.hh"
#include <map>
+#include "arch/sparc/pagetable.hh"
+
namespace SparcISA
{
diff --git a/src/arch/sparc/types.hh b/src/arch/sparc/types.hh
index acc4e4a64..7d0a7617c 100644
--- a/src/arch/sparc/types.hh
+++ b/src/arch/sparc/types.hh
@@ -31,9 +31,9 @@
#ifndef __ARCH_SPARC_TYPES_HH__
#define __ARCH_SPARC_TYPES_HH__
+#include "arch/generic/types.hh"
#include "base/bigint.hh"
#include "base/types.hh"
-#include "arch/generic/types.hh"
namespace SparcISA
{
diff --git a/src/arch/sparc/utility.hh b/src/arch/sparc/utility.hh
index d69b42d01..b702e6838 100644
--- a/src/arch/sparc/utility.hh
+++ b/src/arch/sparc/utility.hh
@@ -34,8 +34,8 @@
#include "arch/sparc/isa_traits.hh"
#include "arch/sparc/registers.hh"
#include "arch/sparc/tlb.hh"
-#include "base/misc.hh"
#include "base/bitfield.hh"
+#include "base/misc.hh"
#include "cpu/static_inst.hh"
#include "cpu/thread_context.hh"
#include "sim/fault_fwd.hh"
diff --git a/src/arch/sparc/vtophys.cc b/src/arch/sparc/vtophys.cc
index 36b2557e7..c8f35fe8b 100644
--- a/src/arch/sparc/vtophys.cc
+++ b/src/arch/sparc/vtophys.cc
@@ -30,10 +30,10 @@
#include <string>
-#include "arch/sparc/vtophys.hh"
#include "arch/sparc/tlb.hh"
-#include "base/compiler.hh"
+#include "arch/sparc/vtophys.hh"
#include "base/chunk_generator.hh"
+#include "base/compiler.hh"
#include "base/trace.hh"
#include "cpu/thread_context.hh"
#include "mem/vport.hh"
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-02 06:08:15 +0000