diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2011-10-30 03:06:40 -0700 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2011-10-30 03:06:40 -0700 |
| commit | 6dc3cedc4e6debc331805444aa04ccf9f956f870 (patch) | |
| tree | 609d763f4e8ff4898fed0c995b009d00e0cb901d | |
| parent | ca77249b0cc767096508867328bee77ce5b2ccf6 (diff) | |
| download | gem5-6dc3cedc4e6debc331805444aa04ccf9f956f870.tar.xz | |
X86: Build the same files in SE and FS.
| -rw-r--r-- | src/arch/x86/SConscript | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/src/arch/x86/SConscript b/src/arch/x86/SConscript index aff9b1bf3..3bd968e21 100644 --- a/src/arch/x86/SConscript +++ b/src/arch/x86/SConscript @@ -55,12 +55,19 @@ if env['TARGET_ISA'] == 'x86': Source('insts/static_inst.cc') Source('interrupts.cc') Source('isa.cc') + Source('linux/linux.cc') + Source('linux/process.cc') + Source('linux/syscalls.cc') + Source('linux/system.cc') Source('nativetrace.cc') Source('pagetable.cc') Source('pagetable_walker.cc') Source('predecoder.cc') Source('predecoder_tables.cc') + Source('process.cc') Source('remote_gdb.cc') + Source('stacktrace.cc') + Source('system.cc') Source('tlb.cc') Source('types.cc') Source('utility.cc') @@ -68,6 +75,7 @@ if env['TARGET_ISA'] == 'x86': SimObject('X86LocalApic.py') SimObject('X86NativeTrace.py') + SimObject('X86System.py') SimObject('X86TLB.py') DebugFlag('Faults', "Trace all faults/exceptions/traps") @@ -77,21 +85,6 @@ if env['TARGET_ISA'] == 'x86': DebugFlag('Predecoder', "Predecoder debug output") DebugFlag('X86', "Generic X86 ISA debugging") - if env['FULL_SYSTEM']: - - SimObject('X86System.py') - - # Full-system sources - Source('linux/system.cc') - Source('system.cc') - Source('stacktrace.cc') - else: - Source('process.cc') - - Source('linux/linux.cc') - Source('linux/process.cc') - Source('linux/syscalls.cc') - python_files = ( '__init__.py', 'general_purpose/__init__.py', |