Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/m5

into  zizzer.eecs.umich.edu:/z/m5/Bitkeeper/multiarch

--HG--
extra : convert_revision : 850077a56aead260aa4bbd3df60b672a931d57ed

6 files changed, 116 insertions, 456 deletions

diff --git a/SConscript b/SConscript
index 1939894fb..7afb84e67 100644
--- a/SConscript
+++ b/SConscript
@@ -223,14 +223,6 @@ base_sources = Split('''
 	sim/stat_control.cc
 	sim/trace_context.cc
         ''')
-# These are now included by the architecture specific SConscript
-#	arch/alpha/decoder.cc
-#	arch/alpha/alpha_o3_exec.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
 
 # MySql sources
 mysql_sources = Split('''
@@ -296,15 +288,6 @@ full_system_sources = Split('''
 	sim/pseudo_inst.cc
         ''')
 
-# These are now included by the architecture specific SConscript
-#	arch/alpha/alpha_memory.cc
-#	arch/alpha/arguments.cc
-#	arch/alpha/ev5.cc
-#	arch/alpha/osfpal.cc
-#	arch/alpha/pseudo_inst.cc
-#	arch/alpha/stacktrace.cc
-#	arch/alpha/vtophys.cc
-
 # turbolaser encumbered sources
 turbolaser_sources = Split('''
 	encumbered/dev/dma.cc
@@ -337,11 +320,6 @@ syscall_emulation_sources = Split('''
 	sim/syscall_emul.cc
         ''')
 
-# These are now included by the architecture specific SConscript
-#	arch/alpha/alpha_common_syscall_emul.cc
-#	arch/alpha/alpha_linux_process.cc
-#	arch/alpha/alpha_tru64_process.cc
-
 targetarch_files = Split('''
         alpha_linux_process.hh
         memory.hh
@@ -354,13 +332,6 @@ targetarch_files = Split('''
         stacktrace.hh
         vtophys.hh
         ''')
-#        pseudo_inst.hh
-#        isa_traits.hh
-#        osfpal.hh
-#        byte_swap.hh
-#        alpha_common_syscall_emul.hh
-#        vptr.hh
-#        isa_fullsys_traits.hh
 
 # Set up bridging headers to the architecture specific versions
 for f in targetarch_files:
@@ -375,6 +346,8 @@ arch_source = SConscript('arch/%s/SConscript' % env['TARGET_ISA'],
 # Add a flag defining what THE_ISA should be for all compilation
 env.Append(CPPDEFINES=[('THE_ISA','%s_ISA' % env['TARGET_ISA'].upper())])
 
+SConscript('arch/SConscript', exports = 'env', duplicate = False)
+
 # Set up complete list of sources based on configuration.
 sources = base_sources + arch_source
 
diff --git a/arch/SConscript b/arch/SConscript
new file mode 100644
index 000000000..2d8e34b7b
--- /dev/null
+++ b/arch/SConscript
@@ -0,0 +1,74 @@
+# -*- mode:python -*-
+
+# Copyright (c) 2006 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.
+
+import os.path
+
+# Import build environment variable from SConstruct.
+Import('env')
+
+#
+# ISA "switch header" generation.
+#
+# Auto-generate arch headers that include the right ISA-specific
+# header based on the setting of THE_ISA preprocessor variable.
+
+# List of headers to generate
+isa_switch_hdrs = Split('''
+	isa_traits.hh
+        ''')
+
+# Generate the header.  target[0] is the full path of the output
+# header to generate.  'source' is a dummy variable, since we get the
+# list of ISAs from env['ALL_ISA_LIST'].
+def gen_switch_hdr(target, source, env):
+    fname = str(target[0])
+    basename = os.path.basename(fname)
+    f = open(fname, 'w')
+    f.write('#include "arch/isa_specific.hh"\n')
+    cond = '#if'
+    for isa in env['ALL_ISA_LIST']:
+        f.write('%s THE_ISA == %s_ISA\n#include "arch/%s/%s"\n'
+                % (cond, isa.upper(), isa, basename))
+        cond = '#elif'
+    f.write('#else\n#error "THE_ISA not set"\n#endif\n')
+    f.close()
+    return 0
+
+# String to print when generating header
+def gen_switch_hdr_string(target, source, env):
+    return "Generating ISA switch header " + str(target[0])
+
+# Build SCons Action object. 'varlist' specifies env vars that this
+# action depdnds on; when env['ALL_ISA_LIST'] changes these actions
+# should get re-executed.
+switch_hdr_action = Action(gen_switch_hdr, gen_switch_hdr_string,
+                           varlist=['ALL_ISA_LIST'])
+
+# Instantiate actions for each header
+for hdr in isa_switch_hdrs:
+    env.Command(hdr, [], switch_hdr_action)
diff --git a/arch/alpha/SConscript b/arch/alpha/SConscript
index 8bf408c06..a5ae77dac 100644
--- a/arch/alpha/SConscript
+++ b/arch/alpha/SConscript
@@ -53,191 +53,6 @@ arch_base_sources = Split('''
 	arch/alpha/isa_traits.cc
 	''')
 
-#	base/circlebuf.cc
-#	base/copyright.cc
-#	base/cprintf.cc
-#        base/embedfile.cc
-#	base/fast_alloc.cc
-#	base/fifo_buffer.cc
-#	base/hostinfo.cc
-#	base/hybrid_pred.cc
-#	base/inifile.cc
-#	base/intmath.cc
-#	base/match.cc
-#	base/misc.cc
-#	base/output.cc
-#	base/pollevent.cc
-#	base/range.cc
-#	base/random.cc
-#	base/sat_counter.cc
-#	base/socket.cc
-#	base/statistics.cc
-#	base/str.cc
-#	base/time.cc
-#	base/trace.cc
-#	base/traceflags.cc
-#	base/userinfo.cc
-#	base/compression/lzss_compression.cc
-#	base/loader/aout_object.cc
-#	base/loader/ecoff_object.cc
-#	base/loader/elf_object.cc
-#	base/loader/object_file.cc
-#	base/loader/symtab.cc
-#	base/stats/events.cc
-#	base/stats/statdb.cc
-#	base/stats/visit.cc
-#	base/stats/text.cc
-#
-#	cpu/base.cc
-#        cpu/base_dyn_inst.cc
-#	cpu/exec_context.cc
-#	cpu/exetrace.cc
-#	cpu/pc_event.cc
-#	cpu/static_inst.cc
-#        cpu/o3/2bit_local_pred.cc
-#        cpu/o3/alpha_dyn_inst.cc
-#        cpu/o3/alpha_cpu.cc
-#        cpu/o3/alpha_cpu_builder.cc
-#        cpu/o3/bpred_unit.cc
-#        cpu/o3/btb.cc
-#        cpu/o3/commit.cc
-#        cpu/o3/decode.cc
-#        cpu/o3/fetch.cc
-#        cpu/o3/free_list.cc
-#        cpu/o3/cpu.cc
-#        cpu/o3/iew.cc
-#        cpu/o3/inst_queue.cc
-#        cpu/o3/ldstq.cc
-#        cpu/o3/mem_dep_unit.cc
-#        cpu/o3/ras.cc
-#        cpu/o3/rename.cc
-#        cpu/o3/rename_map.cc
-#        cpu/o3/rob.cc
-#        cpu/o3/sat_counter.cc
-#        cpu/o3/store_set.cc
-#        cpu/o3/tournament_pred.cc
-#	cpu/fast/cpu.cc
-#        cpu/sampler/sampler.cc
-#        cpu/simple/cpu.cc
-#        cpu/trace/reader/mem_trace_reader.cc
-#        cpu/trace/reader/ibm_reader.cc
-#        cpu/trace/reader/itx_reader.cc
-#        cpu/trace/reader/m5_reader.cc
-#        cpu/trace/opt_cpu.cc
-#        cpu/trace/trace_cpu.cc
-#
-#	encumbered/cpu/full/bpred.cc
-#	encumbered/cpu/full/commit.cc
-#	encumbered/cpu/full/cpu.cc
-#	encumbered/cpu/full/create_vector.cc
-#	encumbered/cpu/full/cv_spec_state.cc
-#	encumbered/cpu/full/dd_queue.cc
-#	encumbered/cpu/full/dep_link.cc
-#	encumbered/cpu/full/dispatch.cc
-#	encumbered/cpu/full/dyn_inst.cc
-#	encumbered/cpu/full/execute.cc
-#	encumbered/cpu/full/fetch.cc
-#	encumbered/cpu/full/floss_reasons.cc
-#	encumbered/cpu/full/fu_pool.cc
-#	encumbered/cpu/full/inst_fifo.cc
-#	encumbered/cpu/full/instpipe.cc
-#	encumbered/cpu/full/issue.cc
-#	encumbered/cpu/full/ls_queue.cc
-#	encumbered/cpu/full/machine_queue.cc
-#        encumbered/cpu/full/pipetrace.cc
-#        encumbered/cpu/full/readyq.cc
-#        encumbered/cpu/full/reg_info.cc
-#        encumbered/cpu/full/rob_station.cc
-#        encumbered/cpu/full/spec_memory.cc
-#        encumbered/cpu/full/spec_state.cc
-#        encumbered/cpu/full/storebuffer.cc
-#        encumbered/cpu/full/writeback.cc
-#        encumbered/cpu/full/iq/iq_station.cc
-#        encumbered/cpu/full/iq/iqueue.cc
-#        encumbered/cpu/full/iq/segmented/chain_info.cc
-#        encumbered/cpu/full/iq/segmented/chain_wire.cc
-#        encumbered/cpu/full/iq/segmented/iq_seg.cc
-#        encumbered/cpu/full/iq/segmented/iq_segmented.cc
-#        encumbered/cpu/full/iq/segmented/seg_chain.cc
-#        encumbered/cpu/full/iq/seznec/iq_seznec.cc
-#        encumbered/cpu/full/iq/standard/iq_standard.cc
-#	encumbered/mem/functional/main.cc
-#
-#	mem/base_hier.cc
-#	mem/base_mem.cc
-#	mem/hier_params.cc
-#	mem/mem_cmd.cc
-#	mem/mem_debug.cc
-#	mem/mem_req.cc
-#	mem/memory_interface.cc
-#	mem/bus/base_interface.cc
-#	mem/bus/bus.cc
-#	mem/bus/bus_bridge.cc
-#	mem/bus/bus_bridge_master.cc
-#	mem/bus/bus_bridge_slave.cc
-#	mem/bus/bus_interface.cc
-#	mem/bus/dma_bus_interface.cc
-#	mem/bus/dma_interface.cc
-#	mem/bus/master_interface.cc
-#	mem/bus/slave_interface.cc
-#	mem/cache/base_cache.cc
-#	mem/cache/cache.cc
-#	mem/cache/cache_builder.cc
-#	mem/cache/coherence/coherence_protocol.cc
-#	mem/cache/coherence/uni_coherence.cc
-#	mem/cache/miss/blocking_buffer.cc
-#	mem/cache/miss/miss_queue.cc
-#	mem/cache/miss/mshr.cc
-#	mem/cache/miss/mshr_queue.cc
-#        mem/cache/prefetch/base_prefetcher.cc
-#        mem/cache/prefetch/prefetcher.cc
-#        mem/cache/prefetch/tagged_prefetcher.cc
-#	mem/cache/tags/base_tags.cc
-#	mem/cache/tags/cache_tags.cc	
-#	mem/cache/tags/fa_lru.cc
-#	mem/cache/tags/iic.cc
-#	mem/cache/tags/lru.cc
-#	mem/cache/tags/repl/gen.cc
-#	mem/cache/tags/repl/repl.cc
-#	mem/cache/tags/split.cc
-#	mem/cache/tags/split_lru.cc
-#	mem/cache/tags/split_lifo.cc
-#	mem/functional/functional.cc
-#	mem/timing/base_memory.cc
-#	mem/timing/memory_builder.cc
-#	mem/timing/simple_mem_bank.cc
-#        mem/trace/itx_writer.cc
-#	mem/trace/mem_trace_writer.cc
-#	mem/trace/m5_writer.cc
-#
-#        python/pyconfig.cc
-#        python/embedded_py.cc
-#
-#	sim/builder.cc
-#	sim/configfile.cc
-#	sim/debug.cc
-#	sim/eventq.cc
-#	sim/main.cc
-#	sim/param.cc
-#	sim/profile.cc
-#	sim/root.cc
-#	sim/serialize.cc
-#	sim/sim_events.cc
-#	sim/sim_exit.cc
-#	sim/sim_object.cc
-#	sim/startup.cc
-#	sim/stat_context.cc
-#	sim/stat_control.cc
-#	sim/trace_context.cc
-#        ''')
-
-# MySql sources
-arch_mysql_sources = Split('''
-	''')
-#	base/mysql.cc
-#	base/stats/mysql.cc
-#        ''')
-
 # Full-system sources
 arch_full_system_sources = Split('''
 	arch/alpha/alpha_memory.cc
@@ -248,81 +63,6 @@ arch_full_system_sources = Split('''
 	arch/alpha/vtophys.cc
 	''')
 
-#	base/crc.cc
-#	base/inet.cc
-#	base/remote_gdb.cc
-#
-#	cpu/intr_control.cc
-#        cpu/profile.cc
-#
-#	dev/alpha_console.cc
-#	dev/baddev.cc
-#        dev/simconsole.cc
-#	dev/disk_image.cc
-#	dev/etherbus.cc
-#	dev/etherdump.cc
-#	dev/etherint.cc
-#	dev/etherlink.cc
-#	dev/etherpkt.cc
-#	dev/ethertap.cc
-#	dev/ide_ctrl.cc
-#	dev/ide_disk.cc
-#	dev/io_device.cc
-#	dev/ns_gige.cc
-#	dev/pciconfigall.cc
-#	dev/pcidev.cc
-#	dev/pcifake.cc
-#	dev/pktfifo.cc
-#	dev/platform.cc
-#	dev/sinic.cc
-#	dev/simple_disk.cc
-#	dev/tsunami.cc
-#	dev/tsunami_cchip.cc
-#	dev/isa_fake.cc
-#	dev/tsunami_io.cc
-#	dev/tsunami_pchip.cc
-#	dev/uart.cc
-#	dev/uart8250.cc
-#
-#	kern/kernel_binning.cc
-#	kern/kernel_stats.cc
-#	kern/system_events.cc
-#	kern/freebsd/freebsd_system.cc
-#	kern/linux/linux_syscalls.cc
-#	kern/linux/linux_system.cc
-#	kern/linux/printk.cc
-#	kern/tru64/dump_mbuf.cc
-#	kern/tru64/printf.cc
-#	kern/tru64/tru64_events.cc
-#	kern/tru64/tru64_syscalls.cc
-#	kern/tru64/tru64_system.cc
-#
-#	mem/functional/memory_control.cc
-#	mem/functional/physical.cc
-#
-#	sim/system.cc
-#        ''')
-
-# turbolaser encumbered sources
-arch_turbolaser_sources = Split('''
-	''')
-#	encumbered/dev/dma.cc
-#	encumbered/dev/etherdev.cc
-#	encumbered/dev/scsi.cc
-#	encumbered/dev/scsi_ctrl.cc
-#	encumbered/dev/scsi_disk.cc
-#	encumbered/dev/scsi_none.cc
-#	encumbered/dev/tlaser_clock.cc
-#	encumbered/dev/tlaser_ipi.cc
-#	encumbered/dev/tlaser_mbox.cc
-#	encumbered/dev/tlaser_mc146818.cc
-#	encumbered/dev/tlaser_node.cc
-#	encumbered/dev/tlaser_pcia.cc
-#	encumbered/dev/tlaser_pcidev.cc
-#	encumbered/dev/tlaser_serial.cc
-#	encumbered/dev/turbolaser.cc
-#	encumbered/dev/uart8530.cc
-#        ''')
 
 # Syscall emulation (non-full-system) sources
 arch_syscall_emulation_sources = Split('''
@@ -330,158 +70,13 @@ arch_syscall_emulation_sources = Split('''
 	arch/alpha/alpha_linux_process.cc
 	arch/alpha/alpha_tru64_process.cc
 	''')
-#	cpu/memtest/memtest.cc
-#	encumbered/eio/eio.cc
-#	encumbered/eio/exolex.cc
-#	encumbered/eio/libexo.cc
-#	sim/process.cc
-#	sim/syscall_emul.cc
-#        ''')
-
-#targetarch_files = Split('''
-#        alpha_common_syscall_emul.hh
-#        alpha_linux_process.hh
-#        alpha_memory.hh
-#        alpha_tru64_process.hh
-#        aout_machdep.h
-#        arguments.hh
-#        byte_swap.hh
-#        ecoff_machdep.h
-#        ev5.hh
-#        faults.hh
-#        isa_fullsys_traits.hh
-#        isa_traits.hh
-#        osfpal.hh
-#        pseudo_inst.hh
-#        stacktrace.hh
-#        vptr.hh
-#        vtophys.hh
-#        ''')
-
-#for f in targetarch_files:
-#    env.Command('targetarch/' + f, 'arch/alpha/' + f,
-#                '''echo '#include "arch/alpha/%s"' > $TARGET''' % f)
-
 
 # Set up complete list of sources based on configuration.
 sources = arch_base_sources
 
 if env['FULL_SYSTEM']:
     sources += arch_full_system_sources
-    if env['ALPHA_TLASER']:
-        sources += arch_turbolaser_sources
 else:
     sources += arch_syscall_emulation_sources
 
-if env['USE_MYSQL']:
-    sources += arch_mysql_sources
-
-for opt in env.ExportOptions:
-    env.ConfigFile(opt)
-
-###################################################
-#
-# Special build rules.
-#
-###################################################
-
-# base/traceflags.{cc,hh} are generated from base/traceflags.py.
-# $TARGET.base will expand to "<build-dir>/base/traceflags".
-# env.Command(Split('base/traceflags.hh base/traceflags.cc'),
-#            'base/traceflags.py',
-#            'python $SOURCE $TARGET.base')
-
-# several files are generated from arch/$TARGET_ISA/isa_desc.
-#env.Command(Split('''decoder.cc
-#		     decoder.hh
-#                     alpha_o3_exec.cc
-#		     fast_cpu_exec.cc
-#                     simple_cpu_exec.cc
-#                     full_cpu_exec.cc'''),
-#            Split('''isa_desc
-#		     ../isa_parser.py'''),
-#            '$SRCDIR/arch/isa_parser.py $SOURCE $TARGET.dir arch/alpha')
-
-
-# libelf build is described in its own SConscript file.
-# SConscript-local is the per-config build, which just copies some
-# header files into a place where they can be found.
-# SConscript('libelf/SConscript-local', exports = 'env', duplicate=0)
-# SConscript('python/SConscript', exports = ['env'], duplicate=0)
-
-# This function adds the specified sources to the given build
-# 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
-# date.cc.
-# def make_objs(sources, env):
-#     objs = [env.Object(s) for s in sources]
-#     # make date.cc depend on all other objects so it always gets
-#     # recompiled whenever anything else does
-#     date_obj = env.Object('base/date.cc')
-# base/traceflags.{cc,hh} are generated from base/traceflags.py.
-# $TARGET.base will expand to "<build-dir>/base/traceflags".
-# env.Command(Split('base/traceflags.hh base/traceflags.cc'),
-#             'base/traceflags.py',
-#             'python $SOURCE $TARGET.base')
-#
-#             Split('''arch/alpha/isa_desc
-# 		     arch/isa_parser.py'''),
-#     env.Depends(date_obj, objs)
-#     objs.append(date_obj)
-#     return objs
-
-###################################################
-#
-# Define binaries.  Each different build type (debug, opt, etc.) gets
-# a slightly different build environment.
-#
-###################################################
-
-# Include file paths are rooted in this directory.  SCons will
-# automatically expand '.' to refer to both the source directory and
-# the corresponding build directory to pick up generated include
-# files.
-# env.Append(CPPPATH='.')
-
-# Debug binary
-# debugEnv = env.Copy(OBJSUFFIX='.do')
-# debugEnv.Label = 'debug'
-# debugEnv.Append(CCFLAGS=Split('-g -gstabs+ -O0'))
-# debugEnv.Append(CPPDEFINES='DEBUG')
-# tlist = debugEnv.Program(target = 'm5.debug',
-#                          source = make_objs(sources, debugEnv))
-# debugEnv.M5Binary = tlist[0]
-
-# Optimized binary
-# optEnv = env.Copy()
-# optEnv.Label = 'opt'
-# optEnv.Append(CCFLAGS=Split('-g -O5'))
-# tlist = optEnv.Program(target = 'm5.opt',
-#                        source = make_objs(sources, optEnv))
-# optEnv.M5Binary = tlist[0]
-
-# "Fast" binary
-# fastEnv = env.Copy(OBJSUFFIX='.fo')
-# fastEnv.Label = 'fast'
-# fastEnv.Append(CCFLAGS=Split('-O5'))
-# fastEnv.Append(CPPDEFINES='NDEBUG')
-# fastEnv.Program(target = 'm5.fast.unstripped',
-#                 source = make_objs(sources, fastEnv))
-# tlist = fastEnv.Command(target = 'm5.fast',
-#                         source = 'm5.fast.unstripped',
-#                         action = 'strip $SOURCE -o $TARGET')
-# fastEnv.M5Binary = tlist[0]
-
-# Profiled binary
-# profEnv = env.Copy(OBJSUFFIX='.po')
-# profEnv.Label = 'prof'
-# profEnv.Append(CCFLAGS=Split('-O5 -g -pg'), LINKFLAGS='-pg')
-# tlist = profEnv.Program(target = 'm5.prof',
-#                         source = make_objs(sources, profEnv))
-# profEnv.M5Binary = tlist[0]
-# 
-# envList = [debugEnv, optEnv, fastEnv, profEnv]
-# 
-# Return('envList')
 Return('sources')
diff --git a/arch/isa_specific.hh b/arch/isa_specific.hh
index e11e6c292..44f8e9d64 100644
--- a/arch/isa_specific.hh
+++ b/arch/isa_specific.hh
@@ -50,27 +50,13 @@
 //These tell the preprocessor where to find the files of a particular
 //ISA, and set the "TheISA" macro for use elsewhere.
 #if THE_ISA == ALPHA_ISA
-    #define ISA_PATH arch/alpha/
     #define TheISA AlphaISA
 #elif THE_ISA == SPARC_ISA
-    #define ISA_PATH arch/sparc/
     #define TheISA SparcISA
 #elif THE_ISA == MIPS_ISA
-    #define ISA_PATH arch/mips/
     #define TheISA MipsISA
 #else
     #error "THE_ISA not set"
 #endif
-//The following is some preprocessor voodoo to allow redirectable includes
-//The end result is the ISA_INCLUDE() macro which is used inside stub
-//include files in arch and which redirect to the isa in use.
-#define STRINGIFY(token) #token
-#define EXPAND(token) token
-#define STICK_TOGETHER(firstpart, secondpart) \
-    EXPAND(firstpart)EXPAND(secondpart)
-#define EXPAND_AND_STRINGIFY(pathAndFile) \
-    STRINGIFY(pathAndFile)
-#define ISA_INCLUDE(filename) \
-    EXPAND_AND_STRINGIFY(STICK_TOGETHER(ISA_PATH, filename))
 
 #endif
diff --git a/build/SConstruct b/build/SConstruct
index c552e5639..38d404846 100644
--- a/build/SConstruct
+++ b/build/SConstruct
@@ -218,12 +218,15 @@ if have_mysql:
 
 env = conf.Finish()
 
+# Define the universe of supported ISAs
+env['ALL_ISA_LIST'] = ['alpha', 'sparc', 'mips']
+
 # Sticky options get saved in the options file so they persist from
 # one invocation to the next (unless overridden, in which case the new
 # value becomes sticky).
 sticky_opts = Options(args=ARGUMENTS)
 sticky_opts.AddOptions(
-    EnumOption('TARGET_ISA', 'Target ISA', 'alpha', ('alpha', 'sparc', 'mips')),
+    EnumOption('TARGET_ISA', 'Target ISA', 'alpha', env['ALL_ISA_LIST']),
     BoolOption('FULL_SYSTEM', 'Full-system support', False),
     BoolOption('ALPHA_TLASER',
                'Model Alpha TurboLaser platform (vs. Tsunami)', False),
diff --git a/util/pbs/jobfile.py b/util/pbs/jobfile.py
index d36b5ee6d..fd19b3bf5 100644
--- a/util/pbs/jobfile.py
+++ b/util/pbs/jobfile.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2005 The Regents of The University of Michigan
+# Copyright (c) 2005-2006 The Regents of The University of Michigan
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -277,10 +277,11 @@ class Option(Data):
             return name
 
         if attr == 'desc':
-            desc = self.__dict__[attr]
-            if self._suboption is not None:
-                desc = '%s, %s' % (desc, self._suboption.desc)
-            return desc
+            desc = [ self.__dict__[attr] ]
+            if self._suboption is not None and self._suboption.desc:
+                desc.append(self._suboption.desc)
+            return ', '.join(desc)
+
 
         return super(Option, self).__getattribute__(attr)
 
@@ -356,6 +357,8 @@ class Configuration(Data):
     def __init__(self, name, desc, **kwargs):
         super(Configuration, self).__init__(name, desc, **kwargs)
         self._groups = []
+        self._posfilters = []
+        self._negfilters = []
 
     def group(self, name, desc, **kwargs):
         grp = Group(name, desc, **kwargs)
@@ -402,13 +405,39 @@ class Configuration(Data):
                 if checkpoint:
                     yield options
 
+    def addfilter(self, filt, pos=True):
+        import re
+        filt = re.compile(filt)
+        if pos:
+            self._posfilters.append(filt)
+        else:
+            self._negfilters.append(filt)
+
+    def jobfilter(self, job):
+        for filt in self._negfilters:
+            if filt.match(job.name):
+                return False
+
+        if not self._posfilters:
+            return True
+
+        for filt in self._posfilters:
+            if filt.match(job.name):
+                return True
+
+        return False
+
     def checkpoints(self, groups = None):
         for options in self.options(groups, True):
-            yield Job(options)
+            job = Job(options)
+            if self.jobfilter(job):
+                yield job
 
     def jobs(self, groups = None):
         for options in self.options(groups, False):
-            yield Job(options)
+            job = Job(options)
+            if self.jobfilter(job):
+                yield job
 
     def alljobs(self, groups = None):
         for options in self.options(groups, True):