diff options
author | Gabe Black <gabeblack@google.com> | 2018-05-22 02:21:17 -0700 |
---|---|---|
committer | Gabe Black <gabeblack@google.com> | 2018-08-08 10:08:12 +0000 |
commit | 5ee040a534d422ee08918ef49d55620184df7120 (patch) | |
tree | 1688e050dec6abf1a36fc92070b151e6b0682fdd /src/systemc/ext/channel | |
parent | 7adb1b250b712920ea5d685f146ad6df55346393 (diff) | |
download | gem5-5ee040a534d422ee08918ef49d55620184df7120.tar.xz |
Systemc: Port over all of the systemc "datatype" headers.
These are the headers originally written by Accellera with a few
modifications. Most significantly, I went through and mostly (but not
entirely) manually editted them to conform to gem5 style and to be
more self consistent. Second, I resolved some macros which optionally
select features. I removed support for deprecated functions, and
otherwise enabled everything.
The actual implementation behind these headers will also be ported
over, but in a subsequent change.
Change-Id: I203d3f6c8a3af9120b946001d01defbb0643a6b6
Reviewed-on: https://gem5-review.googlesource.com/10843
Reviewed-by: Gabe Black <gabeblack@google.com>
Maintainer: Gabe Black <gabeblack@google.com>
Diffstat (limited to 'src/systemc/ext/channel')
-rw-r--r-- | src/systemc/ext/channel/sc_fifo.hh | 2 | ||||
-rw-r--r-- | src/systemc/ext/channel/sc_fifo_in_if.hh | 4 | ||||
-rw-r--r-- | src/systemc/ext/channel/sc_fifo_out_if.hh | 2 | ||||
-rw-r--r-- | src/systemc/ext/channel/sc_in_resolved.hh | 4 | ||||
-rw-r--r-- | src/systemc/ext/channel/sc_inout_resolved.hh | 4 | ||||
-rw-r--r-- | src/systemc/ext/channel/sc_out_resolved.hh | 4 |
6 files changed, 10 insertions, 10 deletions
diff --git a/src/systemc/ext/channel/sc_fifo.hh b/src/systemc/ext/channel/sc_fifo.hh index 668c6b8bd..8cf2124b7 100644 --- a/src/systemc/ext/channel/sc_fifo.hh +++ b/src/systemc/ext/channel/sc_fifo.hh @@ -106,7 +106,7 @@ class sc_fifo : public sc_fifo_in_if<T>, } virtual const sc_event & - data_Written_event() const + data_written_event() const { sc_channel_warn_unimpl(__PRETTY_FUNCTION__); return *(const sc_event *)nullptr; diff --git a/src/systemc/ext/channel/sc_fifo_in_if.hh b/src/systemc/ext/channel/sc_fifo_in_if.hh index a6ac4f544..bee7b60fa 100644 --- a/src/systemc/ext/channel/sc_fifo_in_if.hh +++ b/src/systemc/ext/channel/sc_fifo_in_if.hh @@ -41,7 +41,7 @@ template <class T> class sc_fifo_nonblocking_in_if : virtual public sc_interface { public: - virtual bool ab_read(T &) = 0; + virtual bool nb_read(T &) = 0; virtual const sc_event &data_written_event() const = 0; }; @@ -58,7 +58,7 @@ class sc_fifo_in_if : public sc_fifo_nonblocking_in_if<T>, public sc_fifo_blocking_in_if<T> { public: - virtual int num_avaialble() const = 0; + virtual int num_available() const = 0; protected: sc_fifo_in_if() : sc_interface() {} diff --git a/src/systemc/ext/channel/sc_fifo_out_if.hh b/src/systemc/ext/channel/sc_fifo_out_if.hh index ebc5d5cfd..749aa58b5 100644 --- a/src/systemc/ext/channel/sc_fifo_out_if.hh +++ b/src/systemc/ext/channel/sc_fifo_out_if.hh @@ -41,7 +41,7 @@ template <class T> class sc_fifo_nonblocking_out_if : virtual public sc_interface { public: - virtual bool ab_write(const T &) = 0; + virtual bool nb_write(const T &) = 0; virtual const sc_event &data_read_event() const = 0; }; diff --git a/src/systemc/ext/channel/sc_in_resolved.hh b/src/systemc/ext/channel/sc_in_resolved.hh index cfc8f4763..1c49b8caa 100644 --- a/src/systemc/ext/channel/sc_in_resolved.hh +++ b/src/systemc/ext/channel/sc_in_resolved.hh @@ -32,12 +32,12 @@ #include "sc_in.hh" -namespace +namespace sc_dt { class sc_logic; -} +} // namespace sc_dt namespace sc_core { diff --git a/src/systemc/ext/channel/sc_inout_resolved.hh b/src/systemc/ext/channel/sc_inout_resolved.hh index 3fea32f75..32348dba1 100644 --- a/src/systemc/ext/channel/sc_inout_resolved.hh +++ b/src/systemc/ext/channel/sc_inout_resolved.hh @@ -35,12 +35,12 @@ #include "sc_signal_inout_if.hh" #include "warn_unimpl.hh" -namespace +namespace sc_dt { class sc_logic; -} +} // namespace sc_dt namespace sc_core { diff --git a/src/systemc/ext/channel/sc_out_resolved.hh b/src/systemc/ext/channel/sc_out_resolved.hh index 8f4aa52e4..0a8f2986a 100644 --- a/src/systemc/ext/channel/sc_out_resolved.hh +++ b/src/systemc/ext/channel/sc_out_resolved.hh @@ -35,12 +35,12 @@ #include "sc_signal_inout_if.hh" #include "warn_unimpl.hh" -namespace +namespace sc_dt { class sc_logic; -} +} // namespace sc_dt namespace sc_core { |