diff --git a/HDL/dec.sv b/HDL/dec.sv index 7a8262e..f9f5926 100644 --- a/HDL/dec.sv +++ b/HDL/dec.sv @@ -10,7 +10,7 @@ module dec output logic [31:0] ctl_rddata, //memory slave input logic ram_wr, - input logic [1:0] ram_addr, + input logic [3:0] ram_addr, input logic [31:0] ram_wrdata, //external ports input logic train, diff --git a/Testbench/dec/dec.qws b/Testbench/dec/dec.qws index 937c2ba..045a66f 100644 Binary files a/Testbench/dec/dec.qws and b/Testbench/dec/dec.qws differ diff --git a/Top/Semafor_hw.tcl b/Top/Semafor_hw.tcl index 6f9fa28..81f38ae 100644 --- a/Top/Semafor_hw.tcl +++ b/Top/Semafor_hw.tcl @@ -1,11 +1,11 @@ # TCL File Generated by Component Editor 18.1 -# Wed Dec 21 21:00:10 MSK 2022 +# Thu Dec 22 22:35:53 MSK 2022 # DO NOT MODIFY # # sem "Semafor" v1.1 -# 2022.12.21.21:00:10 +# 2022.12.22.22:35:53 # # @@ -163,7 +163,7 @@ set_interface_property ram_slave CMSIS_SVD_VARIABLES "" set_interface_property ram_slave SVD_ADDRESS_GROUP "" add_interface_port ram_slave ram_wr write Input 1 -add_interface_port ram_slave ram_addr address Input 2 +add_interface_port ram_slave ram_addr address Input 4 add_interface_port ram_slave ram_wrdata writedata Input 32 set_interface_assignment ram_slave embeddedsw.configuration.isFlash 0 set_interface_assignment ram_slave embeddedsw.configuration.isMemoryDevice 0 diff --git a/Top/Semafor_hw.tcl~ b/Top/Semafor_hw.tcl~ index 0a26897..6f9fa28 100644 --- a/Top/Semafor_hw.tcl~ +++ b/Top/Semafor_hw.tcl~ @@ -1,11 +1,11 @@ # TCL File Generated by Component Editor 18.1 -# Mon Dec 19 20:23:41 MSK 2022 +# Wed Dec 21 21:00:10 MSK 2022 # DO NOT MODIFY # # sem "Semafor" v1.1 -# 2022.12.19.20:23:40 +# 2022.12.21.21:00:10 # # diff --git a/Top/niosII.qsys b/Top/niosII.qsys index d87b3bd..c2c790b 100644 --- a/Top/niosII.qsys +++ b/Top/niosII.qsys @@ -45,7 +45,7 @@ { datum baseAddress { - value = "135224"; + value = "135272"; type = "String"; } } @@ -97,6 +97,14 @@ type = "String"; } } + element niosII + { + datum _originalDeviceFamily + { + value = "Cyclone IV E"; + type = "String"; + } + } element sem { datum _sortIndex @@ -109,7 +117,7 @@ { datum baseAddress { - value = "135216"; + value = "135264"; type = "String"; } } @@ -117,7 +125,7 @@ { datum baseAddress { - value = "135200"; + value = "135168"; type = "String"; } } @@ -133,7 +141,7 @@ { datum baseAddress { - value = "135168"; + value = "135232"; type = "String"; } } @@ -187,7 +195,7 @@ - ]]> + ]]> @@ -421,7 +429,7 @@ start="cpu.data_master" end="jtag_uart.avalon_jtag_slave"> - + - + - + - + diff --git a/Top/niosII.sopcinfo b/Top/niosII.sopcinfo index 692fcde..08e5c97 100644 --- a/Top/niosII.sopcinfo +++ b/Top/niosII.sopcinfo @@ -1,11 +1,11 @@ - + java.lang.Integer - 1671715140 + 1671734311 false true false @@ -2034,7 +2034,7 @@ the requested settings for a module instance. --> java.lang.String - ]]> + ]]> false true false @@ -2705,7 +2705,7 @@ parameters are a RESULT of the module parameters. --> jtag_uart avalon_jtag_slave jtag_uart.avalon_jtag_slave - 135224 + 135272 8 @@ -2713,7 +2713,7 @@ parameters are a RESULT of the module parameters. --> sem ctl_slave sem.ctl_slave - 135216 + 135264 8 @@ -2729,15 +2729,15 @@ parameters are a RESULT of the module parameters. --> sem ram_slave sem.ram_slave - 135200 - 16 + 135168 + 64 false sys_clk_timer s1 sys_clk_timer.s1 - 135168 + 135232 32 @@ -6172,7 +6172,7 @@ parameters are a RESULT of the module parameters. --> java.math.BigInteger - 16 + 64 true true false @@ -6477,7 +6477,7 @@ parameters are a RESULT of the module parameters. --> ram_addr Input - 2 + 4 address @@ -7349,7 +7349,7 @@ parameters are a RESULT of the module parameters. --> java.math.BigInteger - 0x00021038 + 0x00021068 false true true @@ -7400,7 +7400,7 @@ parameters are a RESULT of the module parameters. --> java.math.BigInteger - 0x00021030 + 0x00021060 false true true @@ -7502,7 +7502,7 @@ parameters are a RESULT of the module parameters. --> java.math.BigInteger - 0x00021020 + 0x00021000 false true true @@ -7553,7 +7553,7 @@ parameters are a RESULT of the module parameters. --> java.math.BigInteger - 0x00021000 + 0x00021040 false true true diff --git a/Top/niosII/niosII.html b/Top/niosII/niosII.html index 448fddf..9411a31 100644 --- a/Top/niosII/niosII.html +++ b/Top/niosII/niosII.html @@ -67,7 +67,7 @@ div.greydiv { vertical-align:top ; text-align:center ; background:#eeeeee ; bord - 2022.12.21.21:02:26 + 2022.12.22.22:37:23 Datasheet @@ -144,7 +144,7 @@ div.greydiv { vertical-align:top ; text-align:center ; background:#eeeeee ; bord avalon_jtag_slave - 0x00021038 + 0x00021068 @@ -175,12 +175,12 @@ div.greydiv { vertical-align:top ; text-align:center ; background:#eeeeee ; bord ctl_slave - 0x00021030 + 0x00021060 ram_slave - 0x00021020 + 0x00021000 @@ -193,7 +193,7 @@ div.greydiv { vertical-align:top ; text-align:center ; background:#eeeeee ; bord s1 - 0x00021000 + 0x00021040 @@ -1107,7 +1107,7 @@ div.greydiv { vertical-align:top ; text-align:center ; background:#eeeeee ; bord dataSlaveMapParam - <address-map><slave name='mem.s2' start='0x0' end='0x20000' type='altera_avalon_onchip_memory2.s2' /><slave name='cpu.debug_mem_slave' start='0x20800' end='0x21000' type='altera_nios2_gen2.debug_mem_slave' /><slave name='sys_clk_timer.s1' start='0x21000' end='0x21020' type='altera_avalon_timer.s1' /><slave name='sem.ram_slave' start='0x21020' end='0x21030' type='sem.ram_slave' /><slave name='sem.ctl_slave' start='0x21030' end='0x21038' type='sem.ctl_slave' /><slave name='jtag_uart.avalon_jtag_slave' start='0x21038' end='0x21040' type='altera_avalon_jtag_uart.avalon_jtag_slave' /></address-map> + <address-map><slave name='mem.s2' start='0x0' end='0x20000' type='altera_avalon_onchip_memory2.s2' /><slave name='cpu.debug_mem_slave' start='0x20800' end='0x21000' type='altera_nios2_gen2.debug_mem_slave' /><slave name='sem.ram_slave' start='0x21000' end='0x21040' type='sem.ram_slave' /><slave name='sys_clk_timer.s1' start='0x21040' end='0x21060' type='altera_avalon_timer.s1' /><slave name='sem.ctl_slave' start='0x21060' end='0x21068' type='sem.ctl_slave' /><slave name='jtag_uart.avalon_jtag_slave' start='0x21068' end='0x21070' type='altera_avalon_jtag_uart.avalon_jtag_slave' /></address-map> tightlyCoupledDataMaster0MapParam @@ -2038,8 +2038,8 @@ div.greydiv { vertical-align:top ; text-align:center ; background:#eeeeee ; bord - generation took 0,00 seconds - rendering took 0,05 seconds + generation took 0,01 seconds + rendering took 0,08 seconds