[gem5-dev] Change in gem5/gem5[master]: systemc: Add the nonstandard triggered function sc_event.

2018-08-21 Thread Gabe Black (Gerrit)
Gabe Black has submitted this change and it was merged. (  
https://gem5-review.googlesource.com/c/public/gem5/+/11187 )


Change subject: systemc: Add the nonstandard triggered function sc_event.
..

systemc: Add the nonstandard triggered function sc_event.

The Accellera implementation of sc_event has a non-standard triggered
function which returns whether or not that particular event has been
triggered in the current delta cycle. The tests call it, so we probably
need to have it.

Change-Id: I675099b65d00e09536618d4d2d707bf3c25e3bde
Reviewed-on: https://gem5-review.googlesource.com/11187
Reviewed-by: Gabe Black 
Maintainer: Gabe Black 
---
M src/systemc/core/sc_event.cc
M src/systemc/ext/core/sc_event.hh
2 files changed, 11 insertions(+), 0 deletions(-)

Approvals:
  Gabe Black: Looks good to me, approved; Looks good to me, approved



diff --git a/src/systemc/core/sc_event.cc b/src/systemc/core/sc_event.cc
index 0cdab2a..32fdd0a 100644
--- a/src/systemc/core/sc_event.cc
+++ b/src/systemc/core/sc_event.cc
@@ -277,6 +277,13 @@
 warn("%s not implemented.\n", __PRETTY_FUNCTION__);
 }

+bool
+sc_event::triggered() const
+{
+warn("%s not implemented.\n", __PRETTY_FUNCTION__);
+return false;
+}
+
 sc_event_and_expr
 sc_event::operator & (const sc_event &) const
 {
diff --git a/src/systemc/ext/core/sc_event.hh  
b/src/systemc/ext/core/sc_event.hh

index d4d719b..d110b91 100644
--- a/src/systemc/ext/core/sc_event.hh
+++ b/src/systemc/ext/core/sc_event.hh
@@ -132,6 +132,10 @@
 void notify(double, sc_time_unit);
 void cancel();

+// Nonstandard
+// Returns whether this event is currently triggered.
+bool triggered() const;
+
 sc_event_and_expr operator & (const sc_event &) const;
 sc_event_and_expr operator & (const sc_event_and_list &) const;
 sc_event_or_expr operator | (const sc_event &) const;

--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/11187
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: I675099b65d00e09536618d4d2d707bf3c25e3bde
Gerrit-Change-Number: 11187
Gerrit-PatchSet: 6
Gerrit-Owner: Gabe Black 
Gerrit-Reviewer: Andreas Sandberg 
Gerrit-Reviewer: Gabe Black 
Gerrit-Reviewer: Jason Lowe-Power 
Gerrit-Reviewer: Matthias Jung 
Gerrit-MessageType: merged
___
gem5-dev mailing list
gem5-dev@gem5.org
http://m5sim.org/mailman/listinfo/gem5-dev

[gem5-dev] Change in gem5/gem5[master]: systemc: Add the nonstandard triggered function sc_event.

2018-06-15 Thread Gabe Black (Gerrit)
Gabe Black has uploaded this change for review. (  
https://gem5-review.googlesource.com/11187



Change subject: systemc: Add the nonstandard triggered function sc_event.
..

systemc: Add the nonstandard triggered function sc_event.

The Accellera implementation of sc_event has a non-standard triggered
function which returns whether or not that particular event has been
triggered in the current delta cycle. The tests call it, so we probably
need to have it.

Change-Id: I675099b65d00e09536618d4d2d707bf3c25e3bde
---
M src/systemc/core/sc_event.cc
M src/systemc/ext/core/sc_event.hh
2 files changed, 11 insertions(+), 0 deletions(-)



diff --git a/src/systemc/core/sc_event.cc b/src/systemc/core/sc_event.cc
index f3b27be..2a43779 100644
--- a/src/systemc/core/sc_event.cc
+++ b/src/systemc/core/sc_event.cc
@@ -271,6 +271,13 @@
 warn("%s not implemented.\n", __PRETTY_FUNCTION__);
 }

+bool
+sc_event::triggered() const
+{
+warn("%s not implemented.\n", __PRETTY_FUNCTION__);
+return false;
+}
+
 sc_event_and_expr
 sc_event::operator & (const sc_event &) const
 {
diff --git a/src/systemc/ext/core/sc_event.hh  
b/src/systemc/ext/core/sc_event.hh

index 99acd3e..28e1f9e 100644
--- a/src/systemc/ext/core/sc_event.hh
+++ b/src/systemc/ext/core/sc_event.hh
@@ -127,6 +127,10 @@
 void notify(double, sc_time_unit);
 void cancel();

+// Nonstandard
+// Returns whether this event is currently triggered.
+bool triggered() const;
+
 sc_event_and_expr operator & (const sc_event &) const;
 sc_event_and_expr operator & (const sc_event_and_list &) const;
 sc_event_or_expr operator | (const sc_event &) const;

--
To view, visit https://gem5-review.googlesource.com/11187
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: I675099b65d00e09536618d4d2d707bf3c25e3bde
Gerrit-Change-Number: 11187
Gerrit-PatchSet: 1
Gerrit-Owner: Gabe Black 
Gerrit-MessageType: newchange
___
gem5-dev mailing list
gem5-dev@gem5.org
http://m5sim.org/mailman/listinfo/gem5-dev