Rework the way SCons recurses into subdirectories, making it

automatic.  The point is that now a subdirectory can be added
to the build process just by creating a SConscript file in it.
The process has two passes.  On the first pass, all subdirs
of the root of the tree are searched for SConsopts files.
These files contain any command line options that ought to be
added for a particular subdirectory.  On the second pass,
all subdirs of the src directory are searched for SConscript
files.  These files describe how to build any given subdirectory.
I have added a Source() function.  Any file (relative to the
directory in which the SConscript resides) passed to that
function is added to the build.  Clean up everything to take
advantage of Source().
function is added to the list of files to be built.

--HG--
extra : convert_revision : 103f6b490d2eb224436688c89cdc015211c4fd30

1 files changed, 45 insertions, 41 deletions

diff --git a/src/cpu/o3/SConscript b/src/cpu/o3/SConscript
index afbd4c533..bb1dfb613 100755
--- a/src/cpu/o3/SConscript
+++ b/src/cpu/o3/SConscript
@@ -26,52 +26,56 @@
 # (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: Korey Sewell
+# Authors: Nathan Binkert
 
-import os
-import os.path
 import sys
 
-# Import build environment variable from SConstruct.
-Import('env')
+Import('*')
 
+if 'O3CPU' in env['CPU_MODELS']:
+    Source('base_dyn_inst.cc')
+    Source('bpred_unit.cc')
+    Source('commit.cc')
+    Source('cpu.cc')
+    Source('decode.cc')
+    Source('fetch.cc')
+    Source('free_list.cc')
+    Source('fu_pool.cc')
+    Source('iew.cc')
+    Source('inst_queue.cc')
+    Source('lsq.cc')
+    Source('lsq_unit.cc')
+    Source('mem_dep_unit.cc')
+    Source('rename.cc')
+    Source('rename_map.cc')
+    Source('rob.cc')
+    Source('scoreboard.cc')
+    Source('store_set.cc')
 
-#################################################################
-#
-# Include ISA-specific files for the O3 CPU-model
-#
-#################################################################
-
-sources = []
-
-if env['TARGET_ISA'] == 'alpha':
-    sources += Split('''
-        alpha/dyn_inst.cc
-        alpha/cpu.cc
-        alpha/thread_context.cc
-        alpha/cpu_builder.cc
-        ''')
-elif env['TARGET_ISA'] == 'mips':
-    sources += Split('''
-        mips/dyn_inst.cc
-        mips/cpu.cc
-        mips/thread_context.cc
-        mips/cpu_builder.cc
-        ''')
-elif env['TARGET_ISA'] == 'sparc':
-    sources += Split('''
-        sparc/dyn_inst.cc
-        sparc/cpu.cc
-        sparc/thread_context.cc
-        sparc/cpu_builder.cc
-        ''')
-else:
-    sys.exit('O3 CPU does not support the \'%s\' ISA' % env['TARGET_ISA'])
-
+    if env['TARGET_ISA'] == 'alpha':
+        Source('alpha/cpu.cc')
+        Source('alpha/cpu_builder.cc')
+        Source('alpha/dyn_inst.cc')
+        Source('alpha/thread_context.cc')
+    elif env['TARGET_ISA'] == 'mips':
+        Source('mips/cpu.cc')
+        Source('mips/cpu_builder.cc')
+        Source('mips/dyn_inst.cc')
+        Source('mips/thread_context.cc')
+    elif env['TARGET_ISA'] == 'sparc':
+        Source('sparc/cpu.cc')
+        Source('sparc/cpu_builder.cc')
+        Source('sparc/dyn_inst.cc')
+        Source('sparc/thread_context.cc')
+    else:
+        sys.exit('O3 CPU does not support the \'%s\' ISA' % env['TARGET_ISA'])
 
-# 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]
+    if env['USE_CHECKER']:
+        Source('checker_builder.cc')
 
-Return('sources')
+if 'O3CPU' in env['CPU_MODELS'] or 'OzoneCPU' in env['CPU_MODELS']:
+    Source('2bit_local_pred.cc')
+    Source('btb.cc')
+    Source('ras.cc')
+    Source('tournament_pred.cc')