summaryrefslogtreecommitdiff
path: root/sim
diff options
context:
space:
mode:
Diffstat (limited to 'sim')
-rw-r--r--sim/debug.cc8
-rw-r--r--sim/eventq.cc10
-rw-r--r--sim/eventq.hh8
-rw-r--r--sim/main.cc34
-rw-r--r--sim/param.cc16
-rw-r--r--sim/param.hh2
-rw-r--r--sim/prog.cc26
-rw-r--r--sim/prog.hh8
-rw-r--r--sim/serialize.cc18
-rw-r--r--sim/serialize.hh4
-rw-r--r--sim/sim_events.cc12
-rw-r--r--sim/sim_events.hh2
-rw-r--r--sim/sim_object.cc14
-rw-r--r--sim/sim_object.hh4
-rw-r--r--sim/sim_time.cc2
-rw-r--r--sim/system.cc18
-rw-r--r--sim/system.hh6
-rw-r--r--sim/universe.cc6
18 files changed, 99 insertions, 99 deletions
diff --git a/sim/debug.cc b/sim/debug.cc
index bfc5c9987..b18642942 100644
--- a/sim/debug.cc
+++ b/sim/debug.cc
@@ -33,10 +33,10 @@
#include <string>
#include <vector>
-#include "debug.hh"
-#include "eventq.hh"
-#include "param.hh"
-#include "sim_events.hh"
+#include "sim/debug.hh"
+#include "sim/eventq.hh"
+#include "sim/param.hh"
+#include "sim/sim_events.hh"
using namespace std;
diff --git a/sim/eventq.cc b/sim/eventq.cc
index 36ef8aab2..6ffce4c0e 100644
--- a/sim/eventq.cc
+++ b/sim/eventq.cc
@@ -33,12 +33,12 @@
#include <sstream>
#include <vector>
-#include "smt.hh"
-#include "misc.hh"
+#include "cpu/full_cpu/smt.hh"
+#include "base/misc.hh"
-#include "eventq.hh"
-#include "trace.hh"
-#include "universe.hh"
+#include "sim/eventq.hh"
+#include "base/trace.hh"
+#include "sim/universe.hh"
using namespace std;
diff --git a/sim/eventq.hh b/sim/eventq.hh
index 71b027768..df8e00bd8 100644
--- a/sim/eventq.hh
+++ b/sim/eventq.hh
@@ -40,11 +40,11 @@
#include <string>
#include <vector>
-#include "host.hh" // for Tick
+#include "sim/host.hh" // for Tick
-#include "fast_alloc.hh"
-#include "serialize.hh"
-#include "trace.hh"
+#include "base/fast_alloc.hh"
+#include "sim/serialize.hh"
+#include "base/trace.hh"
class EventQueue; // forward declaration
diff --git a/sim/main.cc b/sim/main.cc
index ebf96741d..ae4b5af77 100644
--- a/sim/main.cc
+++ b/sim/main.cc
@@ -37,23 +37,23 @@
#include <string>
#include <vector>
-#include "host.hh"
-#include "misc.hh"
-
-#include "copyright.hh"
-#include "inifile.hh"
-#include "configfile.hh"
-#include "pollevent.hh"
-#include "statistics.hh"
-#include "sim_events.hh"
-#include "sim_exit.hh"
-#include "sim_object.hh"
-#include "sim_stats.hh"
-#include "sim_time.hh"
-#include "smt.hh"
-
-#include "base_cpu.hh"
-#include "async.hh"
+#include "sim/host.hh"
+#include "base/misc.hh"
+
+#include "base/copyright.hh"
+#include "base/inifile.hh"
+#include "sim/configfile.hh"
+#include "base/pollevent.hh"
+#include "base/statistics.hh"
+#include "sim/sim_events.hh"
+#include "sim/sim_exit.hh"
+#include "sim/sim_object.hh"
+#include "sim/sim_stats.hh"
+#include "sim/sim_time.hh"
+#include "cpu/full_cpu/smt.hh"
+
+#include "cpu/base_cpu.hh"
+#include "sim/async.hh"
using namespace std;
diff --git a/sim/param.cc b/sim/param.cc
index 432953670..8284983a8 100644
--- a/sim/param.cc
+++ b/sim/param.cc
@@ -34,14 +34,14 @@
#include <assert.h>
-#include "param.hh"
-#include "sim_object.hh"
-#include "inifile.hh"
-#include "configfile.hh"
-#include "config_node.hh"
-#include "misc.hh"
-#include "str.hh"
-#include "trace.hh"
+#include "sim/param.hh"
+#include "sim/sim_object.hh"
+#include "base/inifile.hh"
+#include "sim/configfile.hh"
+#include "sim/config_node.hh"
+#include "base/misc.hh"
+#include "base/str.hh"
+#include "base/trace.hh"
using namespace std;
diff --git a/sim/param.hh b/sim/param.hh
index 983032854..fb2c9dd44 100644
--- a/sim/param.hh
+++ b/sim/param.hh
@@ -33,7 +33,7 @@
#include <string>
#include <vector>
-#include "configfile.hh"
+#include "sim/configfile.hh"
// forward decls
class BaseParam;
diff --git a/sim/prog.cc b/sim/prog.cc
index 0c9191d5d..c52d51f63 100644
--- a/sim/prog.cc
+++ b/sim/prog.cc
@@ -32,19 +32,19 @@
#include <string>
-#include "main_memory.hh"
-#include "prog.hh"
-
-#include "eio.hh"
-#include "intmath.hh"
-#include "thread.hh"
-#include "fake_syscall.hh"
-#include "object_file.hh"
-#include "exec_context.hh"
-#include "smt.hh"
-
-#include "statistics.hh"
-#include "sim_stats.hh"
+#include "mem/functional_mem/main_memory.hh"
+#include "sim/prog.hh"
+
+#include "eio/eio.hh"
+#include "base/intmath.hh"
+#include "cpu/full_cpu/thread.hh"
+#include "sim/fake_syscall.hh"
+#include "base/loader/object_file.hh"
+#include "cpu/exec_context.hh"
+#include "cpu/full_cpu/smt.hh"
+
+#include "base/statistics.hh"
+#include "sim/sim_stats.hh"
using namespace std;
diff --git a/sim/prog.hh b/sim/prog.hh
index 0afd06ffd..ee4bc59fe 100644
--- a/sim/prog.hh
+++ b/sim/prog.hh
@@ -38,10 +38,10 @@
#include <list>
-#include "isa_traits.hh"
-#include "sim_object.hh"
-#include "sim_stats.hh"
-#include "statistics.hh"
+#include "targetarch/isa_traits.hh"
+#include "sim/sim_object.hh"
+#include "sim/sim_stats.hh"
+#include "base/statistics.hh"
class ExecContext;
class FunctionalMemory;
diff --git a/sim/serialize.cc b/sim/serialize.cc
index a2e3d7250..6144c97d0 100644
--- a/sim/serialize.cc
+++ b/sim/serialize.cc
@@ -33,15 +33,15 @@
#include <string>
#include <vector>
-#include "misc.hh"
-
-#include "eventq.hh"
-#include "param.hh"
-#include "serialize.hh"
-#include "inifile.hh"
-#include "sim_events.hh"
-#include "sim_object.hh"
-#include "trace.hh"
+#include "base/misc.hh"
+
+#include "sim/eventq.hh"
+#include "sim/param.hh"
+#include "sim/serialize.hh"
+#include "base/inifile.hh"
+#include "sim/sim_events.hh"
+#include "sim/sim_object.hh"
+#include "base/trace.hh"
using namespace std;
diff --git a/sim/serialize.hh b/sim/serialize.hh
index c5fb86140..ffcbbcdc2 100644
--- a/sim/serialize.hh
+++ b/sim/serialize.hh
@@ -37,8 +37,8 @@
#include <list>
#include <iostream>
-#include "host.hh"
-#include "configfile.hh"
+#include "sim/host.hh"
+#include "sim/configfile.hh"
class IniFile;
diff --git a/sim/sim_events.cc b/sim/sim_events.cc
index 8a2481484..98480e76b 100644
--- a/sim/sim_events.cc
+++ b/sim/sim_events.cc
@@ -28,12 +28,12 @@
#include <string>
-#include "cpu.hh"
-#include "eventq.hh"
-#include "hostinfo.hh"
-#include "sim_events.hh"
-#include "sim_exit.hh"
-#include "sim_stats.hh"
+#include "cpu/full_cpu/cpu.hh"
+#include "sim/eventq.hh"
+#include "base/hostinfo.hh"
+#include "sim/sim_events.hh"
+#include "sim/sim_exit.hh"
+#include "sim/sim_stats.hh"
using namespace std;
diff --git a/sim/sim_events.hh b/sim/sim_events.hh
index e9a5f3251..b1ae7793a 100644
--- a/sim/sim_events.hh
+++ b/sim/sim_events.hh
@@ -29,7 +29,7 @@
#ifndef __SIM_EVENTS_HH__
#define __SIM_EVENTS_HH__
-#include "eventq.hh"
+#include "sim/eventq.hh"
//
// Event to terminate simulation at a particular cycle/instruction
diff --git a/sim/sim_object.cc b/sim/sim_object.cc
index 3583c30c2..955c43bb8 100644
--- a/sim/sim_object.cc
+++ b/sim/sim_object.cc
@@ -28,13 +28,13 @@
#include <assert.h>
-#include "sim_object.hh"
-#include "inifile.hh"
-#include "configfile.hh"
-#include "host.hh"
-#include "misc.hh"
-#include "trace.hh"
-#include "sim_stats.hh"
+#include "sim/sim_object.hh"
+#include "base/inifile.hh"
+#include "sim/configfile.hh"
+#include "sim/host.hh"
+#include "base/misc.hh"
+#include "base/trace.hh"
+#include "sim/sim_stats.hh"
using namespace std;
diff --git a/sim/sim_object.hh b/sim/sim_object.hh
index 141b58e0a..7f71d1852 100644
--- a/sim/sim_object.hh
+++ b/sim/sim_object.hh
@@ -38,8 +38,8 @@
#include <vector>
#include <iostream>
-#include "param.hh"
-#include "serialize.hh"
+#include "sim/param.hh"
+#include "sim/serialize.hh"
/*
* Abstract superclass for simulation objects. Represents things that
diff --git a/sim/sim_time.cc b/sim/sim_time.cc
index c235be5db..3d91eba83 100644
--- a/sim/sim_time.cc
+++ b/sim/sim_time.cc
@@ -31,7 +31,7 @@
#include <time.h>
#include <iostream>
-#include "sim_time.hh"
+#include "sim/sim_time.hh"
using namespace std;
diff --git a/sim/system.cc b/sim/system.cc
index 0f6dce10c..74216176a 100644
--- a/sim/system.cc
+++ b/sim/system.cc
@@ -26,15 +26,15 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "exec_context.hh"
-#include "object_file.hh"
-#include "memory_control.hh"
-#include "physical_memory.hh"
-#include "symtab.hh"
-#include "remote_gdb.hh"
-#include "vtophys.hh"
-#include "system.hh"
-#include "trace.hh"
+#include "cpu/exec_context.hh"
+#include "base/loader/object_file.hh"
+#include "mem/functional_mem/memory_control.hh"
+#include "mem/functional_mem/physical_memory.hh"
+#include "base/loader/symtab.hh"
+#include "base/remote_gdb.hh"
+#include "targetarch/vtophys.hh"
+#include "sim/system.hh"
+#include "base/trace.hh"
using namespace std;
diff --git a/sim/system.hh b/sim/system.hh
index bd2fd89b1..830e78f4a 100644
--- a/sim/system.hh
+++ b/sim/system.hh
@@ -31,9 +31,9 @@
#include <string>
-#include "sim_object.hh"
-#include "pc_event.hh"
-#include "symtab.hh"
+#include "sim/sim_object.hh"
+#include "cpu/pc_event.hh"
+#include "base/loader/symtab.hh"
class MemoryController;
class PhysicalMemory;
diff --git a/sim/universe.cc b/sim/universe.cc
index 83f268b14..8274d84ca 100644
--- a/sim/universe.cc
+++ b/sim/universe.cc
@@ -30,9 +30,9 @@
#include <string>
#include <vector>
-#include "universe.hh"
-#include "host.hh"
-#include "param.hh"
+#include "sim/universe.hh"
+#include "sim/host.hh"
+#include "sim/param.hh"
using namespace std;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-07 02:29:07 +0000