diff options
| -rw-r--r-- | arch/SConscript | 6 | ||||
| -rw-r--r-- | arch/alpha/SConscript | 8 | ||||
| -rw-r--r-- | arch/alpha/ev5.cc | 2 | ||||
| -rw-r--r-- | arch/alpha/linux_process.cc (renamed from arch/alpha/alpha_linux_process.cc) | 4 | ||||
| -rw-r--r-- | arch/alpha/linux_process.hh (renamed from arch/alpha/alpha_linux_process.hh) | 0 | ||||
| -rw-r--r-- | arch/alpha/tlb.cc (renamed from arch/alpha/alpha_memory.cc) | 2 | ||||
| -rw-r--r-- | arch/alpha/tlb.hh (renamed from arch/alpha/alpha_memory.hh) | 0 | ||||
| -rw-r--r-- | arch/alpha/tru64_process.cc (renamed from arch/alpha/alpha_tru64_process.cc) | 4 | ||||
| -rw-r--r-- | arch/alpha/tru64_process.hh (renamed from arch/alpha/alpha_tru64_process.hh) | 0 | ||||
| -rw-r--r-- | cpu/exec_context.hh | 2 | ||||
| -rw-r--r-- | cpu/o3/alpha_cpu_builder.cc | 2 | ||||
| -rw-r--r-- | cpu/simple/cpu.cc | 2 | ||||
| -rw-r--r-- | sim/process.cc | 4 |
13 files changed, 18 insertions, 18 deletions
diff --git a/arch/SConscript b/arch/SConscript index 2036b6a56..c62e45763 100644 --- a/arch/SConscript +++ b/arch/SConscript @@ -46,9 +46,9 @@ sources = [] # List of headers to generate isa_switch_hdrs = Split(''' isa_traits.hh - alpha_linux_process.hh - alpha_tru64_process.hh - alpha_memory.hh + linux_process.hh + tru64_process.hh + tlb.hh aout_machdep.h ecoff_machdep.h arguments.hh diff --git a/arch/alpha/SConscript b/arch/alpha/SConscript index 050dfb9cf..3b0e69b7a 100644 --- a/arch/alpha/SConscript +++ b/arch/alpha/SConscript @@ -50,7 +50,7 @@ base_sources = Split(''' # Full-system sources full_system_sources = Split(''' - alpha_memory.cc + tlb.cc arguments.cc ev5.cc osfpal.cc @@ -61,9 +61,9 @@ full_system_sources = Split(''' # Syscall emulation (non-full-system) sources syscall_emulation_sources = Split(''' - alpha_common_syscall_emul.cc - alpha_linux_process.cc - alpha_tru64_process.cc + common_syscall_emul.cc + linux_process.cc + tru64_process.cc ''') # Set up complete list of sources based on configuration. diff --git a/arch/alpha/ev5.cc b/arch/alpha/ev5.cc index b89a6d10d..0520de1ed 100644 --- a/arch/alpha/ev5.cc +++ b/arch/alpha/ev5.cc @@ -26,7 +26,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "arch/alpha/alpha_memory.hh" +#include "arch/alpha/tlb.hh" #include "arch/alpha/isa_traits.hh" #include "arch/alpha/osfpal.hh" #include "base/kgdb.h" diff --git a/arch/alpha/alpha_linux_process.cc b/arch/alpha/linux_process.cc index 16ebcca7b..0b193fb55 100644 --- a/arch/alpha/alpha_linux_process.cc +++ b/arch/alpha/linux_process.cc @@ -26,8 +26,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "arch/alpha/alpha_common_syscall_emul.hh" -#include "arch/alpha/alpha_linux_process.hh" +#include "arch/alpha/common_syscall_emul.hh" +#include "arch/alpha/linux_process.hh" #include "arch/alpha/isa_traits.hh" #include "base/trace.hh" diff --git a/arch/alpha/alpha_linux_process.hh b/arch/alpha/linux_process.hh index 7de1b1ac1..7de1b1ac1 100644 --- a/arch/alpha/alpha_linux_process.hh +++ b/arch/alpha/linux_process.hh diff --git a/arch/alpha/alpha_memory.cc b/arch/alpha/tlb.cc index 11baed106..8297737bd 100644 --- a/arch/alpha/alpha_memory.cc +++ b/arch/alpha/tlb.cc @@ -30,7 +30,7 @@ #include <string> #include <vector> -#include "arch/alpha/alpha_memory.hh" +#include "arch/alpha/tlb.hh" #include "base/inifile.hh" #include "base/str.hh" #include "base/trace.hh" diff --git a/arch/alpha/alpha_memory.hh b/arch/alpha/tlb.hh index de955fa46..de955fa46 100644 --- a/arch/alpha/alpha_memory.hh +++ b/arch/alpha/tlb.hh diff --git a/arch/alpha/alpha_tru64_process.cc b/arch/alpha/tru64_process.cc index 8121d3452..90e8b1139 100644 --- a/arch/alpha/alpha_tru64_process.cc +++ b/arch/alpha/tru64_process.cc @@ -27,8 +27,8 @@ */ #include "arch/alpha/isa_traits.hh" -#include "arch/alpha/alpha_common_syscall_emul.hh" -#include "arch/alpha/alpha_tru64_process.hh" +#include "arch/alpha/common_syscall_emul.hh" +#include "arch/alpha/tru64_process.hh" #include "cpu/exec_context.hh" #include "kern/tru64/tru64.hh" #include "mem/functional/functional.hh" diff --git a/arch/alpha/alpha_tru64_process.hh b/arch/alpha/tru64_process.hh index 051760702..051760702 100644 --- a/arch/alpha/alpha_tru64_process.hh +++ b/arch/alpha/tru64_process.hh diff --git a/cpu/exec_context.hh b/cpu/exec_context.hh index 4083381ea..834eacec8 100644 --- a/cpu/exec_context.hh +++ b/cpu/exec_context.hh @@ -46,7 +46,7 @@ class BaseCPU; #if FULL_SYSTEM #include "sim/system.hh" -#include "arch/alpha_memory.hh" +#include "arch/tlb.hh" class FunctionProfile; class ProfileNode; diff --git a/cpu/o3/alpha_cpu_builder.cc b/cpu/o3/alpha_cpu_builder.cc index 0f6d0d35c..95d2f8f37 100644 --- a/cpu/o3/alpha_cpu_builder.cc +++ b/cpu/o3/alpha_cpu_builder.cc @@ -50,7 +50,7 @@ #include "mem/functional/memory_control.hh" #include "mem/functional/physical.hh" #include "sim/system.hh" -#include "arch/alpha_memory.hh" +#include "arch/tlb.hh" #include "arch/vtophys.hh" #else // !FULL_SYSTEM #include "mem/functional/functional.hh" diff --git a/cpu/simple/cpu.cc b/cpu/simple/cpu.cc index 02ecbb12c..4b0eda386 100644 --- a/cpu/simple/cpu.cc +++ b/cpu/simple/cpu.cc @@ -67,7 +67,7 @@ #include "mem/functional/memory_control.hh" #include "mem/functional/physical.hh" #include "sim/system.hh" -#include "arch/alpha_memory.hh" +#include "arch/tlb.hh" #include "arch/stacktrace.hh" #include "arch/vtophys.hh" #else // !FULL_SYSTEM diff --git a/sim/process.cc b/sim/process.cc index f026afc51..e3cae2855 100644 --- a/sim/process.cc +++ b/sim/process.cc @@ -48,8 +48,8 @@ #include "sim/stats.hh" #include "sim/syscall_emul.hh" -#include "arch/alpha_tru64_process.hh" -#include "arch/alpha_linux_process.hh" +#include "arch/tru64_process.hh" +#include "arch/linux_process.hh" using namespace std; using namespace TheISA; |