e5e5b80690
This patch fixes checkpoint restore in the SystemC hosting example by handling early PollEvent events correctly before any EventQueue events are posted. The SystemC event queue handler (SCEventQueue) reports an error if the event loop is entered with no Events posted. It is possible for this to happen after instantiate due to PollEvent events. This patch separates out `external' events into a different handler in sc_module.cc to prevent the error from occurring. This fix also improves the event handling of asynchronous events by: 1) Making asynchronous events 'catch up' gem5 time to SystemC time to avoid the appearance that events have been lost while servicing an asynchronous event that schedules an event loop exit event 2) Add an in_simulate data member to Module to allow the event loop to check whether events should be processed or deferred until the next time Module::simulate is entered 3) Cancel pending events around the entry/exit of the event loop in Module::simulate 4) Moving the state initialisation of the example entirely into run to correct a problem with early events in checkpoint restore. It is still possible to schedule asynchronous events (and talk PollQueue actions) while simulate is not running. This behaviour may stil cause some problems.
70 lines
2.8 KiB
Makefile
70 lines
2.8 KiB
Makefile
# Copyright (c) 2012-2014 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.
|
|
#
|
|
# 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: Andrew Bardsley
|
|
|
|
ARCH = ARM
|
|
VARIANT = opt
|
|
|
|
SYSTEMC_INC = ./systemc/include
|
|
SYSTEMC_LIB = ./systemc/lib-linux64
|
|
|
|
CXXFLAGS = -I../../build/$(ARCH) -L../../build/$(ARCH)
|
|
CXXFLAGS += -I$(SYSTEMC_INC) -L$(SYSTEMC_LIB)
|
|
CXXFLAGS += -std=c++0x
|
|
CXXFLAGS += -g
|
|
LIBS = -lgem5_$(VARIANT) -lsystemc
|
|
|
|
ALL = gem5.$(VARIANT).sc
|
|
|
|
all: $(ALL)
|
|
|
|
.cc.o:
|
|
$(CXX) $(CXXFLAGS) -c -o $@ $<
|
|
|
|
sc_gem5_control.o: sc_gem5_control.cc sc_gem5_control.hh
|
|
sc_logger.o: sc_logger.cc sc_logger.hh
|
|
sc_module.o: sc_module.cc sc_module.hh
|
|
stats.o: stats.cc stats.hh
|
|
main.o: main.cc sc_logger.hh sc_module.hh stats.hh
|
|
|
|
gem5.$(VARIANT).sc: main.o stats.o \
|
|
sc_gem5_control.o sc_logger.o sc_module.o
|
|
$(CXX) $(CXXFLAGS) -o $@ $^ $(LIBS)
|
|
|
|
clean:
|
|
$(RM) $(ALL)
|
|
$(RM) *.o
|
|
$(RM) -r m5out
|