summaryrefslogtreecommitdiff
path: root/dev
diff options
context:
space:
mode:
Diffstat (limited to 'dev')
-rw-r--r--dev/alpha_console.cc22
-rw-r--r--dev/alpha_console.hh6
-rw-r--r--dev/console.cc12
-rw-r--r--dev/console.hh10
-rw-r--r--dev/disk_image.cc10
-rw-r--r--dev/disk_image.hh4
-rw-r--r--dev/etherbus.cc12
-rw-r--r--dev/etherbus.hh6
-rw-r--r--dev/etherdump.cc6
-rw-r--r--dev/etherdump.hh4
-rw-r--r--dev/etherint.cc6
-rw-r--r--dev/etherint.hh4
-rw-r--r--dev/etherlink.cc12
-rw-r--r--dev/etherlink.hh10
-rw-r--r--dev/etherpkt.hh4
-rw-r--r--dev/ethertap.cc16
-rw-r--r--dev/ethertap.hh10
-rw-r--r--dev/simple_disk.cc10
-rw-r--r--dev/simple_disk.hh4
19 files changed, 84 insertions, 84 deletions
diff --git a/dev/alpha_console.cc b/dev/alpha_console.cc
index 6a1e2b169..1d41ce08f 100644
--- a/dev/alpha_console.cc
+++ b/dev/alpha_console.cc
@@ -35,17 +35,17 @@
#include <string>
-#include "alpha_console.hh"
-#include "base_cpu.hh"
-#include "console.hh"
-#include "exec_context.hh"
-#include "memory_control.hh"
-#include "simple_disk.hh"
-#include "tlaser_clock.hh"
-#include "system.hh"
-#include "trace.hh"
-#include "inifile.hh"
-#include "str.hh" // for to_number()
+#include "dev/alpha_console.hh"
+#include "cpu/base_cpu.hh"
+#include "dev/console.hh"
+#include "cpu/exec_context.hh"
+#include "mem/functional_mem/memory_control.hh"
+#include "dev/simple_disk.hh"
+#include "dev/tlaser_clock.hh"
+#include "sim/system.hh"
+#include "base/trace.hh"
+#include "base/inifile.hh"
+#include "base/str.hh" // for to_number()
using namespace std;
diff --git a/dev/alpha_console.hh b/dev/alpha_console.hh
index 518f5fccb..608e6ac00 100644
--- a/dev/alpha_console.hh
+++ b/dev/alpha_console.hh
@@ -33,9 +33,9 @@
#ifndef __ALPHA_CONSOLE_HH__
#define __ALPHA_CONSOLE_HH__
-#include "host.hh"
-#include "alpha_access.h"
-#include "mmap_device.hh"
+#include "sim/host.hh"
+#include "dev/alpha_access.h"
+#include "mem/functional_mem/mmap_device.hh"
class BaseCPU;
class SimConsole;
diff --git a/dev/console.cc b/dev/console.cc
index 8141a6508..e3be3168f 100644
--- a/dev/console.cc
+++ b/dev/console.cc
@@ -16,13 +16,13 @@
#include <sstream>
#include <string>
-#include "misc.hh"
-#include "ev5.hh"
+#include "base/misc.hh"
+#include "targetarch/ev5.hh"
-#include "console.hh"
-#include "socket.hh"
-#include "trace.hh"
-#include "memory_control.hh"
+#include "dev/console.hh"
+#include "base/socket.hh"
+#include "base/trace.hh"
+#include "mem/functional_mem/memory_control.hh"
using namespace std;
diff --git a/dev/console.hh b/dev/console.hh
index 092e6ea53..ba4250db4 100644
--- a/dev/console.hh
+++ b/dev/console.hh
@@ -9,11 +9,11 @@
#include <iostream>
-#include "circlebuf.hh"
-#include "intr_control.hh"
-#include "pollevent.hh"
-#include "socket.hh"
-#include "sim_object.hh"
+#include "base/circlebuf.hh"
+#include "cpu/intr_control.hh"
+#include "base/pollevent.hh"
+#include "base/socket.hh"
+#include "sim/sim_object.hh"
class ConsoleListener;
class SimConsole : public SimObject
diff --git a/dev/disk_image.cc b/dev/disk_image.cc
index 17a7f3e9d..0a3955ed1 100644
--- a/dev/disk_image.cc
+++ b/dev/disk_image.cc
@@ -40,11 +40,11 @@
#include <fstream>
#include <string>
-#include "disk_image.hh"
-#include "misc.hh"
-#include "trace.hh"
-#include "sim_exit.hh"
-#include "callback.hh"
+#include "dev/disk_image.hh"
+#include "base/misc.hh"
+#include "base/trace.hh"
+#include "sim/sim_exit.hh"
+#include "base/callback.hh"
using namespace std;
diff --git a/dev/disk_image.hh b/dev/disk_image.hh
index 2cfa1490a..12048a042 100644
--- a/dev/disk_image.hh
+++ b/dev/disk_image.hh
@@ -35,8 +35,8 @@
#include <fstream>
-#include "hashmap.hh"
-#include "sim_object.hh"
+#include "base/hashmap.hh"
+#include "sim/sim_object.hh"
#define SectorSize (512)
diff --git a/dev/etherbus.cc b/dev/etherbus.cc
index fa5a62208..fa1d84272 100644
--- a/dev/etherbus.cc
+++ b/dev/etherbus.cc
@@ -36,12 +36,12 @@
#include <math.h>
-#include "etherbus.hh"
-#include "etherdump.hh"
-#include "etherint.hh"
-#include "etherpkt.hh"
-#include "trace.hh"
-#include "universe.hh"
+#include "dev/etherbus.hh"
+#include "dev/etherdump.hh"
+#include "dev/etherint.hh"
+#include "dev/etherpkt.hh"
+#include "base/trace.hh"
+#include "sim/universe.hh"
using namespace std;
diff --git a/dev/etherbus.hh b/dev/etherbus.hh
index f64aa45e1..f7f633303 100644
--- a/dev/etherbus.hh
+++ b/dev/etherbus.hh
@@ -33,9 +33,9 @@
#ifndef __ETHERBUS_H__
#define __ETHERBUS_H__
-#include "eventq.hh"
-#include "etherpkt.hh"
-#include "sim_object.hh"
+#include "sim/eventq.hh"
+#include "dev/etherpkt.hh"
+#include "sim/sim_object.hh"
class EtherDump;
class EtherInt;
diff --git a/dev/etherdump.cc b/dev/etherdump.cc
index 034db86aa..dcca0e458 100644
--- a/dev/etherdump.cc
+++ b/dev/etherdump.cc
@@ -34,9 +34,9 @@
#include <string>
-#include "universe.hh"
-#include "etherdump.hh"
-#include "universe.hh"
+#include "sim/universe.hh"
+#include "dev/etherdump.hh"
+#include "sim/universe.hh"
using std::string;
diff --git a/dev/etherdump.hh b/dev/etherdump.hh
index 87824c470..b3aefeb74 100644
--- a/dev/etherdump.hh
+++ b/dev/etherdump.hh
@@ -34,8 +34,8 @@
#define __ETHERDUMP_H__
#include <fstream>
-#include "etherpkt.hh"
-#include "sim_object.hh"
+#include "dev/etherpkt.hh"
+#include "sim/sim_object.hh"
/*
* Simple object for creating a simple pcap style packet trace
diff --git a/dev/etherint.cc b/dev/etherint.cc
index 51b18c6aa..2845ce729 100644
--- a/dev/etherint.cc
+++ b/dev/etherint.cc
@@ -26,9 +26,9 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "etherint.hh"
-#include "misc.hh"
-#include "sim_object.hh"
+#include "dev/etherint.hh"
+#include "base/misc.hh"
+#include "sim/sim_object.hh"
void
EtherInt::setPeer(EtherInt *p)
diff --git a/dev/etherint.hh b/dev/etherint.hh
index 00e291fc9..1aa85f17c 100644
--- a/dev/etherint.hh
+++ b/dev/etherint.hh
@@ -36,8 +36,8 @@
#include <string>
-#include "etherpkt.hh"
-#include "sim_object.hh"
+#include "dev/etherpkt.hh"
+#include "sim/sim_object.hh"
/*
* Class representing the actual interface between two ethernet
diff --git a/dev/etherlink.cc b/dev/etherlink.cc
index 1d3578e58..699e9f331 100644
--- a/dev/etherlink.cc
+++ b/dev/etherlink.cc
@@ -36,12 +36,12 @@
#include <math.h>
-#include "etherlink.hh"
-#include "etherdump.hh"
-#include "etherint.hh"
-#include "etherpkt.hh"
-#include "trace.hh"
-#include "universe.hh"
+#include "dev/etherlink.hh"
+#include "dev/etherdump.hh"
+#include "dev/etherint.hh"
+#include "dev/etherpkt.hh"
+#include "base/trace.hh"
+#include "sim/universe.hh"
using namespace std;
diff --git a/dev/etherlink.hh b/dev/etherlink.hh
index b88d80420..a88fe24df 100644
--- a/dev/etherlink.hh
+++ b/dev/etherlink.hh
@@ -33,11 +33,11 @@
#ifndef __ETHERLINK_HH__
#define __ETHERLINK_HH__
-#include "host.hh"
-#include "eventq.hh"
-#include "etherint.hh"
-#include "etherpkt.hh"
-#include "sim_object.hh"
+#include "sim/host.hh"
+#include "sim/eventq.hh"
+#include "dev/etherint.hh"
+#include "dev/etherpkt.hh"
+#include "sim/sim_object.hh"
class EtherDump;
diff --git a/dev/etherpkt.hh b/dev/etherpkt.hh
index 4927cc779..678b83b33 100644
--- a/dev/etherpkt.hh
+++ b/dev/etherpkt.hh
@@ -35,9 +35,9 @@
#include <memory>
-#include "host.hh"
+#include "sim/host.hh"
-#include "refcnt.hh"
+#include "base/refcnt.hh"
/*
* Reference counted class containing ethernet packet data
diff --git a/dev/ethertap.cc b/dev/ethertap.cc
index 6643cab30..e12c07c26 100644
--- a/dev/ethertap.cc
+++ b/dev/ethertap.cc
@@ -40,14 +40,14 @@
#include <deque>
#include <string>
-#include "etherdump.hh"
-#include "etherint.hh"
-#include "etherpkt.hh"
-#include "ethertap.hh"
-#include "pollevent.hh"
-#include "socket.hh"
-#include "trace.hh"
-#include "misc.hh"
+#include "dev/etherdump.hh"
+#include "dev/etherint.hh"
+#include "dev/etherpkt.hh"
+#include "dev/ethertap.hh"
+#include "base/pollevent.hh"
+#include "base/socket.hh"
+#include "base/trace.hh"
+#include "base/misc.hh"
using namespace std;
diff --git a/dev/ethertap.hh b/dev/ethertap.hh
index 434df47b0..6e99bd91d 100644
--- a/dev/ethertap.hh
+++ b/dev/ethertap.hh
@@ -36,11 +36,11 @@
#include <queue>
#include <string>
-#include "etherint.hh"
-#include "etherpkt.hh"
-#include "eventq.hh"
-#include "pollevent.hh"
-#include "sim_object.hh"
+#include "dev/etherint.hh"
+#include "dev/etherpkt.hh"
+#include "sim/eventq.hh"
+#include "base/pollevent.hh"
+#include "sim/sim_object.hh"
/*
* Interface to connect a simulated ethernet device to the real world
diff --git a/dev/simple_disk.cc b/dev/simple_disk.cc
index 25645db5f..d26cf44ea 100644
--- a/dev/simple_disk.cc
+++ b/dev/simple_disk.cc
@@ -38,11 +38,11 @@
#include <string.h>
#include <unistd.h>
-#include "disk_image.hh"
-#include "misc.hh"
-#include "physical_memory.hh"
-#include "simple_disk.hh"
-#include "trace.hh"
+#include "dev/disk_image.hh"
+#include "base/misc.hh"
+#include "mem/functional_mem/physical_memory.hh"
+#include "dev/simple_disk.hh"
+#include "base/trace.hh"
using namespace std;
diff --git a/dev/simple_disk.hh b/dev/simple_disk.hh
index bf684950d..935865ba4 100644
--- a/dev/simple_disk.hh
+++ b/dev/simple_disk.hh
@@ -33,8 +33,8 @@
#ifndef __SIMPLE_DISK_HH__
#define __SIMPLE_DISK_HH__
-#include "physical_memory.hh"
-#include "sim_object.hh"
+#include "mem/functional_mem/physical_memory.hh"
+#include "sim/sim_object.hh"
class DiskImage;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-08 18:35:41 +0000