X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Farch%2Farm%2FSConscript;h=3b68fb64762c228dcfedb2ea0f5c2230d3bea801;hb=b8efd0e854ae568dae33fe3d24f67054ed016d19;hp=ea55314a451fd94ad9ba80799529dd5e68c4abab;hpb=997f36c7115e37f292c50db8986c6ebd4bd1beca;p=gem5.git

diff --git a/src/arch/arm/SConscript b/src/arch/arm/SConscript
index ea55314a4..3b68fb647 100644
--- a/src/arch/arm/SConscript
+++ b/src/arch/arm/SConscript
@@ -1,5 +1,17 @@
 # -*- mode:python -*-
 
+# Copyright (c) 2009, 2012-2013 ARM Limited
+# All rights reserved.
+#
+# The license below extends only to copyright in the software and shall
+# not be construed as granting a license to any other intellectual
+# property including but not limited to intellectual property relating
+# to a hardware implementation of the functionality of the software
+# licensed hereunder.  You may use the software subject to the license
+# terms below provided that you ensure that this notice is replicated
+# unmodified and in its entirety in all distributions of the software,
+# modified or unmodified, in source code or in binary form.
+#
 # Copyright (c) 2007-2008 The Florida State University
 # All rights reserved.
 #
@@ -27,39 +39,63 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 # Authors: Stephen Hines
+#          Ali Saidi
 
 Import('*')
 
 if env['TARGET_ISA'] == 'arm':
 # Workaround for bug in SCons version > 0.97d20071212
-# Scons bug id: 2006 M5 Bug id: 308 
+# Scons bug id: 2006 M5 Bug id: 308
     Dir('isa/formats')
+    Source('decoder.cc')
     Source('faults.cc')
-    Source('insts/branch.cc')
+    Source('insts/branch64.cc')
+    Source('insts/data64.cc')
+    Source('insts/macromem.cc')
     Source('insts/mem.cc')
+    Source('insts/mem64.cc')
+    Source('insts/misc.cc')
+    Source('insts/misc64.cc')
     Source('insts/pred_inst.cc')
+    Source('insts/pseudo.cc')
     Source('insts/static_inst.cc')
+    Source('insts/vfp.cc')
+    Source('insts/fplib.cc')
+    Source('interrupts.cc')
     Source('isa.cc')
-    Source('pagetable.cc')
-    Source('regfile.cc')
+    Source('isa_device.cc')
+    Source('linux/linux.cc')
+    Source('linux/process.cc')
+    Source('linux/system.cc')
+    Source('freebsd/freebsd.cc')
+    Source('freebsd/process.cc')
+    Source('freebsd/system.cc')
+    Source('miscregs.cc')
+    Source('nativetrace.cc')
+    Source('pmu.cc')
+    Source('process.cc')
+    Source('remote_gdb.cc')
+    Source('stacktrace.cc')
+    Source('system.cc')
+    Source('table_walker.cc')
+    Source('stage2_mmu.cc')
+    Source('stage2_lookup.cc')
     Source('tlb.cc')
+    Source('utility.cc')
     Source('vtophys.cc')
 
+    SimObject('ArmInterrupts.py')
+    SimObject('ArmISA.py')
+    SimObject('ArmNativeTrace.py')
+    SimObject('ArmSystem.py')
     SimObject('ArmTLB.py')
-    TraceFlag('Arm')
-
-    if env['FULL_SYSTEM']:
-        #Insert Full-System Files Here
-        pass
-    else:
-        Source('process.cc')
-        Source('linux/linux.cc')
-        Source('linux/process.cc')
+    SimObject('ArmPMU.py')
 
-    # 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)
+    DebugFlag('Arm')
+    DebugFlag('Decoder', "Instructions returned by the predecoder")
+    DebugFlag('Faults', "Trace Exceptions, interrupts, svc/swi")
+    DebugFlag('PMUVerbose', "Performance Monitor")
+    DebugFlag('TLBVerbose')
 
+    # Add files generated by the ISA description.
+    ISADesc('isa/main.isa', decoder_splits=3, exec_splits=6)