From 978162fa7d0205ca5153960a1588b59b630c373e Mon Sep 17 00:00:00 2001 From: Tristan Gingold Date: Sat, 25 Jul 2020 13:25:33 +0200 Subject: vhdl: adjust hanlding of guard signals for translate. --- src/vhdl/vhdl-nodes_meta.adb | 384 ++++++++++++++++++++++--------------------- 1 file changed, 193 insertions(+), 191 deletions(-) (limited to 'src/vhdl/vhdl-nodes_meta.adb') diff --git a/src/vhdl/vhdl-nodes_meta.adb b/src/vhdl/vhdl-nodes_meta.adb index d400818a8..b9a4a562c 100644 --- a/src/vhdl/vhdl-nodes_meta.adb +++ b/src/vhdl/vhdl-nodes_meta.adb @@ -3568,6 +3568,7 @@ package body Vhdl.Nodes_Meta is Field_File_Open_Kind, -- Iir_Kind_Guard_Signal_Declaration Field_Identifier, + Field_Is_Ref, Field_Has_Active_Flag, Field_Visible_Flag, Field_Use_Flag, @@ -5251,197 +5252,197 @@ package body Vhdl.Nodes_Meta is Iir_Kind_Across_Quantity_Declaration => 926, Iir_Kind_Through_Quantity_Declaration => 942, Iir_Kind_File_Declaration => 957, - Iir_Kind_Guard_Signal_Declaration => 970, - Iir_Kind_Signal_Declaration => 987, - Iir_Kind_Variable_Declaration => 1000, - Iir_Kind_Constant_Declaration => 1014, - Iir_Kind_Iterator_Declaration => 1026, - Iir_Kind_Interface_Constant_Declaration => 1043, - Iir_Kind_Interface_Variable_Declaration => 1059, - Iir_Kind_Interface_Signal_Declaration => 1080, - Iir_Kind_Interface_File_Declaration => 1096, - Iir_Kind_Interface_Quantity_Declaration => 1112, - Iir_Kind_Interface_Terminal_Declaration => 1124, - Iir_Kind_Interface_Type_Declaration => 1135, - Iir_Kind_Interface_Package_Declaration => 1148, - Iir_Kind_Interface_Function_Declaration => 1166, - Iir_Kind_Interface_Procedure_Declaration => 1180, - Iir_Kind_Anonymous_Signal_Declaration => 1189, - Iir_Kind_Signal_Attribute_Declaration => 1192, - Iir_Kind_Identity_Operator => 1196, - Iir_Kind_Negation_Operator => 1200, - Iir_Kind_Absolute_Operator => 1204, - Iir_Kind_Not_Operator => 1208, - Iir_Kind_Implicit_Condition_Operator => 1212, - Iir_Kind_Condition_Operator => 1216, - Iir_Kind_Reduction_And_Operator => 1220, - Iir_Kind_Reduction_Or_Operator => 1224, - Iir_Kind_Reduction_Nand_Operator => 1228, - Iir_Kind_Reduction_Nor_Operator => 1232, - Iir_Kind_Reduction_Xor_Operator => 1236, - Iir_Kind_Reduction_Xnor_Operator => 1240, - Iir_Kind_And_Operator => 1245, - Iir_Kind_Or_Operator => 1250, - Iir_Kind_Nand_Operator => 1255, - Iir_Kind_Nor_Operator => 1260, - Iir_Kind_Xor_Operator => 1265, - Iir_Kind_Xnor_Operator => 1270, - Iir_Kind_Equality_Operator => 1275, - Iir_Kind_Inequality_Operator => 1280, - Iir_Kind_Less_Than_Operator => 1285, - Iir_Kind_Less_Than_Or_Equal_Operator => 1290, - Iir_Kind_Greater_Than_Operator => 1295, - Iir_Kind_Greater_Than_Or_Equal_Operator => 1300, - Iir_Kind_Match_Equality_Operator => 1305, - Iir_Kind_Match_Inequality_Operator => 1310, - Iir_Kind_Match_Less_Than_Operator => 1315, - Iir_Kind_Match_Less_Than_Or_Equal_Operator => 1320, - Iir_Kind_Match_Greater_Than_Operator => 1325, - Iir_Kind_Match_Greater_Than_Or_Equal_Operator => 1330, - Iir_Kind_Sll_Operator => 1335, - Iir_Kind_Sla_Operator => 1340, - Iir_Kind_Srl_Operator => 1345, - Iir_Kind_Sra_Operator => 1350, - Iir_Kind_Rol_Operator => 1355, - Iir_Kind_Ror_Operator => 1360, - Iir_Kind_Addition_Operator => 1365, - Iir_Kind_Substraction_Operator => 1370, - Iir_Kind_Concatenation_Operator => 1375, - Iir_Kind_Multiplication_Operator => 1380, - Iir_Kind_Division_Operator => 1385, - Iir_Kind_Modulus_Operator => 1390, - Iir_Kind_Remainder_Operator => 1395, - Iir_Kind_Exponentiation_Operator => 1400, - Iir_Kind_Function_Call => 1408, - Iir_Kind_Aggregate => 1415, - Iir_Kind_Parenthesis_Expression => 1418, - Iir_Kind_Qualified_Expression => 1422, - Iir_Kind_Type_Conversion => 1427, - Iir_Kind_Allocator_By_Expression => 1432, - Iir_Kind_Allocator_By_Subtype => 1438, - Iir_Kind_Selected_Element => 1446, - Iir_Kind_Dereference => 1451, - Iir_Kind_Implicit_Dereference => 1456, - Iir_Kind_Slice_Name => 1463, - Iir_Kind_Indexed_Name => 1469, - Iir_Kind_Psl_Prev => 1475, - Iir_Kind_Psl_Stable => 1480, - Iir_Kind_Psl_Rose => 1485, - Iir_Kind_Psl_Fell => 1490, - Iir_Kind_Psl_Expression => 1492, - Iir_Kind_Sensitized_Process_Statement => 1513, - Iir_Kind_Process_Statement => 1533, - Iir_Kind_Concurrent_Simple_Signal_Assignment => 1546, - Iir_Kind_Concurrent_Conditional_Signal_Assignment => 1559, - Iir_Kind_Concurrent_Selected_Signal_Assignment => 1573, - Iir_Kind_Concurrent_Assertion_Statement => 1581, - Iir_Kind_Concurrent_Procedure_Call_Statement => 1588, - Iir_Kind_Concurrent_Break_Statement => 1596, - Iir_Kind_Psl_Assert_Directive => 1609, - Iir_Kind_Psl_Assume_Directive => 1620, - Iir_Kind_Psl_Cover_Directive => 1632, - Iir_Kind_Psl_Restrict_Directive => 1643, - Iir_Kind_Block_Statement => 1657, - Iir_Kind_If_Generate_Statement => 1668, - Iir_Kind_Case_Generate_Statement => 1677, - Iir_Kind_For_Generate_Statement => 1686, - Iir_Kind_Component_Instantiation_Statement => 1697, - Iir_Kind_Psl_Default_Clock => 1701, - Iir_Kind_Generate_Statement_Body => 1712, - Iir_Kind_If_Generate_Else_Clause => 1718, - Iir_Kind_Simple_Simultaneous_Statement => 1725, - Iir_Kind_Simultaneous_Null_Statement => 1729, - Iir_Kind_Simultaneous_Procedural_Statement => 1740, - Iir_Kind_Simultaneous_Case_Statement => 1749, - Iir_Kind_Simultaneous_If_Statement => 1758, - Iir_Kind_Simultaneous_Elsif => 1764, - Iir_Kind_Simple_Signal_Assignment_Statement => 1775, - Iir_Kind_Conditional_Signal_Assignment_Statement => 1786, - Iir_Kind_Selected_Waveform_Assignment_Statement => 1798, - Iir_Kind_Null_Statement => 1802, - Iir_Kind_Assertion_Statement => 1809, - Iir_Kind_Report_Statement => 1815, - Iir_Kind_Wait_Statement => 1823, - Iir_Kind_Variable_Assignment_Statement => 1830, - Iir_Kind_Conditional_Variable_Assignment_Statement => 1837, - Iir_Kind_Return_Statement => 1843, - Iir_Kind_For_Loop_Statement => 1854, - Iir_Kind_While_Loop_Statement => 1865, - Iir_Kind_Next_Statement => 1872, - Iir_Kind_Exit_Statement => 1879, - Iir_Kind_Case_Statement => 1887, - Iir_Kind_Procedure_Call_Statement => 1893, - Iir_Kind_Break_Statement => 1900, - Iir_Kind_If_Statement => 1910, - Iir_Kind_Elsif => 1916, - Iir_Kind_Character_Literal => 1924, - Iir_Kind_Simple_Name => 1932, - Iir_Kind_Selected_Name => 1941, - Iir_Kind_Operator_Symbol => 1947, - Iir_Kind_Reference_Name => 1952, - Iir_Kind_External_Constant_Name => 1961, - Iir_Kind_External_Signal_Name => 1970, - Iir_Kind_External_Variable_Name => 1980, - Iir_Kind_Selected_By_All_Name => 1986, - Iir_Kind_Parenthesis_Name => 1991, - Iir_Kind_Package_Pathname => 1995, - Iir_Kind_Absolute_Pathname => 1996, - Iir_Kind_Relative_Pathname => 1997, - Iir_Kind_Pathname_Element => 2002, - Iir_Kind_Base_Attribute => 2004, - Iir_Kind_Subtype_Attribute => 2009, - Iir_Kind_Element_Attribute => 2014, - Iir_Kind_Across_Attribute => 2019, - Iir_Kind_Through_Attribute => 2024, - Iir_Kind_Nature_Reference_Attribute => 2028, - Iir_Kind_Left_Type_Attribute => 2033, - Iir_Kind_Right_Type_Attribute => 2038, - Iir_Kind_High_Type_Attribute => 2043, - Iir_Kind_Low_Type_Attribute => 2048, - Iir_Kind_Ascending_Type_Attribute => 2053, - Iir_Kind_Image_Attribute => 2059, - Iir_Kind_Value_Attribute => 2065, - Iir_Kind_Pos_Attribute => 2071, - Iir_Kind_Val_Attribute => 2077, - Iir_Kind_Succ_Attribute => 2083, - Iir_Kind_Pred_Attribute => 2089, - Iir_Kind_Leftof_Attribute => 2095, - Iir_Kind_Rightof_Attribute => 2101, - Iir_Kind_Signal_Slew_Attribute => 2109, - Iir_Kind_Quantity_Slew_Attribute => 2117, - Iir_Kind_Ramp_Attribute => 2125, - Iir_Kind_Zoh_Attribute => 2133, - Iir_Kind_Ltf_Attribute => 2141, - Iir_Kind_Ztf_Attribute => 2151, - Iir_Kind_Dot_Attribute => 2158, - Iir_Kind_Integ_Attribute => 2165, - Iir_Kind_Above_Attribute => 2173, - Iir_Kind_Quantity_Delayed_Attribute => 2181, - Iir_Kind_Delayed_Attribute => 2190, - Iir_Kind_Stable_Attribute => 2199, - Iir_Kind_Quiet_Attribute => 2208, - Iir_Kind_Transaction_Attribute => 2217, - Iir_Kind_Event_Attribute => 2221, - Iir_Kind_Active_Attribute => 2225, - Iir_Kind_Last_Event_Attribute => 2229, - Iir_Kind_Last_Active_Attribute => 2233, - Iir_Kind_Last_Value_Attribute => 2237, - Iir_Kind_Driving_Attribute => 2241, - Iir_Kind_Driving_Value_Attribute => 2245, - Iir_Kind_Behavior_Attribute => 2245, - Iir_Kind_Structure_Attribute => 2245, - Iir_Kind_Simple_Name_Attribute => 2252, - Iir_Kind_Instance_Name_Attribute => 2257, - Iir_Kind_Path_Name_Attribute => 2262, - Iir_Kind_Left_Array_Attribute => 2269, - Iir_Kind_Right_Array_Attribute => 2276, - Iir_Kind_High_Array_Attribute => 2283, - Iir_Kind_Low_Array_Attribute => 2290, - Iir_Kind_Length_Array_Attribute => 2297, - Iir_Kind_Ascending_Array_Attribute => 2304, - Iir_Kind_Range_Array_Attribute => 2311, - Iir_Kind_Reverse_Range_Array_Attribute => 2318, - Iir_Kind_Attribute_Name => 2327 + Iir_Kind_Guard_Signal_Declaration => 971, + Iir_Kind_Signal_Declaration => 988, + Iir_Kind_Variable_Declaration => 1001, + Iir_Kind_Constant_Declaration => 1015, + Iir_Kind_Iterator_Declaration => 1027, + Iir_Kind_Interface_Constant_Declaration => 1044, + Iir_Kind_Interface_Variable_Declaration => 1060, + Iir_Kind_Interface_Signal_Declaration => 1081, + Iir_Kind_Interface_File_Declaration => 1097, + Iir_Kind_Interface_Quantity_Declaration => 1113, + Iir_Kind_Interface_Terminal_Declaration => 1125, + Iir_Kind_Interface_Type_Declaration => 1136, + Iir_Kind_Interface_Package_Declaration => 1149, + Iir_Kind_Interface_Function_Declaration => 1167, + Iir_Kind_Interface_Procedure_Declaration => 1181, + Iir_Kind_Anonymous_Signal_Declaration => 1190, + Iir_Kind_Signal_Attribute_Declaration => 1193, + Iir_Kind_Identity_Operator => 1197, + Iir_Kind_Negation_Operator => 1201, + Iir_Kind_Absolute_Operator => 1205, + Iir_Kind_Not_Operator => 1209, + Iir_Kind_Implicit_Condition_Operator => 1213, + Iir_Kind_Condition_Operator => 1217, + Iir_Kind_Reduction_And_Operator => 1221, + Iir_Kind_Reduction_Or_Operator => 1225, + Iir_Kind_Reduction_Nand_Operator => 1229, + Iir_Kind_Reduction_Nor_Operator => 1233, + Iir_Kind_Reduction_Xor_Operator => 1237, + Iir_Kind_Reduction_Xnor_Operator => 1241, + Iir_Kind_And_Operator => 1246, + Iir_Kind_Or_Operator => 1251, + Iir_Kind_Nand_Operator => 1256, + Iir_Kind_Nor_Operator => 1261, + Iir_Kind_Xor_Operator => 1266, + Iir_Kind_Xnor_Operator => 1271, + Iir_Kind_Equality_Operator => 1276, + Iir_Kind_Inequality_Operator => 1281, + Iir_Kind_Less_Than_Operator => 1286, + Iir_Kind_Less_Than_Or_Equal_Operator => 1291, + Iir_Kind_Greater_Than_Operator => 1296, + Iir_Kind_Greater_Than_Or_Equal_Operator => 1301, + Iir_Kind_Match_Equality_Operator => 1306, + Iir_Kind_Match_Inequality_Operator => 1311, + Iir_Kind_Match_Less_Than_Operator => 1316, + Iir_Kind_Match_Less_Than_Or_Equal_Operator => 1321, + Iir_Kind_Match_Greater_Than_Operator => 1326, + Iir_Kind_Match_Greater_Than_Or_Equal_Operator => 1331, + Iir_Kind_Sll_Operator => 1336, + Iir_Kind_Sla_Operator => 1341, + Iir_Kind_Srl_Operator => 1346, + Iir_Kind_Sra_Operator => 1351, + Iir_Kind_Rol_Operator => 1356, + Iir_Kind_Ror_Operator => 1361, + Iir_Kind_Addition_Operator => 1366, + Iir_Kind_Substraction_Operator => 1371, + Iir_Kind_Concatenation_Operator => 1376, + Iir_Kind_Multiplication_Operator => 1381, + Iir_Kind_Division_Operator => 1386, + Iir_Kind_Modulus_Operator => 1391, + Iir_Kind_Remainder_Operator => 1396, + Iir_Kind_Exponentiation_Operator => 1401, + Iir_Kind_Function_Call => 1409, + Iir_Kind_Aggregate => 1416, + Iir_Kind_Parenthesis_Expression => 1419, + Iir_Kind_Qualified_Expression => 1423, + Iir_Kind_Type_Conversion => 1428, + Iir_Kind_Allocator_By_Expression => 1433, + Iir_Kind_Allocator_By_Subtype => 1439, + Iir_Kind_Selected_Element => 1447, + Iir_Kind_Dereference => 1452, + Iir_Kind_Implicit_Dereference => 1457, + Iir_Kind_Slice_Name => 1464, + Iir_Kind_Indexed_Name => 1470, + Iir_Kind_Psl_Prev => 1476, + Iir_Kind_Psl_Stable => 1481, + Iir_Kind_Psl_Rose => 1486, + Iir_Kind_Psl_Fell => 1491, + Iir_Kind_Psl_Expression => 1493, + Iir_Kind_Sensitized_Process_Statement => 1514, + Iir_Kind_Process_Statement => 1534, + Iir_Kind_Concurrent_Simple_Signal_Assignment => 1547, + Iir_Kind_Concurrent_Conditional_Signal_Assignment => 1560, + Iir_Kind_Concurrent_Selected_Signal_Assignment => 1574, + Iir_Kind_Concurrent_Assertion_Statement => 1582, + Iir_Kind_Concurrent_Procedure_Call_Statement => 1589, + Iir_Kind_Concurrent_Break_Statement => 1597, + Iir_Kind_Psl_Assert_Directive => 1610, + Iir_Kind_Psl_Assume_Directive => 1621, + Iir_Kind_Psl_Cover_Directive => 1633, + Iir_Kind_Psl_Restrict_Directive => 1644, + Iir_Kind_Block_Statement => 1658, + Iir_Kind_If_Generate_Statement => 1669, + Iir_Kind_Case_Generate_Statement => 1678, + Iir_Kind_For_Generate_Statement => 1687, + Iir_Kind_Component_Instantiation_Statement => 1698, + Iir_Kind_Psl_Default_Clock => 1702, + Iir_Kind_Generate_Statement_Body => 1713, + Iir_Kind_If_Generate_Else_Clause => 1719, + Iir_Kind_Simple_Simultaneous_Statement => 1726, + Iir_Kind_Simultaneous_Null_Statement => 1730, + Iir_Kind_Simultaneous_Procedural_Statement => 1741, + Iir_Kind_Simultaneous_Case_Statement => 1750, + Iir_Kind_Simultaneous_If_Statement => 1759, + Iir_Kind_Simultaneous_Elsif => 1765, + Iir_Kind_Simple_Signal_Assignment_Statement => 1776, + Iir_Kind_Conditional_Signal_Assignment_Statement => 1787, + Iir_Kind_Selected_Waveform_Assignment_Statement => 1799, + Iir_Kind_Null_Statement => 1803, + Iir_Kind_Assertion_Statement => 1810, + Iir_Kind_Report_Statement => 1816, + Iir_Kind_Wait_Statement => 1824, + Iir_Kind_Variable_Assignment_Statement => 1831, + Iir_Kind_Conditional_Variable_Assignment_Statement => 1838, + Iir_Kind_Return_Statement => 1844, + Iir_Kind_For_Loop_Statement => 1855, + Iir_Kind_While_Loop_Statement => 1866, + Iir_Kind_Next_Statement => 1873, + Iir_Kind_Exit_Statement => 1880, + Iir_Kind_Case_Statement => 1888, + Iir_Kind_Procedure_Call_Statement => 1894, + Iir_Kind_Break_Statement => 1901, + Iir_Kind_If_Statement => 1911, + Iir_Kind_Elsif => 1917, + Iir_Kind_Character_Literal => 1925, + Iir_Kind_Simple_Name => 1933, + Iir_Kind_Selected_Name => 1942, + Iir_Kind_Operator_Symbol => 1948, + Iir_Kind_Reference_Name => 1953, + Iir_Kind_External_Constant_Name => 1962, + Iir_Kind_External_Signal_Name => 1971, + Iir_Kind_External_Variable_Name => 1981, + Iir_Kind_Selected_By_All_Name => 1987, + Iir_Kind_Parenthesis_Name => 1992, + Iir_Kind_Package_Pathname => 1996, + Iir_Kind_Absolute_Pathname => 1997, + Iir_Kind_Relative_Pathname => 1998, + Iir_Kind_Pathname_Element => 2003, + Iir_Kind_Base_Attribute => 2005, + Iir_Kind_Subtype_Attribute => 2010, + Iir_Kind_Element_Attribute => 2015, + Iir_Kind_Across_Attribute => 2020, + Iir_Kind_Through_Attribute => 2025, + Iir_Kind_Nature_Reference_Attribute => 2029, + Iir_Kind_Left_Type_Attribute => 2034, + Iir_Kind_Right_Type_Attribute => 2039, + Iir_Kind_High_Type_Attribute => 2044, + Iir_Kind_Low_Type_Attribute => 2049, + Iir_Kind_Ascending_Type_Attribute => 2054, + Iir_Kind_Image_Attribute => 2060, + Iir_Kind_Value_Attribute => 2066, + Iir_Kind_Pos_Attribute => 2072, + Iir_Kind_Val_Attribute => 2078, + Iir_Kind_Succ_Attribute => 2084, + Iir_Kind_Pred_Attribute => 2090, + Iir_Kind_Leftof_Attribute => 2096, + Iir_Kind_Rightof_Attribute => 2102, + Iir_Kind_Signal_Slew_Attribute => 2110, + Iir_Kind_Quantity_Slew_Attribute => 2118, + Iir_Kind_Ramp_Attribute => 2126, + Iir_Kind_Zoh_Attribute => 2134, + Iir_Kind_Ltf_Attribute => 2142, + Iir_Kind_Ztf_Attribute => 2152, + Iir_Kind_Dot_Attribute => 2159, + Iir_Kind_Integ_Attribute => 2166, + Iir_Kind_Above_Attribute => 2174, + Iir_Kind_Quantity_Delayed_Attribute => 2182, + Iir_Kind_Delayed_Attribute => 2191, + Iir_Kind_Stable_Attribute => 2200, + Iir_Kind_Quiet_Attribute => 2209, + Iir_Kind_Transaction_Attribute => 2218, + Iir_Kind_Event_Attribute => 2222, + Iir_Kind_Active_Attribute => 2226, + Iir_Kind_Last_Event_Attribute => 2230, + Iir_Kind_Last_Active_Attribute => 2234, + Iir_Kind_Last_Value_Attribute => 2238, + Iir_Kind_Driving_Attribute => 2242, + Iir_Kind_Driving_Value_Attribute => 2246, + Iir_Kind_Behavior_Attribute => 2246, + Iir_Kind_Structure_Attribute => 2246, + Iir_Kind_Simple_Name_Attribute => 2253, + Iir_Kind_Instance_Name_Attribute => 2258, + Iir_Kind_Path_Name_Attribute => 2263, + Iir_Kind_Left_Array_Attribute => 2270, + Iir_Kind_Right_Array_Attribute => 2277, + Iir_Kind_High_Array_Attribute => 2284, + Iir_Kind_Low_Array_Attribute => 2291, + Iir_Kind_Length_Array_Attribute => 2298, + Iir_Kind_Ascending_Array_Attribute => 2305, + Iir_Kind_Range_Array_Attribute => 2312, + Iir_Kind_Reverse_Range_Array_Attribute => 2319, + Iir_Kind_Attribute_Name => 2328 ); function Get_Fields_First (K : Iir_Kind) return Fields_Index is @@ -12224,6 +12225,7 @@ package body Vhdl.Nodes_Meta is | Iir_Kind_Across_Quantity_Declaration | Iir_Kind_Through_Quantity_Declaration | Iir_Kind_File_Declaration + | Iir_Kind_Guard_Signal_Declaration | Iir_Kind_Signal_Declaration | Iir_Kind_Variable_Declaration | Iir_Kind_Constant_Declaration -- cgit v1.2.3