derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

systemc: Fix the default width values for the various sc_trace-s.

Browse Source 
These were all set to 8 * sizeof(char) instead of using the size of the
actual data type being traced.

Also add a very simple implementation to the generic sc_signal_in_if<T>
sc_trace which just delegates to the sc_trace of the underlying type T.

Change-Id: I129df46ef9d49705dc3dac76e30c0a3652c981eb
Reviewed-on: https://gem5-review.googlesource.com/c/12818
Reviewed-by: Gabe Black <gabeblack@google.com>
Maintainer: Gabe Black <gabeblack@google.com>
This commit is contained in:
Gabe Black
2018-09-19 16:18:16 -07:00
parent c288af7a26
commit dfd2e7681e
1 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/systemc/ext/utils/sc_trace_file.hh
View File

@@ -122,46 +122,46 @@ void sc_trace(sc_trace_file *, const sc_time *, const std::string &);
// Nonstandard - unsigned versions necessary to avoid ambiguous overload
// resolution.
void sc_trace(sc_trace_file *, const unsigned char &,
const std::string &, int width=(8 * sizeof(char)));
const std::string &, int width=(8 * sizeof(unsigned char)));
void sc_trace(sc_trace_file *, const unsigned char *,
const std::string &, int width=(8 * sizeof(char)));
const std::string &, int width=(8 * sizeof(unsigned char)));
void sc_trace(sc_trace_file *, const unsigned short &,
const std::string &, int width=(8 * sizeof(char)));
const std::string &, int width=(8 * sizeof(unsigned short)));
void sc_trace(sc_trace_file *, const unsigned short *,
const std::string &, int width=(8 * sizeof(char)));
const std::string &, int width=(8 * sizeof(unsigned short)));
void sc_trace(sc_trace_file *, const unsigned int &,
const std::string &, int width=(8 * sizeof(char)));
const std::string &, int width=(8 * sizeof(unsigned int)));
void sc_trace(sc_trace_file *, const unsigned int *,
const std::string &, int width=(8 * sizeof(char)));
const std::string &, int width=(8 * sizeof(unsigned int)));
void sc_trace(sc_trace_file *, const unsigned long &,
const std::string &, int width=(8 * sizeof(char)));
const std::string &, int width=(8 * sizeof(unsigned long)));
void sc_trace(sc_trace_file *, const unsigned long *,
const std::string &, int width=(8 * sizeof(char)));
const std::string &, int width=(8 * sizeof(unsigned long)));
void sc_trace(sc_trace_file *, const char &,
const std::string &, int width=(8 * sizeof(char)));
void sc_trace(sc_trace_file *, const char *,
const std::string &, int width=(8 * sizeof(char)));
void sc_trace(sc_trace_file *, const short &,
const std::string &, int width=(8 * sizeof(char)));
const std::string &, int width=(8 * sizeof(short)));
void sc_trace(sc_trace_file *, const short *,
const std::string &, int width=(8 * sizeof(char)));
const std::string &, int width=(8 * sizeof(short)));
void sc_trace(sc_trace_file *, const int &,
const std::string &, int width=(8 * sizeof(char)));
const std::string &, int width=(8 * sizeof(int)));
void sc_trace(sc_trace_file *, const int *,
const std::string &, int width=(8 * sizeof(char)));
const std::string &, int width=(8 * sizeof(int)));
void sc_trace(sc_trace_file *, const long &,
const std::string &, int width=(8 * sizeof(char)));
const std::string &, int width=(8 * sizeof(long)));
void sc_trace(sc_trace_file *, const long *,
const std::string &, int width=(8 * sizeof(char)));
const std::string &, int width=(8 * sizeof(long)));
void sc_trace(sc_trace_file *, const sc_dt::int64 &,
const std::string &, int width=(8 * sizeof(char)));
const std::string &, int width=(8 * sizeof(sc_dt::int64)));
void sc_trace(sc_trace_file *, const sc_dt::int64 *,
const std::string &, int width=(8 * sizeof(char)));
const std::string &, int width=(8 * sizeof(sc_dt::int64)));
void sc_trace(sc_trace_file *, const sc_dt::uint64 &,
const std::string &, int width=(8 * sizeof(char)));
const std::string &, int width=(8 * sizeof(sc_dt::uint64)));
void sc_trace(sc_trace_file *, const sc_dt::uint64 *,
const std::string &, int width=(8 * sizeof(char)));
const std::string &, int width=(8 * sizeof(sc_dt::uint64)));
// Nonstandard function for enums
void sc_trace(sc_trace_file *, const unsigned int &,
@@ -172,9 +172,10 @@ void sc_trace_delta_cycles(sc_trace_file *, bool on=true);
template <class T>
void
sc_trace(sc_trace_file *, const sc_signal_in_if<T> &, const std::string &)
sc_trace(sc_trace_file *tf, const sc_signal_in_if<T> &iface,
const std::string &name)
{
sc_utils_warn_unimpl(__PRETTY_FUNCTION__);
sc_trace(tf, iface.read(), name);
}
void sc_trace(sc_trace_file *, const sc_signal_in_if<char> &,