[gem5-dev] Change in gem5/gem5[master]: systemc: Seperate the "external" header interface.
Gabe Black has submitted this change and it was merged. (
https://gem5-review.googlesource.com/10835 )
Change subject: systemc: Seperate the "external" header interface.
..
systemc: Seperate the "external" header interface.
Most (but not all) of the SystemC headers are part of the "external"
interface that an existing, standard compliant module would include
through or . Since those follow slightly different
rules (relative includes, no gem5 includes), this change separates them
out so that they're easier to identify.
Also, this change moves the other files into a "core" subdirectory,
with the intention to add a "dt", aka data type, directory some time in
the future when those standard defined types are implemented.
Change-Id: Ida63f9cc0bc0431024d4dd691cc5b22b944a99a8
Reviewed-on: https://gem5-review.googlesource.com/10835
Reviewed-by: Jason Lowe-Power
Maintainer: Gabe Black
---
R src/systemc/core/SConscript
R src/systemc/core/SystemC.py
R src/systemc/core/kernel.cc
R src/systemc/core/kernel.hh
R src/systemc/core/sc_attr.cc
R src/systemc/core/sc_event.cc
R src/systemc/core/sc_export.cc
R src/systemc/core/sc_interface.cc
R src/systemc/core/sc_main.cc
R src/systemc/core/sc_module.cc
R src/systemc/core/sc_module_name.cc
R src/systemc/core/sc_object.cc
R src/systemc/core/sc_port.cc
R src/systemc/core/sc_prim.cc
R src/systemc/core/sc_sensitive.cc
R src/systemc/core/sc_time.cc
R src/systemc/ext/core/sc_attr.hh
R src/systemc/ext/core/sc_event.hh
R src/systemc/ext/core/sc_export.hh
R src/systemc/ext/core/sc_interface.hh
R src/systemc/ext/core/sc_main.hh
R src/systemc/ext/core/sc_module.hh
R src/systemc/ext/core/sc_module_name.hh
R src/systemc/ext/core/sc_object.hh
R src/systemc/ext/core/sc_port.hh
R src/systemc/ext/core/sc_prim.hh
R src/systemc/ext/core/sc_sensitive.hh
R src/systemc/ext/core/sc_time.hh
R src/systemc/ext/dt/int/sc_nbdefs.hh
29 files changed, 52 insertions(+), 64 deletions(-)
Approvals:
Jason Lowe-Power: Looks good to me, approved
Gabe Black: Looks good to me, approved
diff --git a/src/systemc/SConscript b/src/systemc/core/SConscript
similarity index 100%
rename from src/systemc/SConscript
rename to src/systemc/core/SConscript
diff --git a/src/systemc/SystemC.py b/src/systemc/core/SystemC.py
similarity index 96%
rename from src/systemc/SystemC.py
rename to src/systemc/core/SystemC.py
index bc04ed6..41fecb2 100644
--- a/src/systemc/SystemC.py
+++ b/src/systemc/core/SystemC.py
@@ -34,7 +34,7 @@
class SystemC_Kernel(SimObject):
type = 'SystemC_Kernel'
cxx_class = 'SystemC::Kernel'
-cxx_header = 'systemc/kernel.hh'
+cxx_header = 'systemc/core/kernel.hh'
def sc_main(self, *args):
'''Call the systemc sc_main function with the given string args'''
@@ -48,7 +48,7 @@
type = 'SystemC_ScObject'
abstract = True
cxx_class = 'sc_core::sc_object'
-cxx_header = 'systemc/sc_object.hh'
+cxx_header = 'systemc/ext/core/sc_object.hh'
# Clear cxx_base to stop the c++ binding code from assuming
# sc_core::sc_object inherits from SimObject, even though
SystemC_ScObject
diff --git a/src/systemc/kernel.cc b/src/systemc/core/kernel.cc
similarity index 97%
rename from src/systemc/kernel.cc
rename to src/systemc/core/kernel.cc
index e52d04e..288a037 100644
--- a/src/systemc/kernel.cc
+++ b/src/systemc/core/kernel.cc
@@ -27,7 +27,7 @@
* Authors: Gabe Black
*/
-#include "systemc/kernel.hh"
+#include "systemc/core/kernel.hh"
namespace SystemC
{
diff --git a/src/systemc/kernel.hh b/src/systemc/core/kernel.hh
similarity index 100%
rename from src/systemc/kernel.hh
rename to src/systemc/core/kernel.hh
diff --git a/src/systemc/sc_attr.cc b/src/systemc/core/sc_attr.cc
similarity index 98%
rename from src/systemc/sc_attr.cc
rename to src/systemc/core/sc_attr.cc
index 6128f93..28e0b60 100644
--- a/src/systemc/sc_attr.cc
+++ b/src/systemc/core/sc_attr.cc
@@ -27,9 +27,8 @@
* Authors: Gabe Black
*/
-#include "systemc/sc_attr.hh"
-
#include "base/logging.hh"
+#include "systemc/ext/core/sc_attr.hh"
namespace sc_core
{
diff --git a/src/systemc/sc_event.cc b/src/systemc/core/sc_event.cc
similarity index 99%
rename from src/systemc/sc_event.cc
rename to src/systemc/core/sc_event.cc
index e641af6..0cdab2a 100644
--- a/src/systemc/sc_event.cc
+++ b/src/systemc/core/sc_event.cc
@@ -27,9 +27,8 @@
* Authors: Gabe Black
*/
-#include "systemc/sc_event.hh"
-
#include "base/logging.hh"
+#include "systemc/ext/core/sc_event.hh"
namespace sc_core
{
diff --git a/src/systemc/sc_export.cc b/src/systemc/core/sc_export.cc
similarity index 97%
rename from src/systemc/sc_export.cc
rename to src/systemc/core/sc_export.cc
index ab1252a..387b8a7 100644
--- a/src/systemc/sc_export.cc
+++ b/src/systemc/core/sc_export.cc
@@ -27,9 +27,8 @@
* Authors: Gabe Black
*/
-#include "systemc/sc_export.hh"
-
#include "base/logging.hh"
+#include "systemc/ext/core/sc_export.hh"
namespace
[gem5-dev] Change in gem5/gem5[master]: systemc: Seperate the "external" header interface.
Hello Jason Lowe-Power, Matthias Jung, Andreas Sandberg, I'd like you to reexamine a change. Please visit https://gem5-review.googlesource.com/10835 to look at the new patch set (#5). Change subject: systemc: Seperate the "external" header interface. .. systemc: Seperate the "external" header interface. Most (but not all) of the SystemC headers are part of the "external" interface that an existing, standard compliant module would include through or . Since those follow slightly different rules (relative includes, no gem5 includes), this change separates them out so that they're easier to identify. Also, this change moves the other files into a "core" subdirectory, with the intention to add a "dt", aka data type, directory some time in the future when those standard defined types are implemented. Change-Id: Ida63f9cc0bc0431024d4dd691cc5b22b944a99a8 --- R src/systemc/core/SConscript R src/systemc/core/SystemC.py R src/systemc/core/kernel.cc R src/systemc/core/kernel.hh R src/systemc/core/sc_attr.cc R src/systemc/core/sc_event.cc R src/systemc/core/sc_export.cc R src/systemc/core/sc_interface.cc R src/systemc/core/sc_main.cc R src/systemc/core/sc_module.cc R src/systemc/core/sc_module_name.cc R src/systemc/core/sc_object.cc R src/systemc/core/sc_port.cc R src/systemc/core/sc_prim.cc R src/systemc/core/sc_sensitive.cc R src/systemc/core/sc_time.cc R src/systemc/ext/core/sc_attr.hh R src/systemc/ext/core/sc_event.hh R src/systemc/ext/core/sc_export.hh R src/systemc/ext/core/sc_interface.hh R src/systemc/ext/core/sc_main.hh R src/systemc/ext/core/sc_module.hh R src/systemc/ext/core/sc_module_name.hh R src/systemc/ext/core/sc_object.hh R src/systemc/ext/core/sc_port.hh R src/systemc/ext/core/sc_prim.hh R src/systemc/ext/core/sc_sensitive.hh R src/systemc/ext/core/sc_time.hh R src/systemc/ext/dt/int/sc_nbdefs.hh 29 files changed, 52 insertions(+), 64 deletions(-) -- To view, visit https://gem5-review.googlesource.com/10835 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: Ida63f9cc0bc0431024d4dd691cc5b22b944a99a8 Gerrit-Change-Number: 10835 Gerrit-PatchSet: 5 Gerrit-Owner: Gabe Black Gerrit-Reviewer: Andreas Sandberg Gerrit-Reviewer: Gabe Black Gerrit-Reviewer: Jason Lowe-Power Gerrit-Reviewer: Matthias Jung Gerrit-MessageType: newpatchset ___ gem5-dev mailing list gem5-dev@gem5.org http://m5sim.org/mailman/listinfo/gem5-dev
[gem5-dev] Change in gem5/gem5[master]: systemc: Seperate the "external" header interface.
Hello Jason Lowe-Power, Matthias Jung, Andreas Sandberg, I'd like you to reexamine a change. Please visit https://gem5-review.googlesource.com/10835 to look at the new patch set (#4). Change subject: systemc: Seperate the "external" header interface. .. systemc: Seperate the "external" header interface. Most (but not all) of the SystemC headers are part of the "external" interface that an existing, standard compliant module would include through or . Since those follow slightly different rules (relative includes, no gem5 includes), this change separates them out so that they're easier to identify. Also, this change moves the other files into a "core" subdirectory, with the intention to add a "dt", aka data type, directory some time in the future when those standard defined types are implemented. Change-Id: Ida63f9cc0bc0431024d4dd691cc5b22b944a99a8 --- R src/systemc/core/SConscript R src/systemc/core/SystemC.py R src/systemc/core/kernel.cc R src/systemc/core/kernel.hh R src/systemc/core/sc_attr.cc R src/systemc/core/sc_event.cc R src/systemc/core/sc_export.cc R src/systemc/core/sc_interface.cc R src/systemc/core/sc_main.cc R src/systemc/core/sc_module.cc R src/systemc/core/sc_module_name.cc R src/systemc/core/sc_object.cc R src/systemc/core/sc_port.cc R src/systemc/core/sc_prim.cc R src/systemc/core/sc_sensitive.cc R src/systemc/core/sc_time.cc R src/systemc/ext/core/sc_attr.hh R src/systemc/ext/core/sc_event.hh R src/systemc/ext/core/sc_export.hh R src/systemc/ext/core/sc_interface.hh R src/systemc/ext/core/sc_main.hh R src/systemc/ext/core/sc_module.hh R src/systemc/ext/core/sc_module_name.hh R src/systemc/ext/core/sc_object.hh R src/systemc/ext/core/sc_port.hh R src/systemc/ext/core/sc_prim.hh R src/systemc/ext/core/sc_sensitive.hh R src/systemc/ext/core/sc_time.hh R src/systemc/ext/dt/int/sc_nbdefs.hh 29 files changed, 52 insertions(+), 64 deletions(-) -- To view, visit https://gem5-review.googlesource.com/10835 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: Ida63f9cc0bc0431024d4dd691cc5b22b944a99a8 Gerrit-Change-Number: 10835 Gerrit-PatchSet: 4 Gerrit-Owner: Gabe Black Gerrit-Reviewer: Andreas Sandberg Gerrit-Reviewer: Gabe Black Gerrit-Reviewer: Jason Lowe-Power Gerrit-Reviewer: Matthias Jung Gerrit-MessageType: newpatchset ___ gem5-dev mailing list gem5-dev@gem5.org http://m5sim.org/mailman/listinfo/gem5-dev
[gem5-dev] Change in gem5/gem5[master]: systemc: Seperate the "external" header interface.
Hello Jason Lowe-Power, Matthias Jung, Andreas Sandberg, I'd like you to reexamine a change. Please visit https://gem5-review.googlesource.com/10835 to look at the new patch set (#3). Change subject: systemc: Seperate the "external" header interface. .. systemc: Seperate the "external" header interface. Most (but not all) of the SystemC headers are part of the "external" interface that an existing, standard compliant module would include through or . Since those follow slightly different rules (relative includes, no gem5 includes), this change separates them out so that they're easier to identify. Also, this change moves the other files into a "core" subdirectory, with the intention to add a "dt", aka data type, directory some time in the future when those standard defined types are implemented. Change-Id: Ida63f9cc0bc0431024d4dd691cc5b22b944a99a8 --- R src/systemc/core/SConscript R src/systemc/core/SystemC.py R src/systemc/core/kernel.cc R src/systemc/core/kernel.hh R src/systemc/core/sc_attr.cc R src/systemc/core/sc_event.cc R src/systemc/core/sc_export.cc R src/systemc/core/sc_interface.cc R src/systemc/core/sc_main.cc R src/systemc/core/sc_module.cc R src/systemc/core/sc_module_name.cc R src/systemc/core/sc_object.cc R src/systemc/core/sc_port.cc R src/systemc/core/sc_prim.cc R src/systemc/core/sc_sensitive.cc R src/systemc/core/sc_time.cc R src/systemc/ext/core/sc_attr.hh R src/systemc/ext/core/sc_event.hh R src/systemc/ext/core/sc_export.hh R src/systemc/ext/core/sc_interface.hh R src/systemc/ext/core/sc_main.hh R src/systemc/ext/core/sc_module.hh R src/systemc/ext/core/sc_module_name.hh R src/systemc/ext/core/sc_object.hh R src/systemc/ext/core/sc_port.hh R src/systemc/ext/core/sc_prim.hh R src/systemc/ext/core/sc_sensitive.hh R src/systemc/ext/core/sc_time.hh R src/systemc/ext/dt/int/sc_nbdefs.hh 29 files changed, 52 insertions(+), 64 deletions(-) -- To view, visit https://gem5-review.googlesource.com/10835 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: Ida63f9cc0bc0431024d4dd691cc5b22b944a99a8 Gerrit-Change-Number: 10835 Gerrit-PatchSet: 3 Gerrit-Owner: Gabe Black Gerrit-Reviewer: Andreas Sandberg Gerrit-Reviewer: Gabe Black Gerrit-Reviewer: Jason Lowe-Power Gerrit-Reviewer: Matthias Jung Gerrit-MessageType: newpatchset ___ gem5-dev mailing list gem5-dev@gem5.org http://m5sim.org/mailman/listinfo/gem5-dev
[gem5-dev] Change in gem5/gem5[master]: systemc: Seperate the "external" header interface.
Hello Jason Lowe-Power, Matthias Jung, Andreas Sandberg, I'd like you to reexamine a change. Please visit https://gem5-review.googlesource.com/10835 to look at the new patch set (#2). Change subject: systemc: Seperate the "external" header interface. .. systemc: Seperate the "external" header interface. Most (but not all) of the SystemC headers are part of the "external" interface that an existing, standard compliant module would include through or . Since those follow slightly different rules (relative includes, no gem5 includes), this change separates them out so that they're easier to identify. Also, this change moves the other files into a "core" subdirectory, with the intention to add a "dt", aka data type, directory some time in the future when those standard defined types are implemented. Change-Id: Ida63f9cc0bc0431024d4dd691cc5b22b944a99a8 --- R src/systemc/core/SConscript R src/systemc/core/SystemC.py R src/systemc/core/kernel.cc R src/systemc/core/kernel.hh R src/systemc/core/sc_attr.cc R src/systemc/core/sc_event.cc R src/systemc/core/sc_export.cc R src/systemc/core/sc_interface.cc R src/systemc/core/sc_main.cc R src/systemc/core/sc_module.cc R src/systemc/core/sc_module_name.cc R src/systemc/core/sc_object.cc R src/systemc/core/sc_port.cc R src/systemc/core/sc_prim.cc R src/systemc/core/sc_sensitive.cc R src/systemc/core/sc_time.cc R src/systemc/ext/core/sc_attr.hh R src/systemc/ext/core/sc_event.hh R src/systemc/ext/core/sc_export.hh R src/systemc/ext/core/sc_interface.hh R src/systemc/ext/core/sc_main.hh R src/systemc/ext/core/sc_module.hh R src/systemc/ext/core/sc_module_name.hh R src/systemc/ext/core/sc_object.hh R src/systemc/ext/core/sc_port.hh R src/systemc/ext/core/sc_prim.hh R src/systemc/ext/core/sc_sensitive.hh R src/systemc/ext/core/sc_time.hh R src/systemc/ext/dt/int/sc_nbdefs.hh 29 files changed, 52 insertions(+), 64 deletions(-) -- To view, visit https://gem5-review.googlesource.com/10835 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: Ida63f9cc0bc0431024d4dd691cc5b22b944a99a8 Gerrit-Change-Number: 10835 Gerrit-PatchSet: 2 Gerrit-Owner: Gabe Black Gerrit-Reviewer: Andreas Sandberg Gerrit-Reviewer: Gabe Black Gerrit-Reviewer: Jason Lowe-Power Gerrit-Reviewer: Matthias Jung Gerrit-MessageType: newpatchset ___ gem5-dev mailing list gem5-dev@gem5.org http://m5sim.org/mailman/listinfo/gem5-dev
[gem5-dev] Change in gem5/gem5[master]: systemc: Seperate the "external" header interface.
Gabe Black has uploaded this change for review. (
https://gem5-review.googlesource.com/10835
Change subject: systemc: Seperate the "external" header interface.
..
systemc: Seperate the "external" header interface.
Most (but not all) of the SystemC headers are part of the "external"
interface that an existing, standard compliant module would include
through or . Since those follow slightly different
rules (relative includes, no gem5 includes), this change separates them
out so that they're easier to identify.
Also, this change moves the other files into a "core" subdirectory,
with the intention to add a "dt", aka data type, directory some time in
the future when those standard defined types are implemented.
Change-Id: Ida63f9cc0bc0431024d4dd691cc5b22b944a99a8
---
R src/systemc/core/SConscript
R src/systemc/core/SystemC.py
R src/systemc/core/kernel.cc
R src/systemc/core/kernel.hh
R src/systemc/core/sc_attr.cc
R src/systemc/core/sc_event.cc
R src/systemc/core/sc_export.cc
R src/systemc/core/sc_interface.cc
R src/systemc/core/sc_main.cc
R src/systemc/core/sc_module.cc
R src/systemc/core/sc_module_name.cc
R src/systemc/core/sc_object.cc
R src/systemc/core/sc_port.cc
R src/systemc/core/sc_prim.cc
R src/systemc/core/sc_sensitive.cc
R src/systemc/core/sc_time.cc
R src/systemc/ext/core/sc_attr.hh
R src/systemc/ext/core/sc_event.hh
R src/systemc/ext/core/sc_export.hh
R src/systemc/ext/core/sc_interface.hh
R src/systemc/ext/core/sc_main.hh
R src/systemc/ext/core/sc_module.hh
R src/systemc/ext/core/sc_module_name.hh
R src/systemc/ext/core/sc_object.hh
R src/systemc/ext/core/sc_port.hh
R src/systemc/ext/core/sc_prim.hh
R src/systemc/ext/core/sc_sensitive.hh
R src/systemc/ext/core/sc_time.hh
R src/systemc/ext/dt/int/sc_nbdefs.hh
29 files changed, 52 insertions(+), 64 deletions(-)
diff --git a/src/systemc/SConscript b/src/systemc/core/SConscript
similarity index 100%
rename from src/systemc/SConscript
rename to src/systemc/core/SConscript
diff --git a/src/systemc/SystemC.py b/src/systemc/core/SystemC.py
similarity index 95%
rename from src/systemc/SystemC.py
rename to src/systemc/core/SystemC.py
index d63d4bb..833c9fc 100644
--- a/src/systemc/SystemC.py
+++ b/src/systemc/core/SystemC.py
@@ -30,7 +30,7 @@
class SystemC_Kernel(SimObject):
type = 'SystemC_Kernel'
cxx_class = 'SystemC::Kernel'
-cxx_header = 'systemc/kernel.hh'
+cxx_header = 'systemc/core/kernel.hh'
def sc_main(self, *args):
from _m5.systemc import sc_main
@@ -40,7 +40,7 @@
type = 'SystemC_ScObject'
abstract = True
cxx_class = 'sc_core::sc_object'
-cxx_header = 'systemc/sc_object.hh'
+cxx_header = 'systemc/ext/core/sc_object.hh'
cxx_base = None
# Hide the cxx_exports from SimObject since we don't inherit from
diff --git a/src/systemc/kernel.cc b/src/systemc/core/kernel.cc
similarity index 97%
rename from src/systemc/kernel.cc
rename to src/systemc/core/kernel.cc
index e52d04e..288a037 100644
--- a/src/systemc/kernel.cc
+++ b/src/systemc/core/kernel.cc
@@ -27,7 +27,7 @@
* Authors: Gabe Black
*/
-#include "systemc/kernel.hh"
+#include "systemc/core/kernel.hh"
namespace SystemC
{
diff --git a/src/systemc/kernel.hh b/src/systemc/core/kernel.hh
similarity index 100%
rename from src/systemc/kernel.hh
rename to src/systemc/core/kernel.hh
diff --git a/src/systemc/sc_attr.cc b/src/systemc/core/sc_attr.cc
similarity index 98%
rename from src/systemc/sc_attr.cc
rename to src/systemc/core/sc_attr.cc
index 6128f93..28e0b60 100644
--- a/src/systemc/sc_attr.cc
+++ b/src/systemc/core/sc_attr.cc
@@ -27,9 +27,8 @@
* Authors: Gabe Black
*/
-#include "systemc/sc_attr.hh"
-
#include "base/logging.hh"
+#include "systemc/ext/core/sc_attr.hh"
namespace sc_core
{
diff --git a/src/systemc/sc_event.cc b/src/systemc/core/sc_event.cc
similarity index 99%
rename from src/systemc/sc_event.cc
rename to src/systemc/core/sc_event.cc
index a96d5f3..f3b27be 100644
--- a/src/systemc/sc_event.cc
+++ b/src/systemc/core/sc_event.cc
@@ -27,9 +27,8 @@
* Authors: Gabe Black
*/
-#include "systemc/sc_event.hh"
-
#include "base/logging.hh"
+#include "systemc/ext/core/sc_event.hh"
namespace sc_core
{
diff --git a/src/systemc/sc_export.cc b/src/systemc/core/sc_export.cc
similarity index 97%
rename from src/systemc/sc_export.cc
rename to src/systemc/core/sc_export.cc
index 1363f4c..dbe910a 100644
--- a/src/systemc/sc_export.cc
+++ b/src/systemc/core/sc_export.cc
@@ -27,9 +27,8 @@
* Authors: Gabe Black
*/
-#include "systemc/sc_export.hh"
-
#include "base/logging.hh"
+#include "systemc/ext/core/sc_export.hh"
namespace sc_core
{
diff --git a/src/systemc/sc_interface.cc b/src/systemc/core/sc_interface.cc
similarity index 97%
rename from src/systemc/sc_interface.cc
rename to src/systemc/core/sc_interface.cc
index 18124ab..e01bdcc 100644
--- a/src/systemc/sc_interface.cc
+++ b/src/systemc/core/sc_interface.cc
@@ -27,9 +27,8 @@
*
