syscall_emul: [patch 13/22] add system call retry capability

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

diff --git a/src/arch/x86/SConscript b/src/arch/x86/SConscript
index 06e880704fee2d0f9da70a095eaf791f633b2939..bdc01225926d55dedfa0185b09f5b97bd2af6e8f 100644 (file)
--- a/src/arch/x86/SConscript
+++ b/src/arch/x86/SConscript
@@ -44,51 +44,47 @@ Import('*')
 
 if env['TARGET_ISA'] == 'x86':
     Source('cpuid.cc')
+    Source('decoder.cc')
+    Source('decoder_tables.cc')
     Source('emulenv.cc')
     Source('faults.cc')
+    Source('insts/badmicroop.cc')
     Source('insts/microfpop.cc')
     Source('insts/microldstop.cc')
     Source('insts/micromediaop.cc')
     Source('insts/microop.cc')
     Source('insts/microregop.cc')
     Source('insts/static_inst.cc')
+    Source('interrupts.cc')
     Source('isa.cc')
+    Source('linux/linux.cc')
+    Source('linux/process.cc')
+    Source('linux/system.cc')
     Source('nativetrace.cc')
     Source('pagetable.cc')
-    Source('predecoder.cc')
-    Source('predecoder_tables.cc')
+    Source('pagetable_walker.cc')
+    Source('process.cc')
+    Source('pseudo_inst.cc')
     Source('remote_gdb.cc')
+    Source('stacktrace.cc')
+    Source('system.cc')
     Source('tlb.cc')
+    Source('types.cc')
     Source('utility.cc')
+    Source('vtophys.cc')
 
+    SimObject('X86ISA.py')
+    SimObject('X86LocalApic.py')
     SimObject('X86NativeTrace.py')
-
+    SimObject('X86System.py')
     SimObject('X86TLB.py')
-    TraceFlag('Predecoder', "Predecoder debug output")
-    TraceFlag('X86', "Generic X86 ISA debugging")
-
-    if env['FULL_SYSTEM']:
-        TraceFlag('LocalApic', "Local APIC debugging")
-        TraceFlag('PageTableWalker', \
-                  "Page table walker state machine debugging")
-        TraceFlag('Faults', "Trace all faults/exceptions/traps")
-
-        SimObject('X86LocalApic.py')
-        SimObject('X86System.py')
-
-        # Full-system sources
-        Source('interrupts.cc')
-        Source('linux/system.cc')
-        Source('pagetable_walker.cc')
-        Source('system.cc')
-        Source('stacktrace.cc')
-        Source('vtophys.cc')
-    else:
-        Source('process.cc')
 
-        Source('linux/linux.cc')
-        Source('linux/process.cc')
-        Source('linux/syscalls.cc')
+    DebugFlag('Faults', "Trace all faults/exceptions/traps")
+    DebugFlag('LocalApic', "Local APIC debugging")
+    DebugFlag('PageTableWalker', \
+              "Page table walker state machine debugging")
+    DebugFlag('Decoder', "Decoder debug output")
+    DebugFlag('X86', "Generic X86 ISA debugging")
 
     python_files = (
         '__init__.py',
@@ -316,6 +312,3 @@ if env['TARGET_ISA'] == 'x86':
         # Add in python file dependencies that won't be caught otherwise
         for pyfile in python_files:
             env.Depends(f, "isa/insts/%s" % pyfile)
-        # Only non-header files need to be compiled.
-        if not f.path.endswith('.hh'):
-            Source(f)