summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--SConscript113
-rw-r--r--arch/alpha/ev5.hh12
-rw-r--r--kern/kernel_stats.cc1
-rw-r--r--kern/linux/linux_syscalls.hh7
-rw-r--r--kern/tru64/tru64_syscalls.hh7
5 files changed, 80 insertions, 60 deletions
diff --git a/SConscript b/SConscript
index f2aee3bed..c43d45713 100644
--- a/SConscript
+++ b/SConscript
@@ -43,12 +43,12 @@ Import('env')
# Base sources used by all configurations.
base_sources = Split('''
- arch/alpha/decoder.cc
- arch/alpha/fast_cpu_exec.cc
- arch/alpha/simple_cpu_exec.cc
- arch/alpha/full_cpu_exec.cc
- arch/alpha/faults.cc
- arch/alpha/isa_traits.cc
+ targetarch/decoder.cc
+ targetarch/fast_cpu_exec.cc
+ targetarch/simple_cpu_exec.cc
+ targetarch/full_cpu_exec.cc
+ targetarch/faults.cc
+ targetarch/isa_traits.cc
base/circlebuf.cc
base/copyright.cc
@@ -237,12 +237,12 @@ mysql_sources = Split('''
# Full-system sources
full_system_sources = Split('''
- arch/alpha/alpha_memory.cc
- arch/alpha/arguments.cc
- arch/alpha/ev5.cc
- arch/alpha/osfpal.cc
- arch/alpha/pseudo_inst.cc
- arch/alpha/vtophys.cc
+ targetarch/alpha_memory.cc
+ targetarch/arguments.cc
+ targetarch/ev5.cc
+ targetarch/osfpal.cc
+ targetarch/pseudo_inst.cc
+ targetarch/vtophys.cc
base/crc.cc
base/inet.cc
@@ -310,9 +310,9 @@ full_system_sources = Split('''
''')
full_system_obj_desc_files = Split('''
- arch/alpha/AlphaDTB.od
- arch/alpha/AlphaITB.od
- arch/alpha/AlphaTLB.od
+ targetarch/AlphaDTB.od
+ targetarch/AlphaITB.od
+ targetarch/AlphaTLB.od
dev/AlphaConsole.od
dev/ConsoleListener.od
dev/CowDiskImage.od
@@ -349,9 +349,9 @@ full_system_obj_desc_files = Split('''
# Syscall emulation (non-full-system) sources
syscall_emulation_sources = Split('''
- arch/alpha/alpha_common_syscall_emul.cc
- arch/alpha/alpha_linux_process.cc
- arch/alpha/alpha_tru64_process.cc
+ targetarch/alpha_common_syscall_emul.cc
+ targetarch/alpha_linux_process.cc
+ targetarch/alpha_tru64_process.cc
cpu/memtest/memtest.cc
cpu/trace/opt_cpu.cc
cpu/trace/trace_cpu.cc
@@ -369,6 +369,49 @@ syscall_emulation_obj_desc_files = Split('''
sim/Process.od
''')
+targetarch_files = Split('''
+ alpha_common_syscall_emul.cc
+ alpha_common_syscall_emul.hh
+ AlphaDTB.od
+ AlphaITB.od
+ alpha_linux_process.cc
+ alpha_linux_process.hh
+ alpha_memory.cc
+ alpha_memory.hh
+ AlphaTLB.od
+ alpha_tru64_process.cc
+ alpha_tru64_process.hh
+ aout_machdep.h
+ arguments.cc
+ arguments.hh
+ byte_swap.hh
+ ecoff_machdep.h
+ elf_machdep.h
+ ev5.cc
+ ev5.hh
+ faults.cc
+ faults.hh
+ isa_desc
+ isa_fullsys_traits.hh
+ isa_traits.cc
+ isa_traits.hh
+ machine_exo.h
+ osfpal.cc
+ osfpal.hh
+ pmap.h
+ pseudo_inst.cc
+ pseudo_inst.hh
+ PseudoInsts.pd
+ syscalls.hh
+ vptr.hh
+ vtophys.cc
+ vtophys.hh
+ ''')
+
+for f in targetarch_files:
+ env.Command('targetarch/' + f, 'arch/alpha/' + f, 'cp $SOURCE $TARGET')
+
+
# Set up complete list of sources based on configuration.
sources = base_sources
obj_desc_files = base_obj_desc_files
@@ -407,30 +450,14 @@ env.Command(Split('base/traceflags.hh base/traceflags.cc'),
'python $SOURCE $TARGET.base')
# several files are generated from arch/$TARGET_ISA/isa_desc.
-env.Command(Split('''arch/alpha/decoder.cc
- arch/alpha/decoder.hh
- arch/alpha/fast_cpu_exec.cc
- arch/alpha/simple_cpu_exec.cc
- arch/alpha/full_cpu_exec.cc'''),
- Split('''arch/alpha/isa_desc
+env.Command(Split('''targetarch/decoder.cc
+ targetarch/decoder.hh
+ targetarch/fast_cpu_exec.cc
+ targetarch/simple_cpu_exec.cc
+ targetarch/full_cpu_exec.cc'''),
+ Split('''targetarch/isa_desc
arch/isa_parser.py'''),
- '$SRCDIR/arch/isa_parser.py $SOURCE $TARGET.dir arch/alpha')
-
-
-# 'targetarch' is a symlink to arch/$TARGET_ISA.
-def link_targetarch(target, source, env):
- link_target = str(target[0])
- link_source = env.subst('$SRCDIR/arch/$TARGET_ISA')
- if not os.path.isdir(link_target):
- print "symlinking", link_source, "to", link_target
- try:
- os.symlink(link_source, link_target)
- except OSError, desc:
- print "Error creating symlink %s: %s" % (link_target, desc)
- sys.exit(-1)
-
-# Tell SCons to use the link_targetarch function to make 'targetarch'
-env.Command('targetarch', None, link_targetarch)
+ '$SRCDIR/arch/isa_parser.py $SOURCE $TARGET.dir targetarch')
# libelf build is described in its own SConscript file.
@@ -446,11 +473,9 @@ SConscript('sim/pyconfig/SConscript', exports = ['env', 'obj_desc_files'],
# environment, and returns a list of all the corresponding SCons
# Object nodes (including an extra one for date.cc). We explicitly
# add the Object nodes so we can set up special dependencies for
-# targetarch and date.cc.
+# date.cc.
def make_objs(sources, env):
objs = [env.Object(s) for s in sources]
- # make all objects depend on the targetarch link so it gets made first.
- env.Depends(objs, 'targetarch')
# make date.cc depend on all other objects so it always gets
# recompiled whenever anything else does
date_obj = env.Object('base/date.cc')
diff --git a/arch/alpha/ev5.hh b/arch/alpha/ev5.hh
index f49eadeb0..7b1ff4a2f 100644
--- a/arch/alpha/ev5.hh
+++ b/arch/alpha/ev5.hh
@@ -7,18 +7,6 @@
#error This code is only valid for EV5 systems
#endif
-#include "targetarch/isa_traits.hh"
-
-////////////////////////////////////////////////////////////////////////
-//
-//
-//
-
-////////////////////////////////////////////////////////////////////////
-//
-//
-//
-
#define MODE2MASK(X) (1 << (X))
// Alpha IPR register accessors
diff --git a/kern/kernel_stats.cc b/kern/kernel_stats.cc
index 7fd0f31ae..ed0b613ff 100644
--- a/kern/kernel_stats.cc
+++ b/kern/kernel_stats.cc
@@ -39,6 +39,7 @@
#include "cpu/static_inst.hh"
#include "kern/kernel_stats.hh"
#include "kern/linux/linux_syscalls.hh"
+#include "kern/tru64/tru64_syscalls.hh"
using namespace std;
using namespace Stats;
diff --git a/kern/linux/linux_syscalls.hh b/kern/linux/linux_syscalls.hh
index a729431a0..dee7c5fcd 100644
--- a/kern/linux/linux_syscalls.hh
+++ b/kern/linux/linux_syscalls.hh
@@ -29,11 +29,14 @@
#ifndef __LINUX_SYSCALLS_HH__
#define __LINUX_SYSCALLS_HH__
-#include "targetarch/syscalls.hh"
#include "kern/linux/linux.hh"
-struct SystemCalls<Linux>
+template <class OS>
+class SystemCalls;
+
+class SystemCalls<Linux>
{
+ public:
enum {
syscall = 0,
llseek = 1,
diff --git a/kern/tru64/tru64_syscalls.hh b/kern/tru64/tru64_syscalls.hh
index f4853e3f8..7ddc699b1 100644
--- a/kern/tru64/tru64_syscalls.hh
+++ b/kern/tru64/tru64_syscalls.hh
@@ -29,11 +29,14 @@
#ifndef __TRU64_SYSCALLS_HH__
#define __TRU64_SYSCALLS_HH__
-#include "targetarch/syscalls.hh"
#include "kern/tru64/tru64.hh"
-struct SystemCalls<Tru64>
+template <class OS>
+class SystemCalls;
+
+class SystemCalls<Tru64>
{
+ public:
enum {
syscall = 0,
exit = 1,