summaryrefslogtreecommitdiff
path: root/cpu
diff options
context:
space:
mode:
Diffstat (limited to 'cpu')
-rw-r--r--cpu/base_cpu.cc10
-rw-r--r--cpu/base_cpu.hh6
-rw-r--r--cpu/exec_context.cc8
-rw-r--r--cpu/exec_context.hh12
-rw-r--r--cpu/exetrace.cc16
-rw-r--r--cpu/exetrace.hh10
-rw-r--r--cpu/intr_control.cc6
-rw-r--r--cpu/intr_control.hh6
-rw-r--r--cpu/memtest/memtest.cc16
-rw-r--r--cpu/memtest/memtest.hh16
-rw-r--r--cpu/pc_event.cc24
-rw-r--r--cpu/pc_event.hh2
-rw-r--r--cpu/simple_cpu/simple_cpu.cc66
-rw-r--r--cpu/simple_cpu/simple_cpu.hh10
-rw-r--r--cpu/static_inst.cc4
-rw-r--r--cpu/static_inst.hh10
16 files changed, 111 insertions, 111 deletions
diff --git a/cpu/base_cpu.cc b/cpu/base_cpu.cc
index 06b2ec65c..90785946e 100644
--- a/cpu/base_cpu.cc
+++ b/cpu/base_cpu.cc
@@ -30,11 +30,11 @@
#include <sstream>
#include <iostream>
-#include "base_cpu.hh"
-#include "cprintf.hh"
-#include "exec_context.hh"
-#include "misc.hh"
-#include "sim_events.hh"
+#include "cpu/base_cpu.hh"
+#include "base/cprintf.hh"
+#include "cpu/exec_context.hh"
+#include "base/misc.hh"
+#include "sim/sim_events.hh"
using namespace std;
diff --git a/cpu/base_cpu.hh b/cpu/base_cpu.hh
index 745220d85..d5c3b68d8 100644
--- a/cpu/base_cpu.hh
+++ b/cpu/base_cpu.hh
@@ -31,10 +31,10 @@
#include <vector>
-#include "eventq.hh"
-#include "sim_object.hh"
+#include "sim/eventq.hh"
+#include "sim/sim_object.hh"
-#include "isa_traits.hh" // for Addr
+#include "targetarch/isa_traits.hh" // for Addr
#ifdef FULL_SYSTEM
class System;
diff --git a/cpu/exec_context.cc b/cpu/exec_context.cc
index c81d172a8..87f7283aa 100644
--- a/cpu/exec_context.cc
+++ b/cpu/exec_context.cc
@@ -28,13 +28,13 @@
#include <string>
-#include "base_cpu.hh"
-#include "exec_context.hh"
+#include "cpu/base_cpu.hh"
+#include "cpu/exec_context.hh"
#ifdef FULL_SYSTEM
-#include "system.hh"
+#include "sim/system.hh"
#else
-#include "prog.hh"
+#include "sim/prog.hh"
#endif
using namespace std;
diff --git a/cpu/exec_context.hh b/cpu/exec_context.hh
index 988673a0f..5c1db6297 100644
--- a/cpu/exec_context.hh
+++ b/cpu/exec_context.hh
@@ -29,8 +29,8 @@
#ifndef __EXEC_CONTEXT_HH__
#define __EXEC_CONTEXT_HH__
-#include "host.hh"
-#include "mem_req.hh"
+#include "sim/host.hh"
+#include "targetarch/mem_req.hh"
// forward declaration: see functional_memory.hh
class FunctionalMemory;
@@ -39,15 +39,15 @@ class BaseCPU;
#ifdef FULL_SYSTEM
-#include "alpha_memory.hh"
+#include "targetarch/alpha_memory.hh"
class MemoryController;
-#include "kernel_stats.hh"
-#include "system.hh"
+#include "kern/tru64/kernel_stats.hh"
+#include "sim/system.hh"
#else // !FULL_SYSTEM
-#include "prog.hh"
+#include "sim/prog.hh"
#endif // FULL_SYSTEM
diff --git a/cpu/exetrace.cc b/cpu/exetrace.cc
index 4c5d14893..01f50e675 100644
--- a/cpu/exetrace.cc
+++ b/cpu/exetrace.cc
@@ -29,14 +29,14 @@
#include <fstream>
#include <iomanip>
-#include "dyn_inst.hh"
-#include "spec_state.hh"
-#include "issue.hh"
-#include "exetrace.hh"
-#include "exec_context.hh"
-#include "symtab.hh"
-#include "base_cpu.hh"
-#include "static_inst.hh"
+#include "cpu/full_cpu/dyn_inst.hh"
+#include "cpu/full_cpu/spec_state.hh"
+#include "cpu/full_cpu/issue.hh"
+#include "cpu/exetrace.hh"
+#include "cpu/exec_context.hh"
+#include "base/loader/symtab.hh"
+#include "cpu/base_cpu.hh"
+#include "cpu/static_inst.hh"
using namespace std;
diff --git a/cpu/exetrace.hh b/cpu/exetrace.hh
index 2eb7753e5..8e2ea6221 100644
--- a/cpu/exetrace.hh
+++ b/cpu/exetrace.hh
@@ -32,11 +32,11 @@
#include <fstream>
#include <vector>
-#include "host.hh"
-#include "inst_seq.hh" // for InstSeqNum
-#include "trace.hh"
-#include "exec_context.hh"
-#include "static_inst.hh"
+#include "sim/host.hh"
+#include "cpu/inst_seq.hh" // for InstSeqNum
+#include "base/trace.hh"
+#include "cpu/exec_context.hh"
+#include "cpu/static_inst.hh"
class BaseCPU;
diff --git a/cpu/intr_control.cc b/cpu/intr_control.cc
index 7ad32a2b9..bce427eea 100644
--- a/cpu/intr_control.cc
+++ b/cpu/intr_control.cc
@@ -29,9 +29,9 @@
#include <string>
#include <vector>
-#include "base_cpu.hh"
-#include "intr_control.hh"
-#include "sim_object.hh"
+#include "cpu/base_cpu.hh"
+#include "cpu/intr_control.hh"
+#include "sim/sim_object.hh"
using namespace std;
diff --git a/cpu/intr_control.hh b/cpu/intr_control.hh
index 660d6d704..b8fa68f52 100644
--- a/cpu/intr_control.hh
+++ b/cpu/intr_control.hh
@@ -29,9 +29,9 @@
#ifndef __INTR_CONTROL_HH__
#define __INTR_CONTROL_HH__
-#include "misc.hh"
-#include "base_cpu.hh"
-#include "sim_object.hh"
+#include "base/misc.hh"
+#include "cpu/base_cpu.hh"
+#include "sim/sim_object.hh"
class IntrControl : public SimObject
{
diff --git a/cpu/memtest/memtest.cc b/cpu/memtest/memtest.cc
index 70b6fbf13..9deebb282 100644
--- a/cpu/memtest/memtest.cc
+++ b/cpu/memtest/memtest.cc
@@ -33,14 +33,14 @@
#include <iomanip>
#include <vector>
-#include "memtest.hh"
-#include "misc.hh"
-#include "sim_events.hh"
-#include "main_memory.hh"
-#include "base_cache.hh"
-
-#include "statistics.hh"
-#include "sim_stats.hh"
+#include "cpu/memtest/memtest.hh"
+#include "base/misc.hh"
+#include "sim/sim_events.hh"
+#include "mem/functional_mem/main_memory.hh"
+#include "mem/cache/base_cache.hh"
+
+#include "base/statistics.hh"
+#include "sim/sim_stats.hh"
using namespace std;
diff --git a/cpu/memtest/memtest.hh b/cpu/memtest/memtest.hh
index aa652abbd..36c9691e6 100644
--- a/cpu/memtest/memtest.hh
+++ b/cpu/memtest/memtest.hh
@@ -29,14 +29,14 @@
#ifndef __MEMTEST_HH__
#define __MEMTEST_HH__
-#include "sim_object.hh"
-#include "mem_interface.hh"
-#include "functional_memory.hh"
-#include "base_cpu.hh"
-#include "exec_context.hh"
-
-#include "statistics.hh"
-#include "sim_stats.hh"
+#include "sim/sim_object.hh"
+#include "mem/mem_interface.hh"
+#include "mem/functional_mem/functional_memory.hh"
+#include "cpu/base_cpu.hh"
+#include "cpu/exec_context.hh"
+
+#include "base/statistics.hh"
+#include "sim/sim_stats.hh"
class MemTest : public BaseCPU
{
diff --git a/cpu/pc_event.cc b/cpu/pc_event.cc
index 4de425199..d2490edf6 100644
--- a/cpu/pc_event.cc
+++ b/cpu/pc_event.cc
@@ -31,20 +31,20 @@
#include <string>
#include <utility>
-#include "debug.hh"
-#include "exec_context.hh"
-#include "pc_event.hh"
-#include "trace.hh"
-#include "universe.hh"
+#include "sim/debug.hh"
+#include "cpu/exec_context.hh"
+#include "cpu/pc_event.hh"
+#include "base/trace.hh"
+#include "sim/universe.hh"
#ifdef FULL_SYSTEM
-#include "arguments.hh"
-#include "pmap.h"
-#include "kernel.hh"
-#include "memory_control.hh"
-#include "cpu.hh"
-#include "system.hh"
-#include "bpred.hh"
+#include "targetarch/arguments.hh"
+#include "targetarch/pmap.h"
+#include "targetarch/kernel.hh"
+#include "mem/functional_mem/memory_control.hh"
+#include "cpu/full_cpu/cpu.hh"
+#include "sim/system.hh"
+#include "cpu/full_cpu/bpred.hh"
#endif
using namespace std;
diff --git a/cpu/pc_event.hh b/cpu/pc_event.hh
index 24442f5f4..08c6fa59a 100644
--- a/cpu/pc_event.hh
+++ b/cpu/pc_event.hh
@@ -31,7 +31,7 @@
#include <vector>
-#include "mem_req.hh"
+#include "targetarch/mem_req.hh"
class ExecContext;
class PCEventQueue;
diff --git a/cpu/simple_cpu/simple_cpu.cc b/cpu/simple_cpu/simple_cpu.cc
index 41a612318..2bbd74efa 100644
--- a/cpu/simple_cpu/simple_cpu.cc
+++ b/cpu/simple_cpu/simple_cpu.cc
@@ -36,47 +36,47 @@
#include <stdlib.h>
#include <math.h>
-#include "host.hh"
-#include "cprintf.hh"
-#include "misc.hh"
-#include "smt.hh"
-
-#include "annotation.hh"
-#include "exec_context.hh"
-#include "base_cpu.hh"
-#include "debug.hh"
-#include "simple_cpu.hh"
-#include "inifile.hh"
-#include "mem_interface.hh"
-#include "base_mem.hh"
-#include "static_inst.hh"
+#include "sim/host.hh"
+#include "base/cprintf.hh"
+#include "base/misc.hh"
+#include "cpu/full_cpu/smt.hh"
+
+#include "sim/annotation.hh"
+#include "cpu/exec_context.hh"
+#include "cpu/base_cpu.hh"
+#include "sim/debug.hh"
+#include "cpu/simple_cpu/simple_cpu.hh"
+#include "base/inifile.hh"
+#include "mem/mem_interface.hh"
+#include "mem/base_mem.hh"
+#include "cpu/static_inst.hh"
#ifdef FULL_SYSTEM
-#include "memory_control.hh"
-#include "physical_memory.hh"
-#include "alpha_memory.hh"
-#include "system.hh"
+#include "mem/functional_mem/memory_control.hh"
+#include "mem/functional_mem/physical_memory.hh"
+#include "targetarch/alpha_memory.hh"
+#include "sim/system.hh"
#else // !FULL_SYSTEM
-#include "functional_memory.hh"
-#include "prog.hh"
-#include "eio.hh"
+#include "mem/functional_mem/functional_memory.hh"
+#include "sim/prog.hh"
+#include "eio/eio.hh"
#endif // FULL_SYSTEM
-#include "exetrace.hh"
-#include "trace.hh"
-#include "sim_events.hh"
-#include "pollevent.hh"
-#include "sim_object.hh"
-#include "sim_stats.hh"
+#include "cpu/exetrace.hh"
+#include "base/trace.hh"
+#include "sim/sim_events.hh"
+#include "base/pollevent.hh"
+#include "sim/sim_object.hh"
+#include "sim/sim_stats.hh"
-#include "range.hh"
-#include "symtab.hh"
+#include "base/range.hh"
+#include "base/loader/symtab.hh"
#ifdef FULL_SYSTEM
-#include "vtophys.hh"
-#include "pciareg.h"
-#include "remote_gdb.hh"
-#include "alpha_access.h"
+#include "targetarch/vtophys.hh"
+#include "dev/pciareg.h"
+#include "base/remote_gdb.hh"
+#include "dev/alpha_access.h"
#endif
diff --git a/cpu/simple_cpu/simple_cpu.hh b/cpu/simple_cpu/simple_cpu.hh
index c5671eb6f..658a92344 100644
--- a/cpu/simple_cpu/simple_cpu.hh
+++ b/cpu/simple_cpu/simple_cpu.hh
@@ -29,11 +29,11 @@
#ifndef __SIMPLE_CPU_HH__
#define __SIMPLE_CPU_HH__
-#include "base_cpu.hh"
-#include "eventq.hh"
-#include "symtab.hh"
-#include "pc_event.hh"
-#include "statistics.hh"
+#include "cpu/base_cpu.hh"
+#include "sim/eventq.hh"
+#include "base/loader/symtab.hh"
+#include "cpu/pc_event.hh"
+#include "base/statistics.hh"
// forward declarations
diff --git a/cpu/static_inst.cc b/cpu/static_inst.cc
index cf25d5f05..4cb45a818 100644
--- a/cpu/static_inst.cc
+++ b/cpu/static_inst.cc
@@ -27,8 +27,8 @@
*/
#include <iostream>
-#include "static_inst.hh"
-#include "universe.hh"
+#include "cpu/static_inst.hh"
+#include "sim/universe.hh"
template <class ISA>
StaticInstPtr<ISA> StaticInst<ISA>::nullStaticInstPtr;
diff --git a/cpu/static_inst.hh b/cpu/static_inst.hh
index b8f9cc00a..343a3d9b7 100644
--- a/cpu/static_inst.hh
+++ b/cpu/static_inst.hh
@@ -32,12 +32,12 @@
#include <bitset>
#include <string>
-#include "host.hh"
-#include "hashmap.hh"
-#include "refcnt.hh"
+#include "sim/host.hh"
+#include "base/hashmap.hh"
+#include "base/refcnt.hh"
-#include "op_class.hh"
-#include "isa_traits.hh"
+#include "cpu/full_cpu/op_class.hh"
+#include "targetarch/isa_traits.hh"
// forward declarations
class ExecContext;
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-30 08:02:56 +0000