Merge gblack@m5.eecs.umich.edu:/bk/multiarch

into  ewok.(none):/home/gblack/m5/multiarch

SConscript:
arch/alpha/ev5.cc:
dev/alpha_console.cc:
    Hand merged

--HG--
extra : convert_revision : 318a671e6803400d3ed086a90e70d6790e4f6b19

1 files changed, 26 insertions, 24 deletions

diff --git a/arch/mips/SConscript b/arch/mips/SConscript
index a6af91669..b8efa7ef9 100644
--- a/arch/mips/SConscript
+++ b/arch/mips/SConscript
@@ -40,42 +40,44 @@ Import('env')
 ###################################################
 
 # Base sources used by all configurations.
-arch_base_sources = Split('''
-	arch/mips/decoder.cc
-        arch/mips/mips_o3_exec.cc
-	arch/mips/fast_cpu_exec.cc
-	arch/mips/simple_cpu_exec.cc
-	arch/mips/full_cpu_exec.cc
-	arch/mips/faults.cc
-	arch/mips/isa_traits.cc
+base_sources = Split('''
+	faults.cc
+	isa_traits.cc
 	''')
 
 # Full-system sources
-arch_full_system_sources = Split('''
-	arch/mips/memory.cc
-	arch/mips/arguments.cc
-	arch/mips/mips34k.cc
-	arch/mips/osfpal.cc
-	arch/mips/stacktrace.cc
-	arch/mips/vtophys.cc
+full_system_sources = Split('''
+	memory.cc
+	arguments.cc
+	mips34k.cc
+	osfpal.cc
+	stacktrace.cc
+	vtophys.cc
 	''')
 
 # Syscall emulation (non-full-system) sources
-arch_syscall_emulation_sources = Split('''
-	arch/mips/common_syscall_emul.cc
-	arch/mips/linux_process.cc
-	arch/mips/tru64_process.cc
+syscall_emulation_sources = Split('''
+	common_syscall_emul.cc
+	linux_process.cc
+	tru64_process.cc
 	''')
 
 # Set up complete list of sources based on configuration.
-sources = arch_base_sources
+sources = base_sources
 
 if env['FULL_SYSTEM']:
-    sources += arch_full_system_sources
+    sources += full_system_sources
 else:
-    sources += arch_syscall_emulation_sources
+    sources += syscall_emulation_sources
 
-for opt in env.ExportOptions:
-    env.ConfigFile(opt)
+# Convert file names to SCons File objects.  This takes care of the
+# path relative to the top of the directory tree.
+sources = [File(s) for s in sources]
+
+# Add in files generated by the ISA description.
+isa_desc_files = env.ISADesc('isa/main.isa')
+# Only non-header files need to be compiled.
+isa_desc_sources = [f for f in isa_desc_files if not f.path.endswith('.hh')]
+sources += isa_desc_sources
 
 Return('sources')