summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--SConscript2
-rw-r--r--arch/alpha/alpha_linux_process.cc2
-rw-r--r--arch/alpha/alpha_tru64_process.cc2
-rw-r--r--base/misc.cc2
-rw-r--r--base/pollevent.cc2
-rw-r--r--base/pollevent.hh2
-rw-r--r--base/stats/events.cc2
-rw-r--r--base/trace.hh2
-rw-r--r--cpu/beta_cpu/fetch_impl.hh2
-rw-r--r--cpu/beta_cpu/full_cpu.cc2
-rw-r--r--cpu/beta_cpu/inst_queue_impl.hh2
-rw-r--r--cpu/pc_event.cc2
-rw-r--r--cpu/static_inst.cc2
-rw-r--r--dev/etherbus.cc2
-rw-r--r--dev/etherdump.cc2
-rw-r--r--dev/etherlink.cc2
-rw-r--r--dev/ide_disk.cc2
-rw-r--r--dev/pcidev.cc2
-rw-r--r--sim/builder.cc2
-rw-r--r--sim/eventq.cc2
-rw-r--r--sim/main.cc2
-rw-r--r--sim/root.cc (renamed from sim/universe.cc)2
-rw-r--r--sim/stat_control.cc2
23 files changed, 23 insertions, 23 deletions
diff --git a/SConscript b/SConscript
index ad4a974cc..dbfe5f9d2 100644
--- a/SConscript
+++ b/SConscript
@@ -223,6 +223,7 @@ base_sources = Split('''
sim/main.cc
sim/param.cc
sim/profile.cc
+ sim/root.cc
sim/serialize.cc
sim/sim_events.cc
sim/sim_exit.cc
@@ -231,7 +232,6 @@ base_sources = Split('''
sim/stat_context.cc
sim/stat_control.cc
sim/trace_context.cc
- sim/universe.cc
''')
# MySql sources
diff --git a/arch/alpha/alpha_linux_process.cc b/arch/alpha/alpha_linux_process.cc
index 600de4447..07bd5e800 100644
--- a/arch/alpha/alpha_linux_process.cc
+++ b/arch/alpha/alpha_linux_process.cc
@@ -44,7 +44,7 @@
#include "arch/alpha/alpha_common_syscall_emul.hh"
#include "sim/syscall_emul.hh"
-#include "sim/universe.hh" // for curTick & ticksPerSecond
+#include "sim/root.hh" // for curTick & ticksPerSecond
#include "arch/alpha/alpha_linux_process.hh"
diff --git a/arch/alpha/alpha_tru64_process.cc b/arch/alpha/alpha_tru64_process.cc
index 0910ec552..fe1bacc35 100644
--- a/arch/alpha/alpha_tru64_process.cc
+++ b/arch/alpha/alpha_tru64_process.cc
@@ -45,7 +45,7 @@
#include "arch/alpha/alpha_tru64_process.hh"
#include "sim/syscall_emul.hh"
-#include "sim/universe.hh" // for curTick & ticksPerSecond
+#include "sim/root.hh" // for curTick & ticksPerSecond
#include "base/trace.hh"
diff --git a/base/misc.cc b/base/misc.cc
index 4b7c3632a..41c9800df 100644
--- a/base/misc.cc
+++ b/base/misc.cc
@@ -35,7 +35,7 @@
#include "base/output.hh"
#include "base/trace.hh"
#include "sim/host.hh"
-#include "sim/universe.hh"
+#include "sim/root.hh"
using namespace std;
diff --git a/base/pollevent.cc b/base/pollevent.cc
index 127bf57f5..132d7de70 100644
--- a/base/pollevent.cc
+++ b/base/pollevent.cc
@@ -37,7 +37,7 @@
#include "sim/host.hh"
#include "base/misc.hh"
#include "base/pollevent.hh"
-#include "sim/universe.hh"
+#include "sim/root.hh"
#include "sim/serialize.hh"
using namespace std;
diff --git a/base/pollevent.hh b/base/pollevent.hh
index 3c9404c08..169d82a61 100644
--- a/base/pollevent.hh
+++ b/base/pollevent.hh
@@ -31,7 +31,7 @@
#include <vector>
#include <poll.h>
-#include "sim/universe.hh"
+#include "sim/root.hh"
class Checkpoint;
diff --git a/base/stats/events.cc b/base/stats/events.cc
index d716fa4d3..dd7ec2ccf 100644
--- a/base/stats/events.cc
+++ b/base/stats/events.cc
@@ -41,7 +41,7 @@
#include "base/match.hh"
#include "sim/host.hh"
#include "sim/sim_object.hh"
-#include "sim/universe.hh"
+#include "sim/root.hh"
using namespace std;
diff --git a/base/trace.hh b/base/trace.hh
index 054b14546..eb33213ed 100644
--- a/base/trace.hh
+++ b/base/trace.hh
@@ -34,7 +34,7 @@
#include "base/cprintf.hh"
#include "base/match.hh"
#include "sim/host.hh"
-#include "sim/universe.hh"
+#include "sim/root.hh"
#ifndef TRACING_ON
#ifndef NDEBUG
diff --git a/cpu/beta_cpu/fetch_impl.hh b/cpu/beta_cpu/fetch_impl.hh
index fd23354a1..b49064565 100644
--- a/cpu/beta_cpu/fetch_impl.hh
+++ b/cpu/beta_cpu/fetch_impl.hh
@@ -37,7 +37,7 @@
#include "mem/mem_req.hh"
#include "cpu/beta_cpu/fetch.hh"
-#include "sim/universe.hh"
+#include "sim/root.hh"
template<class Impl>
SimpleFetch<Impl>::CacheCompletionEvent
diff --git a/cpu/beta_cpu/full_cpu.cc b/cpu/beta_cpu/full_cpu.cc
index 515bec926..8eedc3769 100644
--- a/cpu/beta_cpu/full_cpu.cc
+++ b/cpu/beta_cpu/full_cpu.cc
@@ -31,7 +31,7 @@
#else
#include "sim/process.hh"
#endif
-#include "sim/universe.hh"
+#include "sim/root.hh"
#include "cpu/beta_cpu/alpha_dyn_inst.hh"
#include "cpu/beta_cpu/alpha_impl.hh"
diff --git a/cpu/beta_cpu/inst_queue_impl.hh b/cpu/beta_cpu/inst_queue_impl.hh
index f1a006b6e..51504347a 100644
--- a/cpu/beta_cpu/inst_queue_impl.hh
+++ b/cpu/beta_cpu/inst_queue_impl.hh
@@ -36,7 +36,7 @@
#include <vector>
-#include "sim/universe.hh"
+#include "sim/root.hh"
#include "cpu/beta_cpu/inst_queue.hh"
diff --git a/cpu/pc_event.cc b/cpu/pc_event.cc
index 2c6bb2443..f30e2a332 100644
--- a/cpu/pc_event.cc
+++ b/cpu/pc_event.cc
@@ -36,7 +36,7 @@
#include "cpu/exec_context.hh"
#include "cpu/pc_event.hh"
#include "sim/debug.hh"
-#include "sim/universe.hh"
+#include "sim/root.hh"
using namespace std;
diff --git a/cpu/static_inst.cc b/cpu/static_inst.cc
index d522dbf5a..4a2c81d5e 100644
--- a/cpu/static_inst.cc
+++ b/cpu/static_inst.cc
@@ -28,7 +28,7 @@
#include <iostream>
#include "cpu/static_inst.hh"
-#include "sim/universe.hh"
+#include "sim/root.hh"
template <class ISA>
StaticInstPtr<ISA> StaticInst<ISA>::nullStaticInstPtr;
diff --git a/dev/etherbus.cc b/dev/etherbus.cc
index ab2314c02..50731c265 100644
--- a/dev/etherbus.cc
+++ b/dev/etherbus.cc
@@ -41,7 +41,7 @@
#include "dev/etherint.hh"
#include "dev/etherpkt.hh"
#include "sim/builder.hh"
-#include "sim/universe.hh"
+#include "sim/root.hh"
using namespace std;
diff --git a/dev/etherdump.cc b/dev/etherdump.cc
index 39b94f923..42447a5e3 100644
--- a/dev/etherdump.cc
+++ b/dev/etherdump.cc
@@ -39,7 +39,7 @@
#include "base/output.hh"
#include "dev/etherdump.hh"
#include "sim/builder.hh"
-#include "sim/universe.hh"
+#include "sim/root.hh"
using std::string;
diff --git a/dev/etherlink.cc b/dev/etherlink.cc
index d63f4b3ad..6ae54906c 100644
--- a/dev/etherlink.cc
+++ b/dev/etherlink.cc
@@ -43,7 +43,7 @@
#include "sim/builder.hh"
#include "sim/serialize.hh"
#include "sim/system.hh"
-#include "sim/universe.hh"
+#include "sim/root.hh"
using namespace std;
diff --git a/dev/ide_disk.cc b/dev/ide_disk.cc
index 90a57bd2f..28f7b634a 100644
--- a/dev/ide_disk.cc
+++ b/dev/ide_disk.cc
@@ -49,7 +49,7 @@
#include "mem/bus/pio_interface_impl.hh"
#include "sim/builder.hh"
#include "sim/sim_object.hh"
-#include "sim/universe.hh"
+#include "sim/root.hh"
#include "targetarch/isa_traits.hh"
using namespace std;
diff --git a/dev/pcidev.cc b/dev/pcidev.cc
index 76b42390a..850635d49 100644
--- a/dev/pcidev.cc
+++ b/dev/pcidev.cc
@@ -46,7 +46,7 @@
#include "mem/functional_mem/memory_control.hh"
#include "sim/builder.hh"
#include "sim/param.hh"
-#include "sim/universe.hh"
+#include "sim/root.hh"
#include "dev/tsunamireg.h"
using namespace std;
diff --git a/sim/builder.cc b/sim/builder.cc
index 011694797..4362a66fd 100644
--- a/sim/builder.cc
+++ b/sim/builder.cc
@@ -35,7 +35,7 @@
#include "sim/config_node.hh"
#include "sim/host.hh"
#include "sim/sim_object.hh"
-#include "sim/universe.hh"
+#include "sim/root.hh"
using namespace std;
diff --git a/sim/eventq.cc b/sim/eventq.cc
index f975c5e97..50158d06f 100644
--- a/sim/eventq.cc
+++ b/sim/eventq.cc
@@ -38,7 +38,7 @@
#include "sim/eventq.hh"
#include "base/trace.hh"
-#include "sim/universe.hh"
+#include "sim/root.hh"
using namespace std;
diff --git a/sim/main.cc b/sim/main.cc
index ee59cb83b..94928e36a 100644
--- a/sim/main.cc
+++ b/sim/main.cc
@@ -61,7 +61,7 @@
#include "sim/sim_object.hh"
#include "sim/stat_control.hh"
#include "sim/stats.hh"
-#include "sim/universe.hh"
+#include "sim/root.hh"
using namespace std;
diff --git a/sim/universe.cc b/sim/root.cc
index 981a8ebae..47c6a6ad4 100644
--- a/sim/universe.cc
+++ b/sim/root.cc
@@ -37,7 +37,7 @@
#include "sim/builder.hh"
#include "sim/host.hh"
#include "sim/sim_object.hh"
-#include "sim/universe.hh"
+#include "sim/root.hh"
using namespace std;
diff --git a/sim/stat_control.cc b/sim/stat_control.cc
index 4d72ce213..37664dc65 100644
--- a/sim/stat_control.cc
+++ b/sim/stat_control.cc
@@ -43,7 +43,7 @@
#include "sim/eventq.hh"
#include "sim/sim_object.hh"
#include "sim/stat_control.hh"
-#include "sim/universe.hh"
+#include "sim/root.hh"
using namespace std;
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-09 13:01:51 +0000