move eio stuff to encumbered

--HG--
extra : convert_revision : 9061382dba285c84931f8825e7159db0e9899944

diff --git a/SConscript b/SConscript
index f8ffaa7a88a34a2dccf391313b0a5ec8caf409e4..5b96f5b4be3f7e980799e128504d5c660f7383e6 100644 (file)
--- a/SConscript
+++ b/SConscript
@@ -329,9 +329,9 @@ syscall_emulation_sources = Split('''
        cpu/memtest/memtest.cc
         cpu/trace/opt_cpu.cc
        cpu/trace/trace_cpu.cc
-       eio/eio.cc
-       eio/exolex.cc
-       eio/libexo.cc
+       encumbered/eio/eio.cc
+       encumbered/eio/exolex.cc
+       encumbered/eio/libexo.cc
        sim/process.cc
        sim/syscall_emul.cc
         ''')
@@ -350,7 +350,6 @@ targetarch_files = Split('''
         faults.hh
         isa_fullsys_traits.hh
         isa_traits.hh
-        machine_exo.h
         osfpal.hh
         pseudo_inst.hh
         vptr.hh

diff --git a/cpu/o3/alpha_cpu_builder.cc b/cpu/o3/alpha_cpu_builder.cc
index 6f4e4f0bec6ff58c3ed6aa41b959b45a65f8629d..57061c052719869f1cfa0a1af22477e63a8eb33e 100644 (file)
--- a/cpu/o3/alpha_cpu_builder.cc
+++ b/cpu/o3/alpha_cpu_builder.cc
@@ -53,7 +53,6 @@
 #include "targetarch/alpha_memory.hh"
 #include "targetarch/vtophys.hh"
 #else // !FULL_SYSTEM
-#include "eio/eio.hh"
 #include "mem/functional/functional.hh"
 #endif // FULL_SYSTEM
 

diff --git a/cpu/simple/cpu.cc b/cpu/simple/cpu.cc
index 306398ac2ef1617b0d9fc08221b9b9f474c7c9d0..d16993c5cccedbb07ade7920ae60ce5b97dc8968 100644 (file)
--- a/cpu/simple/cpu.cc
+++ b/cpu/simple/cpu.cc
@@ -67,7 +67,6 @@
 #include "targetarch/alpha_memory.hh"
 #include "targetarch/vtophys.hh"
 #else // !FULL_SYSTEM
-#include "eio/eio.hh"
 #include "mem/functional/functional.hh"
 #endif // FULL_SYSTEM
 

diff --git a/sim/process.cc b/sim/process.cc
index e7a9afa9d13f9f6e43b5faf02f35d39078fe5f1b..ab256454c262771ccb672d9bfb3d3daa0fb04149 100644 (file)
--- a/sim/process.cc
+++ b/sim/process.cc
@@ -38,8 +38,8 @@
 #include "base/statistics.hh"
 #include "cpu/exec_context.hh"
 #include "cpu/smt.hh"
-#include "eio/eio.hh"
 #include "encumbered/cpu/full/thread.hh"
+#include "encumbered/eio/eio.hh"
 #include "encumbered/mem/functional/main.hh"
 #include "sim/builder.hh"
 #include "sim/fake_syscall.hh"