Merge zizzer.eecs.umich.edu:/bk/newmem

into  zower.eecs.umich.edu:/home/gblack/m5/newmem-statetrace

--HG--
extra : convert_revision : 725999a0a5bde6e065bad87b42e973c5c627c69f

2 files changed, 72 insertions, 66 deletions

diff --git a/src/arch/alpha/SConscript b/src/arch/alpha/SConscript
index addd49884..61611e9f6 100644
--- a/src/arch/alpha/SConscript
+++ b/src/arch/alpha/SConscript
@@ -29,76 +29,45 @@
 # Authors: Gabe Black
 #          Steve Reinhardt
 
-import os
-import sys
-from os.path import isdir
+Import('*')
 
-# This file defines how to build a particular configuration of M5
-# based on variable settings in the 'env' build environment.
+if env['TARGET_ISA'] == 'alpha':
+    Source('faults.cc')
+    Source('floatregfile.cc')
+    Source('intregfile.cc')
+    Source('miscregfile.cc')
+    Source('regfile.cc')
+    Source('remote_gdb.cc')
 
-# Import build environment variable from SConstruct.
-Import('env')
+    if env['FULL_SYSTEM']:
+        Source('arguments.cc')
+        Source('ev5.cc')
+        Source('idle_event.cc')
+        Source('ipr.cc')
+        Source('kernel_stats.cc')
+        Source('osfpal.cc')
+        Source('pagetable.cc')
+        Source('stacktrace.cc')
+        Source('system.cc')
+        Source('tlb.cc')
+        Source('vtophys.cc')
 
-###################################################
-#
-# Define needed sources.
-#
-###################################################
-
-# Base sources used by all configurations.
-base_sources = Split('''
-	faults.cc
-	floatregfile.cc
-	intregfile.cc
-	miscregfile.cc
-	regfile.cc
-	remote_gdb.cc
-	''')
-
-# Full-system sources
-full_system_sources = Split('''
-	arguments.cc
-	ev5.cc
-	freebsd/system.cc
-	idle_event.cc
-	ipr.cc
-	kernel_stats.cc
-	linux/system.cc
-	osfpal.cc
-	pagetable.cc
-	stacktrace.cc
-	system.cc
-	tlb.cc
-	tru64/system.cc
-	vtophys.cc
-	''')
-
-
-# Syscall emulation (non-full-system) sources
-syscall_emulation_sources = Split('''
-        linux/linux.cc
-	linux/process.cc
-        tru64/tru64.cc
-	tru64/process.cc
-	process.cc
-	''')
-
-# Set up complete list of sources based on configuration.
-sources = base_sources
+        Source('freebsd/system.cc')
+        Source('linux/system.cc')
+        Source('tru64/system.cc')
 
-if env['FULL_SYSTEM']:
-    sources += full_system_sources
-else:
-    sources += syscall_emulation_sources
+    else:
+        Source('process.cc')
 
-# 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]
+        Source('linux/linux.cc')
+        Source('linux/process.cc')
 
-# 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
+        Source('tru64/tru64.cc')
+        Source('tru64/process.cc')
 
-Return('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.
+    for f in isa_desc_files:
+        if not f.path.endswith('.hh'):
+            Source(f)
diff --git a/src/arch/alpha/SConsopts b/src/arch/alpha/SConsopts
new file mode 100644
index 000000000..633eeb06f
--- /dev/null
+++ b/src/arch/alpha/SConsopts
@@ -0,0 +1,37 @@
+# -*- mode:python -*-
+
+# Copyright (c) 2004-2005 The Regents of The University of Michigan
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met: redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer;
+# redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution;
+# neither the name of the copyright holders nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+# Authors: Nathan Binkert
+
+Import('*')
+
+all_isa_list.append('alpha')
+
+# Alpha can be compiled with Turbolaser support instead of Tsunami
+sticky_opts.Add(BoolOption('ALPHA_TLASER',
+    'Model Alpha TurboLaser platform (vs. Tsunami)', False))