ARM: Fix compilation on ARM after Gabe's change.

[gem5.git] / src / arch / arm / SConscript

diff --git a/src/arch/arm/SConscript b/src/arch/arm/SConscript
index 55ecabdc3bd6700d7c905f55fdd264c79494b0b5..08a3c7048968b99bde0ceb296b7f234cbbed642a 100644 (file)
--- a/src/arch/arm/SConscript
+++ b/src/arch/arm/SConscript
@@ -1,5 +1,17 @@
 # -*- mode:python -*-
 
+# Copyright (c) 2009 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,6 +39,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 # Authors: Stephen Hines
+#          Ali Saidi
 
 Import('*')
 
@@ -34,28 +47,40 @@ if env['TARGET_ISA'] == 'arm':
 # Workaround for bug in SCons version > 0.97d20071212
 # Scons bug id: 2006 M5 Bug id: 308 
     Dir('isa/formats')
+    Source('decoder.cc')
     Source('faults.cc')
-    Source('insts/branch.cc')
+    Source('insts/macromem.cc')
     Source('insts/mem.cc')
+    Source('insts/misc.cc')
     Source('insts/pred_inst.cc')
     Source('insts/static_inst.cc')
+    Source('insts/vfp.cc')
+    Source('interrupts.cc')
+    Source('isa.cc')
+    Source('isa_traits.cc')
+    Source('linux/linux.cc')
+    Source('linux/process.cc')
+    Source('linux/system.cc')
+    Source('miscregs.cc')
     Source('nativetrace.cc')
-    Source('pagetable.cc')
+    Source('process.cc')
+    Source('remote_gdb.cc')
+    Source('stacktrace.cc')
+    Source('system.cc')
+    Source('table_walker.cc')
     Source('tlb.cc')
+    Source('utility.cc')
     Source('vtophys.cc')
 
+    SimObject('ArmInterrupts.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')
+    DebugFlag('Arm')
+    DebugFlag('Decoder', "Instructions returned by the predecoder")
+    DebugFlag('Faults', "Trace Exceptions, interrupts, svc/swi")
+    DebugFlag('TLBVerbose')
 
     # Add in files generated by the ISA description.
     isa_desc_files = env.ISADesc('isa/main.isa')