Gabe Black has submitted this change and it was merged. (
https://gem5-review.googlesource.com/c/public/gem5/+/12082 )
Change subject: systemc: Implement sc_event_finder.
......................................................................
systemc: Implement sc_event_finder.
Change-Id: I22aa0a34eabf13593986a92289155257fa26c7de
Reviewed-on: https://gem5-review.googlesource.com/12082
Reviewed-by: Gabe Black <gabebl...@google.com>
Maintainer: Gabe Black <gabebl...@google.com>
---
M src/systemc/ext/core/sc_event.hh
1 file changed, 17 insertions(+), 5 deletions(-)
Approvals:
Gabe Black: Looks good to me, approved; Looks good to me, approved
diff --git a/src/systemc/ext/core/sc_event.hh
b/src/systemc/ext/core/sc_event.hh
index c215496..f8a32f3 100644
--- a/src/systemc/ext/core/sc_event.hh
+++ b/src/systemc/ext/core/sc_event.hh
@@ -30,9 +30,11 @@
#ifndef __SYSTEMC_EXT_CORE_SC_EVENT_HH__
#define __SYSTEMC_EXT_CORE_SC_EVENT_HH__
+#include <cassert>
#include <set>
#include <vector>
+#include "sc_port.hh"
#include "sc_time.hh"
namespace sc_gem5
@@ -58,6 +60,7 @@
{
protected:
void warn_unimpl(const char *func) const;
+ virtual ~sc_event_finder() {}
public:
// Should be "implementation defined" but used in the tests.
@@ -68,18 +71,27 @@
class sc_event_finder_t : public sc_event_finder
{
public:
- sc_event_finder_t(const sc_port_base &,
- const sc_event & (IF::*event_method)() const)
+ sc_event_finder_t(const sc_port_base &p,
+ const sc_event & (IF::*_method)() const) :
+ _method(_method)
{
- warn_unimpl(__PRETTY_FUNCTION__);
+ _port = dynamic_cast<const sc_port_b<IF> *>(&p);
+ assert(_port);
}
+ virtual ~sc_event_finder_t() {}
+
const sc_event &
find_event(sc_interface *if_p=NULL) const override
{
- warn_unimpl(__PRETTY_FUNCTION__);
- return *(const sc_event *)nullptr;
+ const IF *iface = if_p ? dynamic_cast<const IF *>(if_p) :
+ dynamic_cast<const IF *>(_port->get_interface());
+ return (const_cast<IF *>(iface)->*_method)();
}
+
+ private:
+ const sc_port_b<IF> *_port;
+ const sc_event &(IF::*_method)() const;
};
class sc_event_and_list
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/12082
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: master
Gerrit-Change-Id: I22aa0a34eabf13593986a92289155257fa26c7de
Gerrit-Change-Number: 12082
Gerrit-PatchSet: 9
Gerrit-Owner: Gabe Black <gabebl...@google.com>
Gerrit-Reviewer: Andreas Sandberg <andreas.sandb...@arm.com>
Gerrit-Reviewer: Gabe Black <gabebl...@google.com>
Gerrit-Reviewer: Jason Lowe-Power <ja...@lowepower.com>
Gerrit-Reviewer: Matthias Jung <jun...@eit.uni-kl.de>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list
gem5-dev@gem5.org
http://m5sim.org/mailman/listinfo/gem5-dev
