diff --git a/examples/simple_system/gen/plic_regs.h b/examples/simple_system/gen/plic_regs.h index bafa049..936873c 100644 --- a/examples/simple_system/gen/plic_regs.h +++ b/examples/simple_system/gen/plic_regs.h @@ -28,7 +28,7 @@ // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE // POSSIBILITY OF SUCH DAMAGE. // -// Created on: Wed Sep 20 11:47:24 CEST 2017 +// Created on: Wed Sep 20 22:30:45 CEST 2017 // * plic_regs.h Author: // //////////////////////////////////////////////////////////////////////////////// @@ -51,7 +51,7 @@ protected: // storage declarations BEGIN_BF_DECL(priority_t, uint32_t); BF_FIELD(priority, 0, 3); - END_BF_DECL(); + END_BF_DECL() ; std::array r_priority; uint32_t r_pending; @@ -65,7 +65,7 @@ protected: uint32_t r_claim_complete; // register declarations - sysc::sc_register_field priority; + sysc::sc_register_indexed priority; sysc::sc_register pending; sysc::sc_register enabled; sysc::sc_register threshold; diff --git a/examples/simple_system/gen/spi_regs.h b/examples/simple_system/gen/spi_regs.h index 8f9463f..4eb38ef 100644 --- a/examples/simple_system/gen/spi_regs.h +++ b/examples/simple_system/gen/spi_regs.h @@ -28,7 +28,7 @@ // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE // POSSIBILITY OF SUCH DAMAGE. // -// Created on: Wed Sep 20 11:47:24 CEST 2017 +// Created on: Wed Sep 20 22:30:45 CEST 2017 // * spi_regs.h Author: // //////////////////////////////////////////////////////////////////////////////// diff --git a/examples/simple_system/gen/uart_regs.h b/examples/simple_system/gen/uart_regs.h index b268ddf..87382b4 100644 --- a/examples/simple_system/gen/uart_regs.h +++ b/examples/simple_system/gen/uart_regs.h @@ -28,7 +28,7 @@ // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE // POSSIBILITY OF SUCH DAMAGE. // -// Created on: Wed Sep 20 11:47:24 CEST 2017 +// Created on: Wed Sep 20 22:30:45 CEST 2017 // * uart_regs.h Author: // //////////////////////////////////////////////////////////////////////////////// @@ -91,9 +91,9 @@ protected: sysc::sc_register rxdata; sysc::sc_register txctrl; sysc::sc_register rxctrl; - sysc::sc_register ie; - sysc::sc_register ip; - sysc::sc_register div; + sysc::sc_register ie; + sysc::sc_register ip; + sysc::sc_register div; public: uart_regs(sc_core::sc_module_name nm); diff --git a/sc-components b/sc-components index 0ae9ca9..4bc2664 160000 --- a/sc-components +++ b/sc-components @@ -1 +1 @@ -Subproject commit 0ae9ca921a3c59f7f5e0cad119314e65bd50c327 +Subproject commit 4bc26642e349906f6e81619ea8a26bf533c3f46f