X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=SConscript;h=3b3c871bc29362a230774c21426d7a053a0aec23;hb=5b10fdf4ebd0e787665302ba3857663253468ade;hp=75cbc48ee9432f0e219b74a3dbcebb2d8a79fc86;hpb=eb7d32907679c2f19e3bc896a76484f537bc986d;p=gem5.git diff --git a/SConscript b/SConscript index 75cbc48ee..3b3c871bc 100644 --- a/SConscript +++ b/SConscript @@ -46,6 +46,7 @@ base_sources = Split(''' arch/alpha/decoder.cc arch/alpha/fast_cpu_exec.cc arch/alpha/simple_cpu_exec.cc + arch/alpha/inorder_cpu_exec.cc arch/alpha/full_cpu_exec.cc arch/alpha/faults.cc arch/alpha/isa_traits.cc @@ -53,6 +54,7 @@ base_sources = Split(''' base/circlebuf.cc base/copyright.cc base/cprintf.cc + base/embedfile.cc base/fast_alloc.cc base/fifo_buffer.cc base/hostinfo.cc @@ -61,9 +63,11 @@ base_sources = Split(''' base/intmath.cc base/match.cc base/misc.cc + base/output.cc base/pollevent.cc base/python.cc base/range.cc + base/random.cc base/sat_counter.cc base/socket.cc base/statistics.cc @@ -108,6 +112,7 @@ base_sources = Split(''' cpu/full_cpu/issue.cc cpu/full_cpu/ls_queue.cc cpu/full_cpu/machine_queue.cc + cpu/full_cpu/pc_sample_profile.cc cpu/full_cpu/pipetrace.cc cpu/full_cpu/readyq.cc cpu/full_cpu/reg_info.cc @@ -127,6 +132,7 @@ base_sources = Split(''' cpu/full_cpu/iq/standard/iq_standard.cc cpu/sampling_cpu/sampling_cpu.cc cpu/simple_cpu/simple_cpu.cc + cpu/inorder_cpu/inorder_cpu.cc cpu/trace/reader/mem_trace_reader.cc cpu/trace/reader/ibm_reader.cc cpu/trace/reader/itx_reader.cc @@ -177,6 +183,9 @@ base_sources = Split(''' mem/trace/mem_trace_writer.cc mem/trace/m5_writer.cc + python/pyconfig.cc + python/embedded_py.cc + sim/builder.cc sim/configfile.cc sim/debug.cc @@ -187,48 +196,14 @@ base_sources = Split(''' sim/serialize.cc sim/sim_events.cc sim/sim_exit.cc - sim/sim_init.cc sim/sim_object.cc + sim/startup.cc sim/stat_context.cc sim/stat_control.cc sim/trace_context.cc sim/universe.cc - sim/pyconfig/pyconfig.cc - sim/pyconfig/code.cc - ''') - -base_obj_desc_files = Split(''' - cpu/full_cpu/iq/segmented/SegmentedIQ.od - cpu/full_cpu/iq/seznec/SeznecIQ.od - cpu/full_cpu/iq/standard/StandardIQ.od - cpu/full_cpu/iq/BaseIQ.od - cpu/full_cpu/BranchPred.od - cpu/full_cpu/FUDesc.od - cpu/full_cpu/FullCPU.od - cpu/full_cpu/FuncUnitPool.od - cpu/full_cpu/OpDesc.od - cpu/full_cpu/PipeTrace.od - cpu/sampling_cpu/SamplingCPU.od - cpu/simple_cpu/SimpleCPU.od - cpu/BaseCPU.od - cpu/IntrControl.od - mem/bus/Bus.od - mem/bus/BusBridge.od - mem/cache/coherence/CoherenceProtocol.od - mem/cache/tags/repl/GenRepl.od - mem/cache/tags/repl/Repl.od - mem/cache/BaseCache.od - mem/functional_mem/FunctionalMemory.od - mem/functional_mem/MainMemory.od - mem/functional_mem/MemoryController.od - mem/functional_mem/PhysicalMemory.od - mem/timing_mem/BaseMemory.od - mem/BaseHier.od - mem/BaseMem.od - mem/HierParams.od ''') - # MySql sources mysql_sources = Split(''' base/mysql.cc @@ -244,6 +219,7 @@ full_system_sources = Split(''' arch/alpha/pseudo_inst.cc arch/alpha/vtophys.cc + base/crc.cc base/inet.cc base/remote_gdb.cc @@ -267,10 +243,12 @@ full_system_sources = Split(''' dev/etherdev.cc dev/pciconfigall.cc dev/pcidev.cc + dev/pktfifo.cc dev/scsi.cc dev/scsi_ctrl.cc dev/scsi_disk.cc dev/scsi_none.cc + dev/sinic.cc dev/simple_disk.cc dev/tlaser_clock.cc dev/tlaser_ipi.cc @@ -308,50 +286,13 @@ full_system_sources = Split(''' sim/system.cc ''') -full_system_obj_desc_files = Split(''' - arch/alpha/AlphaDTB.od - arch/alpha/AlphaITB.od - arch/alpha/AlphaTLB.od - dev/AlphaConsole.od - dev/ConsoleListener.od - dev/CowDiskImage.od - dev/DiskImage.od - dev/DmaDevice.od - dev/DmaEngine.od - dev/EtherBus.od - dev/EtherDev.od - dev/EtherDevInt.od - dev/EtherDump.od - dev/EtherInt.od - dev/EtherLink.od - dev/EtherTap.od - dev/PioDevice.od - dev/RawDiskImage.od - dev/ScsiController.od - dev/ScsiDevice.od - dev/ScsiDisk.od - dev/SimConsole.od - dev/SimpleDisk.od - dev/TlaserClock.od - dev/TlaserIpi.od - dev/TlaserMBox.od - dev/TlaserMC146818.od - dev/TlaserNode.od - dev/TlaserPciDev.od - dev/TlaserPcia.od - dev/TlaserSerial.od - dev/TlaserUart.od - dev/Turbolaser.od - kern/tru64/Tru64System.od - sim/System.od - ''') - # Syscall emulation (non-full-system) sources syscall_emulation_sources = Split(''' arch/alpha/alpha_common_syscall_emul.cc arch/alpha/alpha_linux_process.cc arch/alpha/alpha_tru64_process.cc cpu/memtest/memtest.cc + cpu/trace/opt_cpu.cc cpu/trace/trace_cpu.cc eio/eio.cc eio/exolex.cc @@ -360,31 +301,47 @@ syscall_emulation_sources = Split(''' sim/syscall_emul.cc ''') -syscall_emulation_obj_desc_files = Split(''' - cpu/memtest/MemTest.od - eio/EioProcess.od - sim/LiveProcess.od - sim/Process.od - ''') +targetarch_files = Split(''' + alpha_common_syscall_emul.hh + alpha_linux_process.hh + alpha_memory.hh + alpha_tru64_process.hh + aout_machdep.h + arguments.hh + byte_swap.hh + ecoff_machdep.h + elf_machdep.h + ev5.hh + faults.hh + isa_fullsys_traits.hh + isa_traits.hh + machine_exo.h + osfpal.hh + pseudo_inst.hh + vptr.hh + vtophys.hh + ''') + +for f in targetarch_files: + env.Command('targetarch/' + f, 'arch/alpha/' + f, + '''echo '#include "arch/alpha/%s"' > $TARGET''' % f) + # Set up complete list of sources based on configuration. sources = base_sources -obj_desc_files = base_obj_desc_files if env['FULL_SYSTEM']: sources += full_system_sources - obj_desc_files += full_system_obj_desc_files else: sources += syscall_emulation_sources - obj_desc_files += syscall_emulation_obj_desc_files extra_libraries = [] +env.Append(LIBS=['z']) if env['USE_MYSQL']: sources += mysql_sources env.Append(CPPDEFINES = 'USE_MYSQL') env.Append(CPPDEFINES = 'STATS_BINNING') env.Append(CPPPATH=['/usr/local/include/mysql', '/usr/include/mysql']) - env.Append(LIBS=['z']) if os.path.isdir('/usr/lib64'): env.Append(LIBPATH=['/usr/lib64/mysql']) else: @@ -409,46 +366,27 @@ env.Command(Split('''arch/alpha/decoder.cc arch/alpha/decoder.hh arch/alpha/fast_cpu_exec.cc arch/alpha/simple_cpu_exec.cc + arch/alpha/inorder_cpu_exec.cc arch/alpha/full_cpu_exec.cc'''), Split('''arch/alpha/isa_desc arch/isa_parser.py'''), '$SRCDIR/arch/isa_parser.py $SOURCE $TARGET.dir arch/alpha') -# 'targetarch' is a symlink to arch/$TARGET_ISA. -def link_targetarch(target, source, env): - link_target = str(target[0]) - link_source = env.subst('$SRCDIR/arch/$TARGET_ISA') - if not os.path.isdir(link_target): - print "symlinking", link_source, "to", link_target - try: - os.symlink(link_source, link_target) - except OSError, desc: - print "Error creating symlink %s: %s" % (link_target, desc) - sys.exit(-1) - -# Tell SCons to use the link_targetarch function to make 'targetarch' -env.Command('targetarch', None, link_targetarch) - - # libelf build is described in its own SConscript file. # SConscript-local is the per-config build, which just copies some # header files into a place where they can be found. SConscript('libelf/SConscript-local', exports = 'env', duplicate=0) - -SConscript('sim/pyconfig/SConscript', exports = ['env', 'obj_desc_files'], - duplicate=0) - +SConscript('python/SConscript', exports = ['env'], duplicate=0) +SConscript('simobj/SConscript', exports = 'env', duplicate=0) # This function adds the specified sources to the given build # environment, and returns a list of all the corresponding SCons # Object nodes (including an extra one for date.cc). We explicitly # add the Object nodes so we can set up special dependencies for -# targetarch and date.cc. +# date.cc. def make_objs(sources, env): objs = [env.Object(s) for s in sources] - # make all objects depend on the targetarch link so it gets made first. - env.Depends(objs, 'targetarch') # make date.cc depend on all other objects so it always gets # recompiled whenever anything else does date_obj = env.Object('base/date.cc')