54d4220b00
Following with the previous check-in, ExecContext now refers only to the interface provided to the ISA in order to access CPU state. ThreadContext refers to the interface provided to all objects outside the CPU in order to access thread state. SimpleThread provides all thread state and the interface to access it, and is suitable for simple execution models such as the SimpleCPU.
src/SConscript:
Include thread state file.
src/arch/alpha/ev5.cc:
src/cpu/checker/cpu.cc:
src/cpu/checker/cpu.hh:
src/cpu/checker/thread_context.hh:
src/cpu/memtest/memtest.cc:
src/cpu/memtest/memtest.hh:
src/cpu/o3/cpu.cc:
src/cpu/ozone/cpu_impl.hh:
src/cpu/simple/atomic.cc:
src/cpu/simple/base.cc:
src/cpu/simple/base.hh:
src/cpu/simple/timing.cc:
Rename CPUExecContext to SimpleThread.
src/cpu/base_dyn_inst.hh:
Make thread member variables protected..
src/cpu/o3/alpha_cpu.hh:
src/cpu/o3/cpu.hh:
Make various members of ThreadState protected.
src/cpu/o3/alpha_cpu_impl.hh:
Push generation of TranslatingPort into the CPU itself.
Make various members of ThreadState protected.
src/cpu/o3/thread_state.hh:
Pull a lot of common code into the base ThreadState class.
src/cpu/ozone/thread_state.hh:
Rename CPUExecContext to SimpleThread, move a lot of common code into base ThreadState class.
src/cpu/thread_state.hh:
Push a lot of common code into base ThreadState class. This goes along with renaming CPUExecContext to SimpleThread, and making it derive from ThreadState.
src/cpu/simple_thread.cc:
Rename CPUExecContext to SimpleThread, make it derive from ThreadState. This helps push a lot of common code/state into a single class that can be used by all CPUs.
src/cpu/simple_thread.hh:
Rename CPUExecContext to SimpleThread, make it derive from ThreadState.
src/kern/system_events.cc:
Rename cpu_exec_context to thread_context.
src/sim/process.hh:
Remove unused forward declaration.
--HG--
rename : src/cpu/cpu_exec_context.cc => src/cpu/simple_thread.cc
rename : src/cpu/cpu_exec_context.hh => src/cpu/simple_thread.hh
extra : convert_revision : 2ed617aa80b64016cb9270f75352607cca032733
402 lines
11 KiB
Python
402 lines
11 KiB
Python
# -*- mode:python -*-
|
|
|
|
# Copyright (c) 2004-2005 The Regents of The University of Michigan
|
|
# All rights reserved.
|
|
#
|
|
# Redistribution and use in source and binary forms, with or without
|
|
# modification, are permitted provided that the following conditions are
|
|
# met: redistributions of source code must retain the above copyright
|
|
# notice, this list of conditions and the following disclaimer;
|
|
# redistributions in binary form must reproduce the above copyright
|
|
# notice, this list of conditions and the following disclaimer in the
|
|
# documentation and/or other materials provided with the distribution;
|
|
# neither the name of the copyright holders nor the names of its
|
|
# contributors may be used to endorse or promote products derived from
|
|
# this software without specific prior written permission.
|
|
#
|
|
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
|
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
|
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
|
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
|
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
|
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
|
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
|
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
#
|
|
# Authors: Steve Reinhardt
|
|
|
|
import os
|
|
import sys
|
|
from os.path import isdir
|
|
|
|
# This file defines how to build a particular configuration of M5
|
|
# based on variable settings in the 'env' build environment.
|
|
|
|
# Import build environment variable from SConstruct.
|
|
Import('env')
|
|
|
|
###################################################
|
|
#
|
|
# Define needed sources.
|
|
#
|
|
###################################################
|
|
|
|
# Base sources used by all configurations.
|
|
|
|
base_sources = Split('''
|
|
base/circlebuf.cc
|
|
base/cprintf.cc
|
|
base/fast_alloc.cc
|
|
base/fifo_buffer.cc
|
|
base/hostinfo.cc
|
|
base/hybrid_pred.cc
|
|
base/inifile.cc
|
|
base/intmath.cc
|
|
base/match.cc
|
|
base/misc.cc
|
|
base/output.cc
|
|
base/pollevent.cc
|
|
base/range.cc
|
|
base/random.cc
|
|
base/sat_counter.cc
|
|
base/serializer.cc
|
|
base/socket.cc
|
|
base/statistics.cc
|
|
base/str.cc
|
|
base/time.cc
|
|
base/trace.cc
|
|
base/traceflags.cc
|
|
base/userinfo.cc
|
|
base/compression/lzss_compression.cc
|
|
base/loader/aout_object.cc
|
|
base/loader/ecoff_object.cc
|
|
base/loader/elf_object.cc
|
|
base/loader/object_file.cc
|
|
base/loader/symtab.cc
|
|
base/stats/events.cc
|
|
base/stats/statdb.cc
|
|
base/stats/visit.cc
|
|
base/stats/text.cc
|
|
|
|
cpu/activity.cc
|
|
cpu/base.cc
|
|
cpu/cpuevent.cc
|
|
cpu/exetrace.cc
|
|
cpu/op_class.cc
|
|
cpu/pc_event.cc
|
|
cpu/quiesce_event.cc
|
|
cpu/static_inst.cc
|
|
cpu/sampler/sampler.cc
|
|
cpu/simple_thread.cc
|
|
cpu/thread_state.cc
|
|
|
|
encumbered/cpu/full/fu_pool.cc
|
|
|
|
mem/bridge.cc
|
|
mem/bus.cc
|
|
mem/connector.cc
|
|
mem/mem_object.cc
|
|
mem/packet.cc
|
|
mem/physical.cc
|
|
mem/port.cc
|
|
|
|
sim/builder.cc
|
|
sim/configfile.cc
|
|
sim/debug.cc
|
|
sim/eventq.cc
|
|
sim/faults.cc
|
|
sim/main.cc
|
|
sim/param.cc
|
|
sim/profile.cc
|
|
sim/root.cc
|
|
sim/serialize.cc
|
|
sim/sim_events.cc
|
|
sim/sim_exit.cc
|
|
sim/sim_object.cc
|
|
sim/startup.cc
|
|
sim/stat_context.cc
|
|
sim/stat_control.cc
|
|
sim/system.cc
|
|
sim/trace_context.cc
|
|
''')
|
|
|
|
# Old FullCPU sources
|
|
full_cpu_sources = Split('''
|
|
encumbered/cpu/full/bpred.cc
|
|
encumbered/cpu/full/commit.cc
|
|
encumbered/cpu/full/cpu.cc
|
|
encumbered/cpu/full/create_vector.cc
|
|
encumbered/cpu/full/cv_spec_state.cc
|
|
encumbered/cpu/full/dd_queue.cc
|
|
encumbered/cpu/full/dep_link.cc
|
|
encumbered/cpu/full/dispatch.cc
|
|
encumbered/cpu/full/dyn_inst.cc
|
|
encumbered/cpu/full/execute.cc
|
|
encumbered/cpu/full/fetch.cc
|
|
encumbered/cpu/full/floss_reasons.cc
|
|
encumbered/cpu/full/fu_pool.cc
|
|
encumbered/cpu/full/inst_fifo.cc
|
|
encumbered/cpu/full/instpipe.cc
|
|
encumbered/cpu/full/issue.cc
|
|
encumbered/cpu/full/ls_queue.cc
|
|
encumbered/cpu/full/machine_queue.cc
|
|
encumbered/cpu/full/pipetrace.cc
|
|
encumbered/cpu/full/readyq.cc
|
|
encumbered/cpu/full/reg_info.cc
|
|
encumbered/cpu/full/rob_station.cc
|
|
encumbered/cpu/full/spec_memory.cc
|
|
encumbered/cpu/full/spec_state.cc
|
|
encumbered/cpu/full/storebuffer.cc
|
|
encumbered/cpu/full/writeback.cc
|
|
encumbered/cpu/full/iq/iq_station.cc
|
|
encumbered/cpu/full/iq/iqueue.cc
|
|
encumbered/cpu/full/iq/segmented/chain_info.cc
|
|
encumbered/cpu/full/iq/segmented/chain_wire.cc
|
|
encumbered/cpu/full/iq/segmented/iq_seg.cc
|
|
encumbered/cpu/full/iq/segmented/iq_segmented.cc
|
|
encumbered/cpu/full/iq/segmented/seg_chain.cc
|
|
encumbered/cpu/full/iq/seznec/iq_seznec.cc
|
|
encumbered/cpu/full/iq/standard/iq_standard.cc
|
|
''')
|
|
|
|
trace_reader_sources = Split('''
|
|
cpu/trace/reader/mem_trace_reader.cc
|
|
cpu/trace/reader/ibm_reader.cc
|
|
cpu/trace/reader/itx_reader.cc
|
|
cpu/trace/reader/m5_reader.cc
|
|
cpu/trace/opt_cpu.cc
|
|
cpu/trace/trace_cpu.cc
|
|
''')
|
|
|
|
|
|
|
|
# MySql sources
|
|
mysql_sources = Split('''
|
|
base/mysql.cc
|
|
base/stats/mysql.cc
|
|
''')
|
|
|
|
# Full-system sources
|
|
full_system_sources = Split('''
|
|
base/crc.cc
|
|
base/inet.cc
|
|
base/remote_gdb.cc
|
|
|
|
cpu/intr_control.cc
|
|
cpu/profile.cc
|
|
|
|
dev/alpha_console.cc
|
|
dev/baddev.cc
|
|
dev/disk_image.cc
|
|
dev/etherbus.cc
|
|
dev/etherdump.cc
|
|
dev/etherint.cc
|
|
dev/etherlink.cc
|
|
dev/etherpkt.cc
|
|
dev/ethertap.cc
|
|
dev/ide_ctrl.cc
|
|
dev/ide_disk.cc
|
|
dev/io_device.cc
|
|
dev/isa_fake.cc
|
|
dev/ns_gige.cc
|
|
dev/pciconfigall.cc
|
|
dev/pcidev.cc
|
|
dev/pcifake.cc
|
|
dev/pktfifo.cc
|
|
dev/platform.cc
|
|
dev/simconsole.cc
|
|
dev/simple_disk.cc
|
|
dev/sinic.cc
|
|
dev/tsunami.cc
|
|
dev/tsunami_cchip.cc
|
|
dev/tsunami_io.cc
|
|
dev/tsunami_fake.cc
|
|
dev/tsunami_pchip.cc
|
|
|
|
dev/uart.cc
|
|
dev/uart8250.cc
|
|
|
|
kern/kernel_binning.cc
|
|
kern/kernel_stats.cc
|
|
kern/system_events.cc
|
|
kern/linux/events.cc
|
|
kern/linux/linux_syscalls.cc
|
|
kern/linux/printk.cc
|
|
|
|
mem/vport.cc
|
|
|
|
sim/pseudo_inst.cc
|
|
''')
|
|
|
|
|
|
if env['TARGET_ISA'] == 'alpha':
|
|
full_system_sources += Split('''
|
|
kern/tru64/dump_mbuf.cc
|
|
kern/tru64/printf.cc
|
|
kern/tru64/tru64_events.cc
|
|
kern/tru64/tru64_syscalls.cc
|
|
''')
|
|
|
|
# turbolaser encumbered sources
|
|
turbolaser_sources = Split('''
|
|
encumbered/dev/dma.cc
|
|
encumbered/dev/etherdev.cc
|
|
encumbered/dev/scsi.cc
|
|
encumbered/dev/scsi_ctrl.cc
|
|
encumbered/dev/scsi_disk.cc
|
|
encumbered/dev/scsi_none.cc
|
|
encumbered/dev/tlaser_clock.cc
|
|
encumbered/dev/tlaser_ipi.cc
|
|
encumbered/dev/tlaser_mbox.cc
|
|
encumbered/dev/tlaser_mc146818.cc
|
|
encumbered/dev/tlaser_node.cc
|
|
encumbered/dev/tlaser_pcia.cc
|
|
encumbered/dev/tlaser_pcidev.cc
|
|
encumbered/dev/tlaser_serial.cc
|
|
encumbered/dev/turbolaser.cc
|
|
encumbered/dev/uart8530.cc
|
|
''')
|
|
|
|
# Syscall emulation (non-full-system) sources
|
|
syscall_emulation_sources = Split('''
|
|
mem/translating_port.cc
|
|
mem/page_table.cc
|
|
sim/process.cc
|
|
sim/syscall_emul.cc
|
|
''')
|
|
|
|
#if env['TARGET_ISA'] == 'alpha':
|
|
# syscall_emulation_sources += Split('''
|
|
# kern/tru64/tru64.cc
|
|
# ''')
|
|
|
|
alpha_eio_sources = Split('''
|
|
encumbered/eio/exolex.cc
|
|
encumbered/eio/libexo.cc
|
|
encumbered/eio/eio.cc
|
|
''')
|
|
|
|
if env['TARGET_ISA'] == 'ALPHA_ISA':
|
|
syscall_emulation_sources += alpha_eio_sources
|
|
|
|
memtest_sources = Split('''
|
|
cpu/memtest/memtest.cc
|
|
''')
|
|
|
|
# Add a flag defining what THE_ISA should be for all compilation
|
|
env.Append(CPPDEFINES=[('THE_ISA','%s_ISA' % env['TARGET_ISA'].upper())])
|
|
|
|
arch_sources = SConscript('arch/SConscript',
|
|
exports = 'env', duplicate = False)
|
|
|
|
cpu_sources = SConscript('cpu/SConscript',
|
|
exports = 'env', duplicate = False)
|
|
|
|
# This is outside of cpu/SConscript since the source directory isn't
|
|
# underneath 'cpu'.
|
|
if 'FullCPU' in env['CPU_MODELS']:
|
|
cpu_sources += full_cpu_sources
|
|
|
|
# Set up complete list of sources based on configuration.
|
|
sources = base_sources + arch_sources + cpu_sources
|
|
|
|
if env['FULL_SYSTEM']:
|
|
sources += full_system_sources
|
|
if env['ALPHA_TLASER']:
|
|
sources += turbolaser_sources
|
|
else:
|
|
sources += syscall_emulation_sources
|
|
|
|
if env['USE_MYSQL']:
|
|
sources += mysql_sources
|
|
|
|
for opt in env.ExportOptions:
|
|
env.ConfigFile(opt)
|
|
|
|
###################################################
|
|
#
|
|
# Special build rules.
|
|
#
|
|
###################################################
|
|
|
|
# base/traceflags.{cc,hh} are generated from base/traceflags.py.
|
|
# $TARGET.base will expand to "<build-dir>/base/traceflags".
|
|
env.Command(Split('base/traceflags.hh base/traceflags.cc'),
|
|
'base/traceflags.py',
|
|
'python $SOURCE $TARGET.base')
|
|
|
|
SConscript('python/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
|
|
# date.cc.
|
|
def make_objs(sources, env):
|
|
objs = [env.Object(s) for s in sources]
|
|
# make date.cc depend on all other objects so it always gets
|
|
# recompiled whenever anything else does
|
|
date_obj = env.Object('base/date.cc')
|
|
env.Depends(date_obj, objs)
|
|
objs.append(date_obj)
|
|
return objs
|
|
|
|
###################################################
|
|
#
|
|
# Define binaries. Each different build type (debug, opt, etc.) gets
|
|
# a slightly different build environment.
|
|
#
|
|
###################################################
|
|
|
|
# Include file paths are rooted in this directory. SCons will
|
|
# automatically expand '.' to refer to both the source directory and
|
|
# the corresponding build directory to pick up generated include
|
|
# files.
|
|
env.Append(CPPPATH='.')
|
|
|
|
# List of constructed environments to pass back to SConstruct
|
|
envList = []
|
|
|
|
# Function to create a new build environment as clone of current
|
|
# environment 'env' with modified object suffix and optional stripped
|
|
# binary. Additional keyword arguments are appended to corresponding
|
|
# build environment vars.
|
|
def makeEnv(label, objsfx, strip = False, **kwargs):
|
|
newEnv = env.Copy(OBJSUFFIX=objsfx)
|
|
newEnv.Label = label
|
|
newEnv.Append(**kwargs)
|
|
exe = 'm5.' + label # final executable
|
|
bin = exe + '.bin' # executable w/o appended Python zip archive
|
|
newEnv.Program(bin, make_objs(sources, newEnv))
|
|
if strip:
|
|
stripped_bin = bin + '.stripped'
|
|
newEnv.Command(stripped_bin, bin, 'strip $SOURCE -o $TARGET')
|
|
bin = stripped_bin
|
|
targets = newEnv.Concat(exe, [bin, 'python/m5py.zip'])
|
|
newEnv.M5Binary = targets[0]
|
|
envList.append(newEnv)
|
|
|
|
# Debug binary
|
|
makeEnv('debug', '.do',
|
|
CCFLAGS = Split('-g3 -gdwarf-2 -O0'),
|
|
CPPDEFINES = 'DEBUG')
|
|
|
|
# Optimized binary
|
|
makeEnv('opt', '.o',
|
|
CCFLAGS = Split('-g -O3'))
|
|
|
|
# "Fast" binary
|
|
makeEnv('fast', '.fo', strip = True,
|
|
CCFLAGS = Split('-O3'),
|
|
CPPDEFINES = 'NDEBUG')
|
|
|
|
# Profiled binary
|
|
makeEnv('prof', '.po',
|
|
CCFLAGS = Split('-O3 -g -pg'),
|
|
LINKFLAGS = '-pg')
|
|
|
|
Return('envList')
|