From 0ad8c596d7fce6a9e051fae582a22b680a2b1dbf Mon Sep 17 00:00:00 2001 From: aranzaba Date: Wed, 6 May 2026 09:56:55 +0200 Subject: [PATCH 1/2] fix vhdl-ohwr constants prefix from c_ to C_ --- proto/cheby/print_consts.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/proto/cheby/print_consts.py b/proto/cheby/print_consts.py index 340b0c6a..16fc6050 100644 --- a/proto/cheby/print_consts.py +++ b/proto/cheby/print_consts.py @@ -243,10 +243,10 @@ def __init__(self, fd, root): self.pkg_name = root.hdl_module_name + '_consts_pkg' def pr_const(self, name, val): - super().pr_const("c_" + name, val) + super().pr_const("C_" + name, val) def pr_const_width(self, name, val, width): - super().pr_const_width("c_" + name, val, width) + super().pr_const_width("C_" + name, val, width) def pr_address(self, n): # ADDR is a suffix. From 94ee48ac8c701ccd9eb9bd3d7883ba4f4fa3fdb6 Mon Sep 17 00:00:00 2001 From: aranzaba Date: Wed, 6 May 2026 10:00:11 +0200 Subject: [PATCH 2/2] update vhdl-ohwr testfiles --- .../const_range-consts.vhdl-ohwr | 18 +-- testfiles/bug-consts/blkpfx-consts.vhdl-ohwr | 4 +- .../same_label-consts.vhdl-ohwr | 26 ++-- testfiles/demo_all-consts.vhdl-ohwr | 126 +++++++++--------- testfiles/features/enums1-consts.vhdl-ohwr | 4 +- testfiles/features/enums2-consts.vhdl-ohwr | 10 +- testfiles/features/mapinfo1-consts.vhdl-ohwr | 8 +- .../features/memwide_ua-consts.vhdl-ohwr | 20 +-- testfiles/features/semver1-consts.vhdl-ohwr | 6 +- testfiles/issue143/map-consts.vhdl-ohwr | 90 ++++++------- .../issue64/simple_reg1-consts.vhdl-ohwr | 4 +- testfiles/issue_g2/reg-consts.vhdl-ohwr | 32 ++--- testfiles/mr67/top-consts.vhdl-ohwr | 10 +- 13 files changed, 179 insertions(+), 179 deletions(-) diff --git a/testfiles/bug-const-range/const_range-consts.vhdl-ohwr b/testfiles/bug-const-range/const_range-consts.vhdl-ohwr index 07bea03e..2b8f9f86 100644 --- a/testfiles/bug-const-range/const_range-consts.vhdl-ohwr +++ b/testfiles/bug-const-range/const_range-consts.vhdl-ohwr @@ -2,13 +2,13 @@ library ieee; use ieee.std_logic_1164.all; package const_range_consts_pkg is - constant c_CONST_RANGE_SIZE : Natural := 20; - constant c_CONST_RANGE_LARGE_VAL_0_ADDR : Natural := 16#0#; - constant c_CONST_RANGE_LARGE_VAL_0_PRESET : std_logic_vector(32-1 downto 0) := x"f38243bb"; - constant c_CONST_RANGE_LARGE_VAL_1_ADDR : Natural := 16#4#; - constant c_CONST_RANGE_LARGE_VAL_1_PRESET : std_logic_vector(32-1 downto 0) := x"fffffff7"; - constant c_CONST_RANGE_SUPER_LARGE_VAL_ADDR : Natural := 16#8#; - constant c_CONST_RANGE_SUPER_LARGE_VAL_PRESET : std_logic_vector(64-1 downto 0) := x"818734fa9b1e0cf4"; - constant c_CONST_RANGE_SMALL_VAL_ADDR : Natural := 16#10#; - constant c_CONST_RANGE_SMALL_VAL_PRESET : std_logic_vector(32-1 downto 0) := x"00000001"; + constant C_CONST_RANGE_SIZE : Natural := 20; + constant C_CONST_RANGE_LARGE_VAL_0_ADDR : Natural := 16#0#; + constant C_CONST_RANGE_LARGE_VAL_0_PRESET : std_logic_vector(32-1 downto 0) := x"f38243bb"; + constant C_CONST_RANGE_LARGE_VAL_1_ADDR : Natural := 16#4#; + constant C_CONST_RANGE_LARGE_VAL_1_PRESET : std_logic_vector(32-1 downto 0) := x"fffffff7"; + constant C_CONST_RANGE_SUPER_LARGE_VAL_ADDR : Natural := 16#8#; + constant C_CONST_RANGE_SUPER_LARGE_VAL_PRESET : std_logic_vector(64-1 downto 0) := x"818734fa9b1e0cf4"; + constant C_CONST_RANGE_SMALL_VAL_ADDR : Natural := 16#10#; + constant C_CONST_RANGE_SMALL_VAL_PRESET : std_logic_vector(32-1 downto 0) := x"00000001"; end package const_range_consts_pkg; diff --git a/testfiles/bug-consts/blkpfx-consts.vhdl-ohwr b/testfiles/bug-consts/blkpfx-consts.vhdl-ohwr index e08f8262..c2456939 100644 --- a/testfiles/bug-consts/blkpfx-consts.vhdl-ohwr +++ b/testfiles/bug-consts/blkpfx-consts.vhdl-ohwr @@ -2,6 +2,6 @@ library ieee; use ieee.std_logic_1164.all; package blkpfx_consts_pkg is - constant c_BLKPFX_SIZE : Natural := 4; - constant c_BLKPFX_REG1_ADDR : Natural := 16#0#; + constant C_BLKPFX_SIZE : Natural := 4; + constant C_BLKPFX_REG1_ADDR : Natural := 16#0#; end package blkpfx_consts_pkg; diff --git a/testfiles/bug-same-label/same_label-consts.vhdl-ohwr b/testfiles/bug-same-label/same_label-consts.vhdl-ohwr index 8c808da9..f31deb1b 100644 --- a/testfiles/bug-same-label/same_label-consts.vhdl-ohwr +++ b/testfiles/bug-same-label/same_label-consts.vhdl-ohwr @@ -2,17 +2,17 @@ library ieee; use ieee.std_logic_1164.all; package same_label_reg_consts_pkg is - constant c_SAME_LABEL_REG_SIZE : Natural := 16; - constant c_SAME_LABEL_REG_NO_FIELDS_ADDR : Natural := 16#0#; - constant c_SAME_LABEL_REG_NO_FIELDS_PRESET : std_logic_vector(8-1 downto 0) := x"20"; - constant c_SAME_LABEL_REG_SAME_NAME_ADDR : Natural := 16#4#; - constant c_SAME_LABEL_REG_SAME_NAME_WIDTH : Natural := 1; - constant c_SAME_LABEL_REG_SAME_NAME_OFFSET : Natural := 0; - constant c_SAME_LABEL_REG_SAME_NAME_MULTI_ADDR : Natural := 16#8#; - constant c_SAME_LABEL_REG_SAME_NAME_MULTI_WIDTH : Natural := 12; - constant c_SAME_LABEL_REG_SAME_NAME_MULTI_OFFSET : Natural := 0; - constant c_SAME_LABEL_REG_NOT_SAME_REG_ADDR : Natural := 16#c#; - constant c_ADDR_SAME_LABEL_REG_NOT_SAME : Natural := 16#c#; - constant c_SAME_LABEL_REG_NOT_SAME_WIDTH : Natural := 1; - constant c_SAME_LABEL_REG_NOT_SAME_OFFSET : Natural := 0; + constant C_SAME_LABEL_REG_SIZE : Natural := 16; + constant C_SAME_LABEL_REG_NO_FIELDS_ADDR : Natural := 16#0#; + constant C_SAME_LABEL_REG_NO_FIELDS_PRESET : std_logic_vector(8-1 downto 0) := x"20"; + constant C_SAME_LABEL_REG_SAME_NAME_ADDR : Natural := 16#4#; + constant C_SAME_LABEL_REG_SAME_NAME_WIDTH : Natural := 1; + constant C_SAME_LABEL_REG_SAME_NAME_OFFSET : Natural := 0; + constant C_SAME_LABEL_REG_SAME_NAME_MULTI_ADDR : Natural := 16#8#; + constant C_SAME_LABEL_REG_SAME_NAME_MULTI_WIDTH : Natural := 12; + constant C_SAME_LABEL_REG_SAME_NAME_MULTI_OFFSET : Natural := 0; + constant C_SAME_LABEL_REG_NOT_SAME_REG_ADDR : Natural := 16#c#; + constant C_ADDR_SAME_LABEL_REG_NOT_SAME : Natural := 16#c#; + constant C_SAME_LABEL_REG_NOT_SAME_WIDTH : Natural := 1; + constant C_SAME_LABEL_REG_NOT_SAME_OFFSET : Natural := 0; end package same_label_reg_consts_pkg; diff --git a/testfiles/demo_all-consts.vhdl-ohwr b/testfiles/demo_all-consts.vhdl-ohwr index 0b50419a..866bed93 100644 --- a/testfiles/demo_all-consts.vhdl-ohwr +++ b/testfiles/demo_all-consts.vhdl-ohwr @@ -2,67 +2,67 @@ library ieee; use ieee.std_logic_1164.all; package demo_all_consts_pkg is - constant c_DEMO_ALL_SIZE : Natural := 8448; - constant c_DEMO_ALL_REG0_ADDR : Natural := 16#0#; - constant c_ADDR_DEMO_ALL_REG0_FIELD00 : Natural := 16#0#; - constant c_DEMO_ALL_REG0_FIELD00_WIDTH : Natural := 1; - constant c_DEMO_ALL_REG0_FIELD00_OFFSET : Natural := 1; - constant c_ADDR_DEMO_ALL_REG0_FIELD01 : Natural := 16#0#; - constant c_DEMO_ALL_REG0_FIELD01_WIDTH : Natural := 4; - constant c_DEMO_ALL_REG0_FIELD01_OFFSET : Natural := 4; - constant c_ADDR_DEMO_ALL_REG0_FIELD02 : Natural := 16#0#; - constant c_DEMO_ALL_REG0_FIELD02_WIDTH : Natural := 3; - constant c_DEMO_ALL_REG0_FIELD02_OFFSET : Natural := 8; - constant c_DEMO_ALL_REG0_FIELD02_PRESET : std_logic_vector(3-1 downto 0) := "010"; - constant c_DEMO_ALL_REG1_ADDR : Natural := 16#4#; - constant c_DEMO_ALL_REG1_PRESET : std_logic_vector(32-1 downto 0) := x"00000123"; - constant c_DEMO_ALL_REG2_ADDR : Natural := 16#8#; - constant c_ADDR_DEMO_ALL_REG2_FIELD10 : Natural := 16#8#; - constant c_DEMO_ALL_REG2_FIELD10_WIDTH : Natural := 16; - constant c_DEMO_ALL_REG2_FIELD10_OFFSET : Natural := 0; - constant c_ADDR_DEMO_ALL_REG2_FIELD11 : Natural := 16#8#; - constant c_DEMO_ALL_REG2_FIELD11_WIDTH : Natural := 40; - constant c_DEMO_ALL_REG2_FIELD11_OFFSET : Natural := 16; - constant c_DEMO_ALL_BLOCK1_ADDR : Natural := 16#10#; - constant c_ADDR_MASK_DEMO_ALL_BLOCK1 : Natural := 16#3ff0#; - constant c_ADDR_FMASK_DEMO_ALL_BLOCK1 : Natural := 16#3ff0#; - constant c_DEMO_ALL_BLOCK1_SIZE : Natural := 16; - constant c_DEMO_ALL_BLOCK1_B1REG0_ADDR : Natural := 16#10#; - constant c_DEMO_ALL_BLOCK1_B1REG1_ADDR : Natural := 16#14#; - constant c_ADDR_DEMO_ALL_BLOCK1_B1REG1_F0 : Natural := 16#14#; - constant c_DEMO_ALL_BLOCK1_B1REG1_F0_WIDTH : Natural := 1; - constant c_DEMO_ALL_BLOCK1_B1REG1_F0_OFFSET : Natural := 0; - constant c_ADDR_DEMO_ALL_BLOCK1_B1REG1_F1 : Natural := 16#14#; - constant c_DEMO_ALL_BLOCK1_B1REG1_F1_WIDTH : Natural := 31; - constant c_DEMO_ALL_BLOCK1_B1REG1_F1_OFFSET : Natural := 1; - constant c_DEMO_ALL_BLOCK1_B1REG2_ADDR : Natural := 16#18#; - constant c_DEMO_ALL_SUB1_ADDR : Natural := 16#20#; - constant c_ADDR_MASK_DEMO_ALL_SUB1 : Natural := 16#3ff0#; - constant c_ADDR_FMASK_DEMO_ALL_SUB1 : Natural := 16#3ff0#; - constant c_DEMO_ALL_SUB1_SIZE : Natural := 16; - constant c_DEMO_ALL_SUB2_ADDR : Natural := 16#30#; - constant c_ADDR_MASK_DEMO_ALL_SUB2 : Natural := 16#3ff0#; - constant c_ADDR_FMASK_DEMO_ALL_SUB2 : Natural := 16#3ff0#; - constant c_DEMO_ALL_SUB2_SIZE : Natural := 16; - constant c_DEMO_ALL_SUB3_ADDR : Natural := 16#1000#; - constant c_ADDR_MASK_DEMO_ALL_SUB3 : Natural := 16#3000#; - constant c_ADDR_FMASK_DEMO_ALL_SUB3 : Natural := 16#3000#; - constant c_DEMO_ALL_SUB3_SIZE : Natural := 4096; - constant c_DEMO_ALL_ARR1_ADDR : Natural := 16#2000#; - constant c_ADDR_MASK_DEMO_ALL_ARR1 : Natural := 16#3ff8#; - constant c_ADDR_FMASK_DEMO_ALL_ARR1 : Natural := 16#3ff8#; - constant c_DEMO_ALL_ARR1_SIZE : Natural := 8; - constant c_DEMO_ALL_ARR1_0_ADDR : Natural := 16#2000#; - constant c_ADDR_MASK_DEMO_ALL_ARR1_0 : Natural := 16#4#; - constant c_ADDR_FMASK_DEMO_ALL_ARR1_0 : Natural := 16#3ffc#; - constant c_DEMO_ALL_ARR1_0_SIZE : Natural := 4; - constant c_DEMO_ALL_ARR1_0_AREG1_ADDR : Natural := 16#2000#; - constant c_DEMO_ALL_ARR1_1_ADDR : Natural := 16#2004#; - constant c_ADDR_MASK_DEMO_ALL_ARR1_1 : Natural := 16#4#; - constant c_ADDR_FMASK_DEMO_ALL_ARR1_1 : Natural := 16#3ffc#; - constant c_DEMO_ALL_ARR1_1_SIZE : Natural := 4; - constant c_DEMO_ALL_ARR1_1_AREG1_ADDR : Natural := 16#2004#; - constant c_DEMO_ALL_RAM_RO1_ADDR : Natural := 16#2080#; - constant c_DEMO_ALL_RAM_RO1_SIZE : Natural := 4; - constant c_DEMO_ALL_RAM_RO1_VALUE_ADDR : Natural := 16#0#; + constant C_DEMO_ALL_SIZE : Natural := 8448; + constant C_DEMO_ALL_REG0_ADDR : Natural := 16#0#; + constant C_ADDR_DEMO_ALL_REG0_FIELD00 : Natural := 16#0#; + constant C_DEMO_ALL_REG0_FIELD00_WIDTH : Natural := 1; + constant C_DEMO_ALL_REG0_FIELD00_OFFSET : Natural := 1; + constant C_ADDR_DEMO_ALL_REG0_FIELD01 : Natural := 16#0#; + constant C_DEMO_ALL_REG0_FIELD01_WIDTH : Natural := 4; + constant C_DEMO_ALL_REG0_FIELD01_OFFSET : Natural := 4; + constant C_ADDR_DEMO_ALL_REG0_FIELD02 : Natural := 16#0#; + constant C_DEMO_ALL_REG0_FIELD02_WIDTH : Natural := 3; + constant C_DEMO_ALL_REG0_FIELD02_OFFSET : Natural := 8; + constant C_DEMO_ALL_REG0_FIELD02_PRESET : std_logic_vector(3-1 downto 0) := "010"; + constant C_DEMO_ALL_REG1_ADDR : Natural := 16#4#; + constant C_DEMO_ALL_REG1_PRESET : std_logic_vector(32-1 downto 0) := x"00000123"; + constant C_DEMO_ALL_REG2_ADDR : Natural := 16#8#; + constant C_ADDR_DEMO_ALL_REG2_FIELD10 : Natural := 16#8#; + constant C_DEMO_ALL_REG2_FIELD10_WIDTH : Natural := 16; + constant C_DEMO_ALL_REG2_FIELD10_OFFSET : Natural := 0; + constant C_ADDR_DEMO_ALL_REG2_FIELD11 : Natural := 16#8#; + constant C_DEMO_ALL_REG2_FIELD11_WIDTH : Natural := 40; + constant C_DEMO_ALL_REG2_FIELD11_OFFSET : Natural := 16; + constant C_DEMO_ALL_BLOCK1_ADDR : Natural := 16#10#; + constant C_ADDR_MASK_DEMO_ALL_BLOCK1 : Natural := 16#3ff0#; + constant C_ADDR_FMASK_DEMO_ALL_BLOCK1 : Natural := 16#3ff0#; + constant C_DEMO_ALL_BLOCK1_SIZE : Natural := 16; + constant C_DEMO_ALL_BLOCK1_B1REG0_ADDR : Natural := 16#10#; + constant C_DEMO_ALL_BLOCK1_B1REG1_ADDR : Natural := 16#14#; + constant C_ADDR_DEMO_ALL_BLOCK1_B1REG1_F0 : Natural := 16#14#; + constant C_DEMO_ALL_BLOCK1_B1REG1_F0_WIDTH : Natural := 1; + constant C_DEMO_ALL_BLOCK1_B1REG1_F0_OFFSET : Natural := 0; + constant C_ADDR_DEMO_ALL_BLOCK1_B1REG1_F1 : Natural := 16#14#; + constant C_DEMO_ALL_BLOCK1_B1REG1_F1_WIDTH : Natural := 31; + constant C_DEMO_ALL_BLOCK1_B1REG1_F1_OFFSET : Natural := 1; + constant C_DEMO_ALL_BLOCK1_B1REG2_ADDR : Natural := 16#18#; + constant C_DEMO_ALL_SUB1_ADDR : Natural := 16#20#; + constant C_ADDR_MASK_DEMO_ALL_SUB1 : Natural := 16#3ff0#; + constant C_ADDR_FMASK_DEMO_ALL_SUB1 : Natural := 16#3ff0#; + constant C_DEMO_ALL_SUB1_SIZE : Natural := 16; + constant C_DEMO_ALL_SUB2_ADDR : Natural := 16#30#; + constant C_ADDR_MASK_DEMO_ALL_SUB2 : Natural := 16#3ff0#; + constant C_ADDR_FMASK_DEMO_ALL_SUB2 : Natural := 16#3ff0#; + constant C_DEMO_ALL_SUB2_SIZE : Natural := 16; + constant C_DEMO_ALL_SUB3_ADDR : Natural := 16#1000#; + constant C_ADDR_MASK_DEMO_ALL_SUB3 : Natural := 16#3000#; + constant C_ADDR_FMASK_DEMO_ALL_SUB3 : Natural := 16#3000#; + constant C_DEMO_ALL_SUB3_SIZE : Natural := 4096; + constant C_DEMO_ALL_ARR1_ADDR : Natural := 16#2000#; + constant C_ADDR_MASK_DEMO_ALL_ARR1 : Natural := 16#3ff8#; + constant C_ADDR_FMASK_DEMO_ALL_ARR1 : Natural := 16#3ff8#; + constant C_DEMO_ALL_ARR1_SIZE : Natural := 8; + constant C_DEMO_ALL_ARR1_0_ADDR : Natural := 16#2000#; + constant C_ADDR_MASK_DEMO_ALL_ARR1_0 : Natural := 16#4#; + constant C_ADDR_FMASK_DEMO_ALL_ARR1_0 : Natural := 16#3ffc#; + constant C_DEMO_ALL_ARR1_0_SIZE : Natural := 4; + constant C_DEMO_ALL_ARR1_0_AREG1_ADDR : Natural := 16#2000#; + constant C_DEMO_ALL_ARR1_1_ADDR : Natural := 16#2004#; + constant C_ADDR_MASK_DEMO_ALL_ARR1_1 : Natural := 16#4#; + constant C_ADDR_FMASK_DEMO_ALL_ARR1_1 : Natural := 16#3ffc#; + constant C_DEMO_ALL_ARR1_1_SIZE : Natural := 4; + constant C_DEMO_ALL_ARR1_1_AREG1_ADDR : Natural := 16#2004#; + constant C_DEMO_ALL_RAM_RO1_ADDR : Natural := 16#2080#; + constant C_DEMO_ALL_RAM_RO1_SIZE : Natural := 4; + constant C_DEMO_ALL_RAM_RO1_VALUE_ADDR : Natural := 16#0#; end package demo_all_consts_pkg; diff --git a/testfiles/features/enums1-consts.vhdl-ohwr b/testfiles/features/enums1-consts.vhdl-ohwr index 033d35ea..ef1bceef 100644 --- a/testfiles/features/enums1-consts.vhdl-ohwr +++ b/testfiles/features/enums1-consts.vhdl-ohwr @@ -2,8 +2,8 @@ library ieee; use ieee.std_logic_1164.all; package enums1_consts_pkg is - constant c_ENUMS1_SIZE : Natural := 4; - constant c_ENUMS1_R1_ADDR : Natural := 16#0#; + constant C_ENUMS1_SIZE : Natural := 4; + constant C_ENUMS1_R1_ADDR : Natural := 16#0#; constant C_enum1_hello : std_logic_vector (7 downto 0) := "00000000"; constant C_enum1_World : std_logic_vector (7 downto 0) := "00000001"; constant C_enum2_hello : std_logic_vector (0 downto 0) := "0"; diff --git a/testfiles/features/enums2-consts.vhdl-ohwr b/testfiles/features/enums2-consts.vhdl-ohwr index d68325c4..1a979de2 100644 --- a/testfiles/features/enums2-consts.vhdl-ohwr +++ b/testfiles/features/enums2-consts.vhdl-ohwr @@ -2,11 +2,11 @@ library ieee; use ieee.std_logic_1164.all; package enums2_consts_pkg is - constant c_ENUMS2_SIZE : Natural := 4; - constant c_ENUMS2_R1_ADDR : Natural := 16#0#; - constant c_ADDR_ENUMS2_R1_F1 : Natural := 16#0#; - constant c_ENUMS2_R1_F1_WIDTH : Natural := 8; - constant c_ENUMS2_R1_F1_OFFSET : Natural := 0; + constant C_ENUMS2_SIZE : Natural := 4; + constant C_ENUMS2_R1_ADDR : Natural := 16#0#; + constant C_ADDR_ENUMS2_R1_F1 : Natural := 16#0#; + constant C_ENUMS2_R1_F1_WIDTH : Natural := 8; + constant C_ENUMS2_R1_F1_OFFSET : Natural := 0; constant C_enum1_hello : std_logic_vector (7 downto 0) := "00000000"; constant C_enum1_World : std_logic_vector (7 downto 0) := "00000001"; constant C_enum2_hello : std_logic_vector (0 downto 0) := "0"; diff --git a/testfiles/features/mapinfo1-consts.vhdl-ohwr b/testfiles/features/mapinfo1-consts.vhdl-ohwr index b282a744..72511c7d 100644 --- a/testfiles/features/mapinfo1-consts.vhdl-ohwr +++ b/testfiles/features/mapinfo1-consts.vhdl-ohwr @@ -2,8 +2,8 @@ library ieee; use ieee.std_logic_1164.all; package semver1_consts_pkg is - constant c_SEMVER1_SIZE : Natural := 4; - constant c_SEMVER1_MEMMAP_VERSION : Natural := 16#10000#; - constant c_SEMVER1_IDENT : Natural := 16#12345678#; - constant c_SEMVER1_R1_ADDR : Natural := 16#0#; + constant C_SEMVER1_SIZE : Natural := 4; + constant C_SEMVER1_MEMMAP_VERSION : Natural := 16#10000#; + constant C_SEMVER1_IDENT : Natural := 16#12345678#; + constant C_SEMVER1_R1_ADDR : Natural := 16#0#; end package semver1_consts_pkg; diff --git a/testfiles/features/memwide_ua-consts.vhdl-ohwr b/testfiles/features/memwide_ua-consts.vhdl-ohwr index 77220260..c8f87ed3 100644 --- a/testfiles/features/memwide_ua-consts.vhdl-ohwr +++ b/testfiles/features/memwide_ua-consts.vhdl-ohwr @@ -2,14 +2,14 @@ library ieee; use ieee.std_logic_1164.all; package memwide_ua_consts_pkg is - constant c_MEMWIDE_UA_SIZE : Natural := 256; - constant c_MEMWIDE_UA_REGA_ADDR : Natural := 16#0#; - constant c_ADDR_MEMWIDE_UA_REGA_FIELD0 : Natural := 16#0#; - constant c_MEMWIDE_UA_REGA_FIELD0_WIDTH : Natural := 1; - constant c_MEMWIDE_UA_REGA_FIELD0_OFFSET : Natural := 1; - constant c_MEMWIDE_UA_TS_ADDR : Natural := 16#80#; - constant c_MEMWIDE_UA_TS_SIZE : Natural := 16; - constant c_MEMWIDE_UA_TS_RISE_SEC_ADDR : Natural := 16#0#; - constant c_MEMWIDE_UA_TS_RISE_NS_ADDR : Natural := 16#4#; - constant c_MEMWIDE_UA_TS_FALL_SEC_ADDR : Natural := 16#8#; + constant C_MEMWIDE_UA_SIZE : Natural := 256; + constant C_MEMWIDE_UA_REGA_ADDR : Natural := 16#0#; + constant C_ADDR_MEMWIDE_UA_REGA_FIELD0 : Natural := 16#0#; + constant C_MEMWIDE_UA_REGA_FIELD0_WIDTH : Natural := 1; + constant C_MEMWIDE_UA_REGA_FIELD0_OFFSET : Natural := 1; + constant C_MEMWIDE_UA_TS_ADDR : Natural := 16#80#; + constant C_MEMWIDE_UA_TS_SIZE : Natural := 16; + constant C_MEMWIDE_UA_TS_RISE_SEC_ADDR : Natural := 16#0#; + constant C_MEMWIDE_UA_TS_RISE_NS_ADDR : Natural := 16#4#; + constant C_MEMWIDE_UA_TS_FALL_SEC_ADDR : Natural := 16#8#; end package memwide_ua_consts_pkg; diff --git a/testfiles/features/semver1-consts.vhdl-ohwr b/testfiles/features/semver1-consts.vhdl-ohwr index 9375a64f..368b9451 100644 --- a/testfiles/features/semver1-consts.vhdl-ohwr +++ b/testfiles/features/semver1-consts.vhdl-ohwr @@ -2,7 +2,7 @@ library ieee; use ieee.std_logic_1164.all; package semver1_consts_pkg is - constant c_SEMVER1_SIZE : Natural := 4; - constant c_SEMVER1_VERSION : Natural := 16#10000#; - constant c_SEMVER1_R1_ADDR : Natural := 16#0#; + constant C_SEMVER1_SIZE : Natural := 4; + constant C_SEMVER1_VERSION : Natural := 16#10000#; + constant C_SEMVER1_R1_ADDR : Natural := 16#0#; end package semver1_consts_pkg; diff --git a/testfiles/issue143/map-consts.vhdl-ohwr b/testfiles/issue143/map-consts.vhdl-ohwr index 1acf3afa..2f9781d8 100644 --- a/testfiles/issue143/map-consts.vhdl-ohwr +++ b/testfiles/issue143/map-consts.vhdl-ohwr @@ -2,49 +2,49 @@ library ieee; use ieee.std_logic_1164.all; package top_consts_pkg is - constant c_TOP_SIZE : Natural := 32; - constant c_TOP_ARRAY_OF_SUBMAPS_ADDR : Natural := 16#0#; - constant c_ADDR_MASK_TOP_ARRAY_OF_SUBMAPS : Natural := 16#0#; - constant c_ADDR_FMASK_TOP_ARRAY_OF_SUBMAPS : Natural := 16#0#; - constant c_TOP_ARRAY_OF_SUBMAPS_SIZE : Natural := 32; - constant c_TOP_ARRAY_OF_SUBMAPS_0_ADDR : Natural := 16#0#; - constant c_ADDR_MASK_TOP_ARRAY_OF_SUBMAPS_0 : Natural := 16#1c#; - constant c_ADDR_FMASK_TOP_ARRAY_OF_SUBMAPS_0 : Natural := 16#1c#; - constant c_TOP_ARRAY_OF_SUBMAPS_0_SIZE : Natural := 4; - constant c_TOP_ARRAY_OF_SUBMAPS_0_SUBMAP_ADDR : Natural := 16#0#; - constant c_ADDR_MASK_TOP_ARRAY_OF_SUBMAPS_0_SUBMAP : Natural := 16#1c#; - constant c_ADDR_FMASK_TOP_ARRAY_OF_SUBMAPS_0_SUBMAP : Natural := 16#1c#; - constant c_TOP_ARRAY_OF_SUBMAPS_0_SUBMAP_SIZE : Natural := 4; - constant c_TOP_ARRAY_OF_SUBMAPS_1_ADDR : Natural := 16#4#; - constant c_ADDR_MASK_TOP_ARRAY_OF_SUBMAPS_1 : Natural := 16#1c#; - constant c_ADDR_FMASK_TOP_ARRAY_OF_SUBMAPS_1 : Natural := 16#1c#; - constant c_TOP_ARRAY_OF_SUBMAPS_1_SIZE : Natural := 4; - constant c_TOP_ARRAY_OF_SUBMAPS_1_SUBMAP_ADDR : Natural := 16#4#; - constant c_ADDR_MASK_TOP_ARRAY_OF_SUBMAPS_1_SUBMAP : Natural := 16#1c#; - constant c_ADDR_FMASK_TOP_ARRAY_OF_SUBMAPS_1_SUBMAP : Natural := 16#1c#; - constant c_TOP_ARRAY_OF_SUBMAPS_1_SUBMAP_SIZE : Natural := 4; - constant c_TOP_ARRAY_OF_SUBMAPS_2_ADDR : Natural := 16#8#; - constant c_ADDR_MASK_TOP_ARRAY_OF_SUBMAPS_2 : Natural := 16#1c#; - constant c_ADDR_FMASK_TOP_ARRAY_OF_SUBMAPS_2 : Natural := 16#1c#; - constant c_TOP_ARRAY_OF_SUBMAPS_2_SIZE : Natural := 4; - constant c_TOP_ARRAY_OF_SUBMAPS_2_SUBMAP_ADDR : Natural := 16#8#; - constant c_ADDR_MASK_TOP_ARRAY_OF_SUBMAPS_2_SUBMAP : Natural := 16#1c#; - constant c_ADDR_FMASK_TOP_ARRAY_OF_SUBMAPS_2_SUBMAP : Natural := 16#1c#; - constant c_TOP_ARRAY_OF_SUBMAPS_2_SUBMAP_SIZE : Natural := 4; - constant c_TOP_ARRAY_OF_SUBMAPS_3_ADDR : Natural := 16#c#; - constant c_ADDR_MASK_TOP_ARRAY_OF_SUBMAPS_3 : Natural := 16#1c#; - constant c_ADDR_FMASK_TOP_ARRAY_OF_SUBMAPS_3 : Natural := 16#1c#; - constant c_TOP_ARRAY_OF_SUBMAPS_3_SIZE : Natural := 4; - constant c_TOP_ARRAY_OF_SUBMAPS_3_SUBMAP_ADDR : Natural := 16#c#; - constant c_ADDR_MASK_TOP_ARRAY_OF_SUBMAPS_3_SUBMAP : Natural := 16#1c#; - constant c_ADDR_FMASK_TOP_ARRAY_OF_SUBMAPS_3_SUBMAP : Natural := 16#1c#; - constant c_TOP_ARRAY_OF_SUBMAPS_3_SUBMAP_SIZE : Natural := 4; - constant c_TOP_ARRAY_OF_SUBMAPS_4_ADDR : Natural := 16#10#; - constant c_ADDR_MASK_TOP_ARRAY_OF_SUBMAPS_4 : Natural := 16#1c#; - constant c_ADDR_FMASK_TOP_ARRAY_OF_SUBMAPS_4 : Natural := 16#1c#; - constant c_TOP_ARRAY_OF_SUBMAPS_4_SIZE : Natural := 4; - constant c_TOP_ARRAY_OF_SUBMAPS_4_SUBMAP_ADDR : Natural := 16#10#; - constant c_ADDR_MASK_TOP_ARRAY_OF_SUBMAPS_4_SUBMAP : Natural := 16#1c#; - constant c_ADDR_FMASK_TOP_ARRAY_OF_SUBMAPS_4_SUBMAP : Natural := 16#1c#; - constant c_TOP_ARRAY_OF_SUBMAPS_4_SUBMAP_SIZE : Natural := 4; + constant C_TOP_SIZE : Natural := 32; + constant C_TOP_ARRAY_OF_SUBMAPS_ADDR : Natural := 16#0#; + constant C_ADDR_MASK_TOP_ARRAY_OF_SUBMAPS : Natural := 16#0#; + constant C_ADDR_FMASK_TOP_ARRAY_OF_SUBMAPS : Natural := 16#0#; + constant C_TOP_ARRAY_OF_SUBMAPS_SIZE : Natural := 32; + constant C_TOP_ARRAY_OF_SUBMAPS_0_ADDR : Natural := 16#0#; + constant C_ADDR_MASK_TOP_ARRAY_OF_SUBMAPS_0 : Natural := 16#1c#; + constant C_ADDR_FMASK_TOP_ARRAY_OF_SUBMAPS_0 : Natural := 16#1c#; + constant C_TOP_ARRAY_OF_SUBMAPS_0_SIZE : Natural := 4; + constant C_TOP_ARRAY_OF_SUBMAPS_0_SUBMAP_ADDR : Natural := 16#0#; + constant C_ADDR_MASK_TOP_ARRAY_OF_SUBMAPS_0_SUBMAP : Natural := 16#1c#; + constant C_ADDR_FMASK_TOP_ARRAY_OF_SUBMAPS_0_SUBMAP : Natural := 16#1c#; + constant C_TOP_ARRAY_OF_SUBMAPS_0_SUBMAP_SIZE : Natural := 4; + constant C_TOP_ARRAY_OF_SUBMAPS_1_ADDR : Natural := 16#4#; + constant C_ADDR_MASK_TOP_ARRAY_OF_SUBMAPS_1 : Natural := 16#1c#; + constant C_ADDR_FMASK_TOP_ARRAY_OF_SUBMAPS_1 : Natural := 16#1c#; + constant C_TOP_ARRAY_OF_SUBMAPS_1_SIZE : Natural := 4; + constant C_TOP_ARRAY_OF_SUBMAPS_1_SUBMAP_ADDR : Natural := 16#4#; + constant C_ADDR_MASK_TOP_ARRAY_OF_SUBMAPS_1_SUBMAP : Natural := 16#1c#; + constant C_ADDR_FMASK_TOP_ARRAY_OF_SUBMAPS_1_SUBMAP : Natural := 16#1c#; + constant C_TOP_ARRAY_OF_SUBMAPS_1_SUBMAP_SIZE : Natural := 4; + constant C_TOP_ARRAY_OF_SUBMAPS_2_ADDR : Natural := 16#8#; + constant C_ADDR_MASK_TOP_ARRAY_OF_SUBMAPS_2 : Natural := 16#1c#; + constant C_ADDR_FMASK_TOP_ARRAY_OF_SUBMAPS_2 : Natural := 16#1c#; + constant C_TOP_ARRAY_OF_SUBMAPS_2_SIZE : Natural := 4; + constant C_TOP_ARRAY_OF_SUBMAPS_2_SUBMAP_ADDR : Natural := 16#8#; + constant C_ADDR_MASK_TOP_ARRAY_OF_SUBMAPS_2_SUBMAP : Natural := 16#1c#; + constant C_ADDR_FMASK_TOP_ARRAY_OF_SUBMAPS_2_SUBMAP : Natural := 16#1c#; + constant C_TOP_ARRAY_OF_SUBMAPS_2_SUBMAP_SIZE : Natural := 4; + constant C_TOP_ARRAY_OF_SUBMAPS_3_ADDR : Natural := 16#c#; + constant C_ADDR_MASK_TOP_ARRAY_OF_SUBMAPS_3 : Natural := 16#1c#; + constant C_ADDR_FMASK_TOP_ARRAY_OF_SUBMAPS_3 : Natural := 16#1c#; + constant C_TOP_ARRAY_OF_SUBMAPS_3_SIZE : Natural := 4; + constant C_TOP_ARRAY_OF_SUBMAPS_3_SUBMAP_ADDR : Natural := 16#c#; + constant C_ADDR_MASK_TOP_ARRAY_OF_SUBMAPS_3_SUBMAP : Natural := 16#1c#; + constant C_ADDR_FMASK_TOP_ARRAY_OF_SUBMAPS_3_SUBMAP : Natural := 16#1c#; + constant C_TOP_ARRAY_OF_SUBMAPS_3_SUBMAP_SIZE : Natural := 4; + constant C_TOP_ARRAY_OF_SUBMAPS_4_ADDR : Natural := 16#10#; + constant C_ADDR_MASK_TOP_ARRAY_OF_SUBMAPS_4 : Natural := 16#1c#; + constant C_ADDR_FMASK_TOP_ARRAY_OF_SUBMAPS_4 : Natural := 16#1c#; + constant C_TOP_ARRAY_OF_SUBMAPS_4_SIZE : Natural := 4; + constant C_TOP_ARRAY_OF_SUBMAPS_4_SUBMAP_ADDR : Natural := 16#10#; + constant C_ADDR_MASK_TOP_ARRAY_OF_SUBMAPS_4_SUBMAP : Natural := 16#1c#; + constant C_ADDR_FMASK_TOP_ARRAY_OF_SUBMAPS_4_SUBMAP : Natural := 16#1c#; + constant C_TOP_ARRAY_OF_SUBMAPS_4_SUBMAP_SIZE : Natural := 4; end package top_consts_pkg; diff --git a/testfiles/issue64/simple_reg1-consts.vhdl-ohwr b/testfiles/issue64/simple_reg1-consts.vhdl-ohwr index 974f642a..6a5be41b 100644 --- a/testfiles/issue64/simple_reg1-consts.vhdl-ohwr +++ b/testfiles/issue64/simple_reg1-consts.vhdl-ohwr @@ -2,6 +2,6 @@ library ieee; use ieee.std_logic_1164.all; package sreg_map_consts_pkg is - constant c_SREG_SIZE : Natural := 4; - constant c_SREG_AREG_ADDR : Natural := 16#0#; + constant C_SREG_SIZE : Natural := 4; + constant C_SREG_AREG_ADDR : Natural := 16#0#; end package sreg_map_consts_pkg; diff --git a/testfiles/issue_g2/reg-consts.vhdl-ohwr b/testfiles/issue_g2/reg-consts.vhdl-ohwr index 7cc3f05b..ff8c638e 100644 --- a/testfiles/issue_g2/reg-consts.vhdl-ohwr +++ b/testfiles/issue_g2/reg-consts.vhdl-ohwr @@ -2,20 +2,20 @@ library ieee; use ieee.std_logic_1164.all; package header_block_consts_pkg is - constant c_HEADER_BLOCK_SIZE : Natural := 8; - constant c_HEADER_BLOCK_REG_000_DRAWING_NUMBER_ADDR : Natural := 16#0#; - constant c_HEADER_BLOCK_REG_000_DRAWING_NUMBER_PRESET : std_logic_vector(32-1 downto 0) := x"08000101"; - constant c_HEADER_BLOCK_REG_001_VERSION_REVISION_ADDR : Natural := 16#4#; - constant c_ADDR_HEADER_BLOCK_REG_001_VERSION_REVISION_VERSION : Natural := 16#4#; - constant c_HEADER_BLOCK_REG_001_VERSION_REVISION_VERSION_WIDTH : Natural := 4; - constant c_HEADER_BLOCK_REG_001_VERSION_REVISION_VERSION_OFFSET : Natural := 0; - constant c_HEADER_BLOCK_REG_001_VERSION_REVISION_VERSION_PRESET : std_logic_vector(4-1 downto 0) := x"1"; - constant c_ADDR_HEADER_BLOCK_REG_001_VERSION_REVISION_REVISION : Natural := 16#4#; - constant c_HEADER_BLOCK_REG_001_VERSION_REVISION_REVISION_WIDTH : Natural := 8; - constant c_HEADER_BLOCK_REG_001_VERSION_REVISION_REVISION_OFFSET : Natural := 4; - constant c_HEADER_BLOCK_REG_001_VERSION_REVISION_REVISION_PRESET : std_logic_vector(8-1 downto 0) := x"00"; - constant c_ADDR_HEADER_BLOCK_REG_001_VERSION_REVISION_BUILD_DATE : Natural := 16#4#; - constant c_HEADER_BLOCK_REG_001_VERSION_REVISION_BUILD_DATE_WIDTH : Natural := 20; - constant c_HEADER_BLOCK_REG_001_VERSION_REVISION_BUILD_DATE_OFFSET : Natural := 12; - constant c_HEADER_BLOCK_REG_001_VERSION_REVISION_BUILD_DATE_PRESET : std_logic_vector(20-1 downto 0) := x"3840f"; + constant C_HEADER_BLOCK_SIZE : Natural := 8; + constant C_HEADER_BLOCK_REG_000_DRAWING_NUMBER_ADDR : Natural := 16#0#; + constant C_HEADER_BLOCK_REG_000_DRAWING_NUMBER_PRESET : std_logic_vector(32-1 downto 0) := x"08000101"; + constant C_HEADER_BLOCK_REG_001_VERSION_REVISION_ADDR : Natural := 16#4#; + constant C_ADDR_HEADER_BLOCK_REG_001_VERSION_REVISION_VERSION : Natural := 16#4#; + constant C_HEADER_BLOCK_REG_001_VERSION_REVISION_VERSION_WIDTH : Natural := 4; + constant C_HEADER_BLOCK_REG_001_VERSION_REVISION_VERSION_OFFSET : Natural := 0; + constant C_HEADER_BLOCK_REG_001_VERSION_REVISION_VERSION_PRESET : std_logic_vector(4-1 downto 0) := x"1"; + constant C_ADDR_HEADER_BLOCK_REG_001_VERSION_REVISION_REVISION : Natural := 16#4#; + constant C_HEADER_BLOCK_REG_001_VERSION_REVISION_REVISION_WIDTH : Natural := 8; + constant C_HEADER_BLOCK_REG_001_VERSION_REVISION_REVISION_OFFSET : Natural := 4; + constant C_HEADER_BLOCK_REG_001_VERSION_REVISION_REVISION_PRESET : std_logic_vector(8-1 downto 0) := x"00"; + constant C_ADDR_HEADER_BLOCK_REG_001_VERSION_REVISION_BUILD_DATE : Natural := 16#4#; + constant C_HEADER_BLOCK_REG_001_VERSION_REVISION_BUILD_DATE_WIDTH : Natural := 20; + constant C_HEADER_BLOCK_REG_001_VERSION_REVISION_BUILD_DATE_OFFSET : Natural := 12; + constant C_HEADER_BLOCK_REG_001_VERSION_REVISION_BUILD_DATE_PRESET : std_logic_vector(20-1 downto 0) := x"3840f"; end package header_block_consts_pkg; diff --git a/testfiles/mr67/top-consts.vhdl-ohwr b/testfiles/mr67/top-consts.vhdl-ohwr index 9b139065..86ae3b1d 100644 --- a/testfiles/mr67/top-consts.vhdl-ohwr +++ b/testfiles/mr67/top-consts.vhdl-ohwr @@ -2,9 +2,9 @@ library ieee; use ieee.std_logic_1164.all; package fid_top_axi_consts_pkg is - constant c_FID_TOP_AXI_MEMMAP_VERSION : Natural := 16#100#; - constant c_FID_TOP_AXI_IP_ADDR : Natural := 16#0#; - constant c_ADDR_MASK_FID_TOP_AXI_IP : Natural := 16#0#; - constant c_ADDR_FMASK_FID_TOP_AXI_IP : Natural := 16#0#; - constant c_FID_TOP_AXI_IP_SIZE : Natural := 4; + constant C_FID_TOP_AXI_MEMMAP_VERSION : Natural := 16#100#; + constant C_FID_TOP_AXI_IP_ADDR : Natural := 16#0#; + constant C_ADDR_MASK_FID_TOP_AXI_IP : Natural := 16#0#; + constant C_ADDR_FMASK_FID_TOP_AXI_IP : Natural := 16#0#; + constant C_FID_TOP_AXI_IP_SIZE : Natural := 4; end package fid_top_axi_consts_pkg;