diff options
| author | Tristan Gingold <tgingold@free.fr> | 2019-10-06 20:24:30 +0200 |
|---|---|---|
| committer | Tristan Gingold <tgingold@free.fr> | 2019-10-06 20:24:30 +0200 |
| commit | 693c4af7ef3d6d250bef95becec0092d4c81213c (patch) | |
| tree | 617c1b975c58fd409640e69e8c82ce5fa620ed76 | |
| parent | be9cdfbbe25b64ee587ba3316898fcc988830c0a (diff) | |
| download | ghdl-693c4af7ef3d6d250bef95becec0092d4c81213c.tar.gz ghdl-693c4af7ef3d6d250bef95becec0092d4c81213c.tar.bz2 ghdl-693c4af7ef3d6d250bef95becec0092d4c81213c.zip | |
synth: revert patch on synth_subprogram_association.
| -rw-r--r-- | src/synth/synth-oper.adb | 2 | ||||
| -rw-r--r-- | src/synth/synth-stmts.adb | 8 | ||||
| -rw-r--r-- | src/synth/synth-stmts.ads | 2 |
3 files changed, 4 insertions, 8 deletions
diff --git a/src/synth/synth-oper.adb b/src/synth/synth-oper.adb index cf0aafb9a..fbd345be0 100644 --- a/src/synth/synth-oper.adb +++ b/src/synth/synth-oper.adb @@ -970,7 +970,7 @@ package body Synth.Oper is Subprg_Inst := Make_Instance (Syn_Inst, Imp); Synth_Subprogram_Association - (Subprg_Inst, Syn_Inst, Syn_Inst, Inter_Chain, Assoc_Chain); + (Subprg_Inst, Syn_Inst, Inter_Chain, Assoc_Chain); Param1 := Inter_Chain; if Param1 /= Null_Node then diff --git a/src/synth/synth-stmts.adb b/src/synth/synth-stmts.adb index a9cc0d377..32dfd8631 100644 --- a/src/synth/synth-stmts.adb +++ b/src/synth/synth-stmts.adb @@ -1211,7 +1211,6 @@ package body Synth.Stmts is end Synth_Selected_Signal_Assignment; procedure Synth_Subprogram_Association (Subprg_Inst : Synth_Instance_Acc; - Inter_Inst : Synth_Instance_Acc; Caller_Inst : Synth_Instance_Acc; Inter_Chain : Node; Assoc_Chain : Node; @@ -1233,7 +1232,7 @@ package body Synth.Stmts is Assoc_Inter := Inter_Chain; while Is_Valid (Assoc) loop Inter := Get_Association_Interface (Assoc, Assoc_Inter); - Inter_Type := Get_Value_Type (Inter_Inst, Get_Type (Inter)); + Inter_Type := Get_Value_Type (Caller_Inst, Get_Type (Inter)); case Iir_Parameter_Modes (Get_Mode (Inter)) is when Iir_In_Mode => @@ -1296,7 +1295,6 @@ package body Synth.Stmts is end Synth_Subprogram_Association; procedure Synth_Subprogram_Association (Subprg_Inst : Synth_Instance_Acc; - Inter_Inst : Synth_Instance_Acc; Caller_Inst : Synth_Instance_Acc; Inter_Chain : Node; Assoc_Chain : Node) @@ -1304,7 +1302,7 @@ package body Synth.Stmts is Infos : Target_Info_Array (1 .. 0); pragma Unreferenced (Infos); begin - Synth_Subprogram_Association (Subprg_Inst, Inter_Inst, Caller_Inst, + Synth_Subprogram_Association (Subprg_Inst, Caller_Inst, Inter_Chain, Assoc_Chain, Infos); end Synth_Subprogram_Association; @@ -1416,7 +1414,7 @@ package body Synth.Stmts is Infos : Target_Info_Array (1 .. Nbr_Inout); begin Synth_Subprogram_Association - (C.Inst, Syn_Inst, Syn_Inst, Inter_Chain, Assoc_Chain, Infos); + (C.Inst, Syn_Inst, Inter_Chain, Assoc_Chain, Infos); Push_Phi; diff --git a/src/synth/synth-stmts.ads b/src/synth/synth-stmts.ads index a09472168..aed471c03 100644 --- a/src/synth/synth-stmts.ads +++ b/src/synth/synth-stmts.ads @@ -28,9 +28,7 @@ with Synth.Context; use Synth.Context; with Synth.Environment; use Synth.Environment; package Synth.Stmts is - -- INTER_INST is the instance for the types of the formals. procedure Synth_Subprogram_Association (Subprg_Inst : Synth_Instance_Acc; - Inter_Inst : Synth_Instance_Acc; Caller_Inst : Synth_Instance_Acc; Inter_Chain : Node; Assoc_Chain : Node); |