From ccd9210e1a1bdce828a13a4ffdf84548ffe61592 Mon Sep 17 00:00:00 2001 From: Christian Menard Date: Thu, 9 Feb 2017 19:15:38 -0500 Subject: [PATCH] misc: Clean up and complete the gem5<->SystemC-TLM bridge [4/10] The current TLM bridge only provides a Slave Port that allows the gem5 world to send request to the SystemC world. This patch series refractors and cleans up the existing code, and adds a Master Port that allows the SystemC world to send requests to the gem5 world. This patch: * Move common code of the example to a common directory. Move the cli * parsing from the SimControl module to a separate example object. Add * comments describing the Gem5SimControl module. Testing Done: Examples compile and run. Reviewed at http://reviews.gem5.org/r/3695/ Signed-off-by: Jason Lowe-Power --- util/tlm/examples/common/cli_parser.cc | 126 +++++++++++++++++++ util/tlm/examples/common/cli_parser.hh | 70 +++++++++++ util/tlm/examples/common/report_handler.cc | 87 +++++++++++++ util/tlm/examples/common/report_handler.hh | 42 +++++++ util/tlm/examples/master_port/SConstruct | 5 +- util/tlm/examples/master_port/main.cc | 39 ++---- util/tlm/examples/slave_port/SConstruct | 5 +- util/tlm/examples/slave_port/main.cc | 47 +++----- util/tlm/sim_control.cc | 134 ++++++--------------- util/tlm/sim_control.hh | 48 ++++++-- 10 files changed, 431 insertions(+), 172 deletions(-) create mode 100644 util/tlm/examples/common/cli_parser.cc create mode 100644 util/tlm/examples/common/cli_parser.hh create mode 100644 util/tlm/examples/common/report_handler.cc create mode 100644 util/tlm/examples/common/report_handler.hh diff --git a/util/tlm/examples/common/cli_parser.cc b/util/tlm/examples/common/cli_parser.cc new file mode 100644 index 000000000..b86e99fb8 --- /dev/null +++ b/util/tlm/examples/common/cli_parser.cc @@ -0,0 +1,126 @@ +/* + * Copyright (c) 2016, Dresden University of Technology (TU Dresden) + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * + * 2. 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. + * + * 3. Neither the name of the copyright holder 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 HOLDER + * 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: Christian Menard + */ + +#include +#include + +#include "cli_parser.hh" +#include "sim/cxx_manager.hh" + +void +CliParser::usage(const std::string& prog_name) +{ + std::cerr + << "Usage: " << prog_name + << (" [