From 5a868c938d1fc8d185fffdc537fc84661e7f6840 Mon Sep 17 00:00:00 2001 From: Tristan Gingold Date: Wed, 21 Sep 2022 04:07:52 +0200 Subject: synth-vhdl_stmts: refactoring --- src/synth/synth-vhdl_stmts.adb | 397 +++++++++++++++++++++-------------------- 1 file changed, 208 insertions(+), 189 deletions(-) (limited to 'src') diff --git a/src/synth/synth-vhdl_stmts.adb b/src/synth/synth-vhdl_stmts.adb index 2986025b2..837961b8b 100644 --- a/src/synth/synth-vhdl_stmts.adb +++ b/src/synth/synth-vhdl_stmts.adb @@ -1954,14 +1954,16 @@ package body Synth.Vhdl_Stmts is end case; end Info_To_Valtyp; - procedure Synth_Subprogram_Associations (Subprg_Inst : Synth_Instance_Acc; - Caller_Inst : Synth_Instance_Acc; - Init : Association_Iterator_Init) + procedure Synth_Subprogram_Association + (Subprg_Inst : Synth_Instance_Acc; + Caller_Inst : Synth_Instance_Acc; + Inter : Node; + Assoc : Node; + Iterator : in out Association_Iterator) is + pragma Unreferenced (Iterator); Marker : Mark_Type; - Inter : Node; Inter_Type : Node; - Assoc : Node; Actual : Node; Formal : Node; Formal_Base : Valtyp; @@ -1969,218 +1971,235 @@ package body Synth.Vhdl_Stmts is Formal_Offs : Value_Offsets; Formal_Dyn : Dyn_Name; Val : Valtyp; - Iterator : Association_Iterator; Info : Target_Info; Actual_Inst : Synth_Instance_Acc; begin Mark_Expr_Pool (Marker); - Set_Instance_Const (Subprg_Inst, True); - - -- Process in INTER order. - Association_Iterate_Init (Iterator, Init); - loop - Association_Iterate_Next (Iterator, Inter, Assoc); - exit when Inter = Null_Node; - - -- Actual and formal. - Actual_Inst := Caller_Inst; - if Assoc /= Null_Node - and then - Get_Kind (Assoc) = Iir_Kind_Association_Element_By_Individual + -- Actual and formal. + Actual_Inst := Caller_Inst; + if Assoc /= Null_Node + and then Get_Kind (Assoc) = Iir_Kind_Association_Element_By_Individual + then + -- Special case: preliminary individual association. + Formal := Inter; + Actual := Null_Node; + else + if Assoc = Null_Node + or else Get_Kind (Assoc) = Iir_Kind_Association_Element_Open then + -- Missing association or open association: use default value. Formal := Inter; - Actual := Null_Node; - else - if Assoc = Null_Node - or else Get_Kind (Assoc) = Iir_Kind_Association_Element_Open - then - Formal := Inter; - Actual := Get_Default_Value (Inter); - Actual_Inst := Subprg_Inst; - elsif Get_Kind (Assoc) = Iir_Kind_Association_Element_By_Expression - then - if Get_Whole_Association_Flag (Assoc) then - Formal := Inter; - else - Formal := Get_Formal (Assoc); - end if; - Actual := Get_Actual (Assoc); - else + Actual := Get_Default_Value (Inter); + Actual_Inst := Subprg_Inst; + elsif Get_Kind (Assoc) = Iir_Kind_Association_Element_By_Expression + then + -- Normal case: formal and actual. + if Get_Whole_Association_Flag (Assoc) then Formal := Inter; - Actual := Assoc; - end if; - end if; - - if Formal = Inter then - -- Special case for protected type as the slot describes - -- declarations. - Inter_Type := Get_Type (Inter); - if Get_Kind (Inter_Type) = Iir_Kind_Protected_Type_Declaration then - Formal_Typ := Protected_Type; else - Formal_Typ := Get_Subtype_Object (Subprg_Inst, Inter_Type); + Formal := Get_Formal (Assoc); end if; - Formal_Offs := No_Value_Offsets; - Formal_Dyn := No_Dyn_Name; + Actual := Get_Actual (Assoc); else - Synth_Assignment_Prefix - (Caller_Inst, Subprg_Inst, Formal, - Formal_Base, Formal_Typ, Formal_Offs, Formal_Dyn); + -- Just an expression. + Formal := Inter; + Actual := Assoc; end if; + end if; - if Actual = Null_Node then - -- For By_Individual. - Val := Create_Value_Memory (Formal_Typ, Expr_Pool'Access); - elsif Get_Mode (Inter) /= Iir_In_Mode - or else Get_Kind (Inter) = Iir_Kind_Interface_Signal_Declaration - or else Get_Kind (Inter) = Iir_Kind_Interface_File_Declaration - then - Info := Synth_Target (Caller_Inst, Actual); + if Formal = Inter then + -- Special case for protected type as the slot describes + -- declarations. + Inter_Type := Get_Type (Inter); + if Get_Kind (Inter_Type) = Iir_Kind_Protected_Type_Declaration then + Formal_Typ := Protected_Type; else - -- For constants and in variables. - Val := Synth_Expression_With_Type - (Actual_Inst, Actual, Formal_Typ); - if Val = No_Valtyp then - Set_Error (Subprg_Inst); - return; - end if; - Val := Synth_Subtype_Conversion - (Subprg_Inst, Val, Formal_Typ, True, Assoc); - if Val = No_Valtyp then - Set_Error (Subprg_Inst); - return; - end if; - Val := Unshare (Val, Instance_Pool); - Val.Typ := Unshare (Val.Typ, Instance_Pool); - if Get_Instance_Const (Subprg_Inst) - and then not Flags.Flag_Simulation - and then not Is_Static (Val.Val) - then - Set_Instance_Const (Subprg_Inst, False); - end if; + Formal_Typ := Get_Subtype_Object (Subprg_Inst, Inter_Type); end if; + Formal_Offs := No_Value_Offsets; + Formal_Dyn := No_Dyn_Name; + else + -- Individual association. + Synth_Assignment_Prefix + (Caller_Inst, Subprg_Inst, Formal, + Formal_Base, Formal_Typ, Formal_Offs, Formal_Dyn); + pragma Assert (Formal_Dyn = No_Dyn_Name); + end if; - if Formal /= Inter - and then not Get_Whole_Association_Flag (Assoc) + if Actual = Null_Node then + -- For By_Individual. + Val := Create_Value_Memory (Formal_Typ, Expr_Pool'Access); + elsif Get_Mode (Inter) /= Iir_In_Mode + or else Get_Kind (Inter) = Iir_Kind_Interface_Signal_Declaration + or else Get_Kind (Inter) = Iir_Kind_Interface_File_Declaration + then + -- Actual is a reference. + Info := Synth_Target (Caller_Inst, Actual); + else + -- For constants and in variables. + Val := Synth_Expression_With_Type (Actual_Inst, Actual, Formal_Typ); + if Val = No_Valtyp then + Set_Error (Subprg_Inst); + return; + end if; + Val := Synth_Subtype_Conversion + (Subprg_Inst, Val, Formal_Typ, True, Assoc); + if Val = No_Valtyp then + Set_Error (Subprg_Inst); + return; + end if; + Val := Unshare (Val, Instance_Pool); + Val.Typ := Unshare (Val.Typ, Instance_Pool); + if Get_Instance_Const (Subprg_Inst) + and then not Flags.Flag_Simulation + and then not Is_Static (Val.Val) then - raise Internal_Error; + Set_Instance_Const (Subprg_Inst, False); end if; + end if; + + if Formal /= Inter + and then not Get_Whole_Association_Flag (Assoc) + then + raise Internal_Error; + end if; - case Iir_Kinds_Interface_Object_Declaration (Get_Kind (Inter)) is - when Iir_Kind_Interface_Constant_Declaration => - -- Pass by copy. - Create_Object (Subprg_Inst, Inter, Val); - when Iir_Kind_Interface_Variable_Declaration => - -- Always pass by value. - if Is_Copyback_Parameter (Inter) then - -- For the copy back: keep info of formal. - Create_Object (Caller_Inst, Assoc, Info_To_Valtyp (Info)); + case Iir_Kinds_Interface_Object_Declaration (Get_Kind (Inter)) is + when Iir_Kind_Interface_Constant_Declaration => + -- Pass by copy. + Create_Object (Subprg_Inst, Inter, Val); + when Iir_Kind_Interface_Variable_Declaration => + -- Always pass by value. + if Is_Copyback_Parameter (Inter) then + -- For the copy back: keep info of formal. + Create_Object (Caller_Inst, Assoc, Info_To_Valtyp (Info)); + end if; + if Get_Mode (Inter) /= Iir_In_Mode then + if Info.Kind /= Target_Memory + and then Info.Obj.Val.Kind = Value_Memory + then + -- FIXME: the subtype conversion will copy the value, so + -- allocate here in current_pool ? + Val := Create_Value_Memory (Info.Targ_Type, Instance_Pool); + Copy_Memory (Val.Val.Mem, + Info.Obj.Val.Mem + Info.Off.Mem_Off, + Info.Targ_Type.Sz); + elsif Info.Kind = Target_Simple + and then Info.Obj.Val.Kind = Value_File + then + -- For vhdl-87 + Val := Create_Value_File + (Info.Targ_Type, Info.Obj.Val.File, Instance_Pool); + else + Val := Synth_Read (Caller_Inst, Info, Assoc); + Val := Unshare (Val, Instance_Pool); + if not Flags.Flag_Simulation then + Set_Instance_Const (Subprg_Inst, False); + end if; end if; - if Get_Mode (Inter) /= Iir_In_Mode then - if Info.Kind /= Target_Memory - and then Info.Obj.Val.Kind = Value_Memory - then - -- FIXME: the subtype conversion will copy the value, so - -- allocate here in current_pool ? - Val := Create_Value_Memory - (Info.Targ_Type, Instance_Pool); - Copy_Memory (Val.Val.Mem, - Info.Obj.Val.Mem + Info.Off.Mem_Off, - Info.Targ_Type.Sz); - elsif Info.Kind = Target_Simple - and then Info.Obj.Val.Kind = Value_File - then - -- For vhdl-87 - Val := Create_Value_File - (Info.Targ_Type, Info.Obj.Val.File, Instance_Pool); + end if; + if Get_Mode (Inter) /= Iir_Out_Mode then + -- Always passed by value + Val := Synth_Subtype_Conversion + (Subprg_Inst, Val, Formal_Typ, True, Assoc); + Val := Unshare (Val, Instance_Pool); + else + -- Use default value + -- FIXME: also for wires ? + if Val.Val.Kind = Value_Memory then + if Is_Bounded_Type (Formal_Typ) then + Write_Value_Default (Val.Val.Mem, Formal_Typ); else - Val := Synth_Read (Caller_Inst, Info, Assoc); - Val := Unshare (Val, Instance_Pool); - if not Flags.Flag_Simulation then - Set_Instance_Const (Subprg_Inst, False); - end if; + Write_Value_Default (Val.Val.Mem, Val.Typ); end if; end if; - if Get_Mode (Inter) /= Iir_Out_Mode then - -- Always passed by value - Val := Synth_Subtype_Conversion - (Subprg_Inst, Val, Formal_Typ, True, Assoc); - Val := Unshare (Val, Instance_Pool); - else - -- Use default value - -- FIXME: also for wires ? - if Val.Val.Kind = Value_Memory then - if Is_Bounded_Type (Formal_Typ) then - Write_Value_Default (Val.Val.Mem, Formal_Typ); - else - Write_Value_Default (Val.Val.Mem, Val.Typ); - end if; + end if; + Val.Typ := Unshare (Val.Typ, Instance_Pool); + Create_Object (Subprg_Inst, Inter, Val); + when Iir_Kind_Interface_Signal_Declaration => + -- Always pass by reference (use an alias). + if Info.Kind = Target_Memory then + raise Internal_Error; + end if; + if not Flags.Flag_Simulation then + Set_Instance_Const (Subprg_Inst, False); + end if; + Val := Create_Value_Alias + (Info.Obj, Info.Off, Info.Targ_Type, Instance_Pool); + -- LRM08 4.2.2.3 Signal parameters + -- If an actual signal is associated with a signal parameter + -- of mode IN or INOUT, and if the type of the formal is a + -- scalar type, then it is an error if the subtype of the + -- actual is not compatible with the subtype of the formal. + -- Similarly, if an actual signal is associated with a signal + -- parameter of mode OUT or INOUT, and if the type of the + -- actual is a scalar type, then it is an error if the subtype + -- of the formal is not compatible with the subtype of the + -- actual. + if Get_Kind (Get_Type (Inter)) in + Iir_Kinds_Scalar_Type_And_Subtype_Definition + then + if Get_Mode (Inter) in Iir_In_Modes then + if not Is_Scalar_Subtype_Compatible (Val.Typ, Formal_Typ) + then + Error_Msg_Synth + (+Actual, + "scalar subtype of actual is not compatible with " + & "signal formal interface"); end if; end if; - Val.Typ := Unshare (Val.Typ, Instance_Pool); - Create_Object (Subprg_Inst, Inter, Val); - when Iir_Kind_Interface_Signal_Declaration => - -- Always pass by reference (use an alias). - if Info.Kind = Target_Memory then - raise Internal_Error; - end if; - if not Flags.Flag_Simulation then - Set_Instance_Const (Subprg_Inst, False); - end if; - Val := Create_Value_Alias - (Info.Obj, Info.Off, Info.Targ_Type, Instance_Pool); - -- LRM08 4.2.2.3 Signal parameters - -- If an actual signal is associated with a signal parameter - -- of mode IN or INOUT, and if the type of the formal is a - -- scalar type, then it is an error if the subtype of the - -- actual is not compatible with the subtype of the formal. - -- Similarly, if an actual signal is associated with a signal - -- parameter of mode OUT or INOUT, and if the type of the - -- actual is a scalar type, then it is an error if the subtype - -- of the formal is not compatible with the subtype of the - -- actual. - if Get_Kind (Get_Type (Inter)) in - Iir_Kinds_Scalar_Type_And_Subtype_Definition - then - if Get_Mode (Inter) in Iir_In_Modes then - if not Is_Scalar_Subtype_Compatible (Val.Typ, Formal_Typ) - then - Error_Msg_Synth - (+Actual, - "scalar subtype of actual is not compatible with " - & "signal formal interface"); - end if; - end if; - if Get_Mode (Inter) in Iir_Out_Modes then - if not Is_Scalar_Subtype_Compatible (Formal_Typ, Val.Typ) - then - Error_Msg_Synth - (+Actual, - "signal formal interface scalar subtype is not " - & "compatible with of actual subtype"); - end if; + if Get_Mode (Inter) in Iir_Out_Modes then + if not Is_Scalar_Subtype_Compatible (Formal_Typ, Val.Typ) + then + Error_Msg_Synth + (+Actual, + "signal formal interface scalar subtype is not " + & "compatible with of actual subtype"); end if; - else - -- Check matching. - -- This is equivalent to subtype conversion for non-scalar - -- types. - Val := Synth_Subtype_Conversion - (Subprg_Inst, Val, Formal_Typ, True, Assoc); - Val := Unshare (Val, Instance_Pool); end if; - if Val.Typ /= null then - Val.Typ := Unshare (Val.Typ, Instance_Pool); - end if; - Create_Object (Subprg_Inst, Inter, Val); - when Iir_Kind_Interface_File_Declaration => - Val := Info.Obj; - Create_Object (Subprg_Inst, Inter, Val); - when Iir_Kind_Interface_Quantity_Declaration => - raise Internal_Error; - end case; + else + -- Check matching. + -- This is equivalent to subtype conversion for non-scalar + -- types. + Val := Synth_Subtype_Conversion + (Subprg_Inst, Val, Formal_Typ, True, Assoc); + Val := Unshare (Val, Instance_Pool); + end if; + if Val.Typ /= null then + Val.Typ := Unshare (Val.Typ, Instance_Pool); + end if; + Create_Object (Subprg_Inst, Inter, Val); + when Iir_Kind_Interface_File_Declaration => + Val := Info.Obj; + Create_Object (Subprg_Inst, Inter, Val); + when Iir_Kind_Interface_Quantity_Declaration => + raise Internal_Error; + end case; - Release_Expr_Pool (Marker); + Release_Expr_Pool (Marker); + end Synth_Subprogram_Association; + + procedure Synth_Subprogram_Associations (Subprg_Inst : Synth_Instance_Acc; + Caller_Inst : Synth_Instance_Acc; + Init : Association_Iterator_Init) + is + Inter : Node; + Assoc : Node; + Iterator : Association_Iterator; + begin + Set_Instance_Const (Subprg_Inst, True); + + -- Process in INTER order. + Association_Iterate_Init (Iterator, Init); + loop + Association_Iterate_Next (Iterator, Inter, Assoc); + exit when Inter = Null_Node; + + Synth_Subprogram_Association + (Subprg_Inst, Caller_Inst, Inter, Assoc, Iterator); + + exit when Is_Error (Subprg_Inst); end loop; end Synth_Subprogram_Associations; -- cgit v1.2.3 489'>489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 1275 1276 1277 1278 1279 1280 1281