summaryrefslogtreecommitdiff
path: root/sim
diff options
context:
space:
mode:
Diffstat (limited to 'sim')
-rw-r--r--sim/eventq.cc2
-rw-r--r--sim/main.cc4
-rw-r--r--sim/process.cc6
-rw-r--r--sim/stat_control.cc2
-rw-r--r--sim/syscall_emul.cc2
-rw-r--r--sim/syscall_emul.hh2
-rw-r--r--sim/system.cc4
7 files changed, 11 insertions, 11 deletions
diff --git a/sim/eventq.cc b/sim/eventq.cc
index 50158d06f..1fb8ef98a 100644
--- a/sim/eventq.cc
+++ b/sim/eventq.cc
@@ -33,7 +33,7 @@
#include <sstream>
#include <vector>
-#include "cpu/full_cpu/smt.hh"
+#include "cpu/smt.hh"
#include "base/misc.hh"
#include "sim/eventq.hh"
diff --git a/sim/main.cc b/sim/main.cc
index ed8bf9e63..066f5f4c3 100644
--- a/sim/main.cc
+++ b/sim/main.cc
@@ -49,8 +49,8 @@
#include "base/statistics.hh"
#include "base/str.hh"
#include "base/time.hh"
-#include "cpu/base_cpu.hh"
-#include "cpu/full_cpu/smt.hh"
+#include "cpu/base.hh"
+#include "cpu/smt.hh"
#include "python/pyconfig.hh"
#include "sim/async.hh"
#include "sim/builder.hh"
diff --git a/sim/process.cc b/sim/process.cc
index 3541fd040..e7a9afa9d 100644
--- a/sim/process.cc
+++ b/sim/process.cc
@@ -37,10 +37,10 @@
#include "base/loader/symtab.hh"
#include "base/statistics.hh"
#include "cpu/exec_context.hh"
-#include "cpu/full_cpu/smt.hh"
-#include "cpu/full_cpu/thread.hh"
+#include "cpu/smt.hh"
#include "eio/eio.hh"
-#include "mem/functional_mem/main_memory.hh"
+#include "encumbered/cpu/full/thread.hh"
+#include "encumbered/mem/functional/main.hh"
#include "sim/builder.hh"
#include "sim/fake_syscall.hh"
#include "sim/process.hh"
diff --git a/sim/stat_control.cc b/sim/stat_control.cc
index 37664dc65..578073efa 100644
--- a/sim/stat_control.cc
+++ b/sim/stat_control.cc
@@ -39,7 +39,7 @@
#include "base/str.hh"
#include "base/time.hh"
#include "base/stats/output.hh"
-#include "cpu/base_cpu.hh"
+#include "cpu/base.hh"
#include "sim/eventq.hh"
#include "sim/sim_object.hh"
#include "sim/stat_control.hh"
diff --git a/sim/syscall_emul.cc b/sim/syscall_emul.cc
index 13df2b7a2..5abbdfd74 100644
--- a/sim/syscall_emul.cc
+++ b/sim/syscall_emul.cc
@@ -34,7 +34,7 @@
#include "sim/syscall_emul.hh"
#include "base/trace.hh"
#include "cpu/exec_context.hh"
-#include "cpu/base_cpu.hh"
+#include "cpu/base.hh"
#include "sim/process.hh"
#include "sim/sim_events.hh"
diff --git a/sim/syscall_emul.hh b/sim/syscall_emul.hh
index 26d3b873c..417531cc3 100644
--- a/sim/syscall_emul.hh
+++ b/sim/syscall_emul.hh
@@ -39,7 +39,7 @@
#include <string>
#include "base/intmath.hh" // for RoundUp
-#include "mem/functional_mem/functional_memory.hh"
+#include "mem/functional/functional.hh"
#include "targetarch/isa_traits.hh" // for Addr
#include "base/trace.hh"
diff --git a/sim/system.cc b/sim/system.cc
index 8844f13de..70a1b8a32 100644
--- a/sim/system.cc
+++ b/sim/system.cc
@@ -31,8 +31,8 @@
#include "base/remote_gdb.hh"
#include "cpu/exec_context.hh"
#include "kern/kernel_stats.hh"
-#include "mem/functional_mem/memory_control.hh"
-#include "mem/functional_mem/physical_memory.hh"
+#include "mem/functional/memory_control.hh"
+#include "mem/functional/physical.hh"
#include "targetarch/vtophys.hh"
#include "sim/builder.hh"
#include "sim/system.hh"