Gabe Black has submitted this change and it was merged. (
https://gem5-review.googlesource.com/c/public/gem5/+/12966 )
Change subject: systemc: Add an error check to sc_time.
......................................................................
systemc: Add an error check to sc_time.
Change-Id: Ie525a1624a6496a51277fb984cbfeec21eb79749
Reviewed-on: https://gem5-review.googlesource.com/c/12966
Reviewed-by: Gabe Black <[email protected]>
Maintainer: Gabe Black <[email protected]>
---
M src/systemc/core/sc_time.cc
A src/systemc/tests/systemc/kernel/sc_time/test16/expected_returncode
2 files changed, 9 insertions(+), 0 deletions(-)
Approvals:
Gabe Black: Looks good to me, approved; Looks good to me, approved
diff --git a/src/systemc/core/sc_time.cc b/src/systemc/core/sc_time.cc
index 999fba2..0b8ad62 100644
--- a/src/systemc/core/sc_time.cc
+++ b/src/systemc/core/sc_time.cc
@@ -494,6 +494,14 @@
// Normalize d to seconds.
defaultUnit = d * TimeUnitScale[tu];
specified = true;
+
+ double resolution = SimClock::Float::Hz;
+ if (resolution == 0.0)
+ resolution = TimeUnitScale[SC_PS];
+ if (defaultUnit < resolution) {
+ SC_REPORT_ERROR("(E515) set default time unit failed",
+ "value smaller than time resolution");
+ }
}
sc_time
diff --git
a/src/systemc/tests/systemc/kernel/sc_time/test16/expected_returncode
b/src/systemc/tests/systemc/kernel/sc_time/test16/expected_returncode
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/src/systemc/tests/systemc/kernel/sc_time/test16/expected_returncode
@@ -0,0 +1 @@
+1
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/12966
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: Ie525a1624a6496a51277fb984cbfeec21eb79749
Gerrit-Change-Number: 12966
Gerrit-PatchSet: 5
Gerrit-Owner: Gabe Black <[email protected]>
Gerrit-Reviewer: Andreas Sandberg <[email protected]>
Gerrit-Reviewer: Gabe Black <[email protected]>
Gerrit-Reviewer: Giacomo Travaglini <[email protected]>
Gerrit-Reviewer: Jason Lowe-Power <[email protected]>
Gerrit-Reviewer: Matthias Jung <[email protected]>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
