aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTristan Gingold <tgingold@free.fr>2017-09-13 05:40:40 +0200
committerTristan Gingold <tgingold@free.fr>2017-09-13 05:40:40 +0200
commit55c7ed6ce973af64e0d79fcd1e98a74647814980 (patch)
tree82bbb8afc10cdb10340371b7c614b6ecbcace103
parentf1f62bdb353292a3ec438997644f479351b91dbe (diff)
downloadghdl-55c7ed6ce973af64e0d79fcd1e98a74647814980.tar.gz
ghdl-55c7ed6ce973af64e0d79fcd1e98a74647814980.tar.bz2
ghdl-55c7ed6ce973af64e0d79fcd1e98a74647814980.zip
Rename In_Conversion/Out_Conversion to Actual_Conversion/Formal_Conversion.
-rw-r--r--src/vhdl/canon.adb10
-rw-r--r--src/vhdl/disp_vhdl.adb4
-rw-r--r--src/vhdl/iirs.adb32
-rw-r--r--src/vhdl/iirs.ads12
-rw-r--r--src/vhdl/nodes_meta.adb44
-rw-r--r--src/vhdl/nodes_meta.ads8
-rw-r--r--src/vhdl/sem.adb14
-rw-r--r--src/vhdl/sem_assocs.adb26
-rw-r--r--src/vhdl/translate/trans-chap4.adb12
-rw-r--r--src/vhdl/translate/trans-chap5.adb12
-rw-r--r--src/vhdl/translate/trans-chap8.adb4
-rw-r--r--src/vhdl/translate/trans-chap9.adb2
12 files changed, 91 insertions, 89 deletions
diff --git a/src/vhdl/canon.adb b/src/vhdl/canon.adb
index 96f8e02c7..9fdcc66a3 100644
--- a/src/vhdl/canon.adb
+++ b/src/vhdl/canon.adb
@@ -2346,10 +2346,12 @@ package body Canon is
null;
when Iir_Kind_Association_Element_By_Expression =>
Set_Actual (El, Sem_Inst.Copy_Tree (Get_Actual (Assoc)));
- Set_In_Conversion
- (El, Sem_Inst.Copy_Tree (Get_In_Conversion (Assoc)));
- Set_Out_Conversion
- (El, Sem_Inst.Copy_Tree (Get_Out_Conversion (Assoc)));
+ Set_Actual_Conversion
+ (El,
+ Sem_Inst.Copy_Tree (Get_Actual_Conversion (Assoc)));
+ Set_Formal_Conversion
+ (El,
+ Sem_Inst.Copy_Tree (Get_Formal_Conversion (Assoc)));
Set_Collapse_Signal_Flag
(Assoc,
Sem.Can_Collapse_Signals (Assoc, Get_Formal (Assoc)));
diff --git a/src/vhdl/disp_vhdl.adb b/src/vhdl/disp_vhdl.adb
index 603c41879..90810c4ac 100644
--- a/src/vhdl/disp_vhdl.adb
+++ b/src/vhdl/disp_vhdl.adb
@@ -2395,7 +2395,7 @@ package body Disp_Vhdl is
-- Formal part.
if Get_Kind (El) = Iir_Kind_Association_Element_By_Expression then
- Conv := Get_Out_Conversion (El);
+ Conv := Get_Formal_Conversion (El);
if Conv /= Null_Iir then
Disp_Conversion (Conv);
Put (" (");
@@ -2431,7 +2431,7 @@ package body Disp_Vhdl is
| Iir_Kind_Association_Element_Subprogram =>
Disp_Name (Get_Actual (El));
when others =>
- Conv := Get_In_Conversion (El);
+ Conv := Get_Actual_Conversion (El);
if Conv /= Null_Iir then
Disp_Conversion (Conv);
Put (" (");
diff --git a/src/vhdl/iirs.adb b/src/vhdl/iirs.adb
index bafcbc6e0..8c3b74987 100644
--- a/src/vhdl/iirs.adb
+++ b/src/vhdl/iirs.adb
@@ -1345,37 +1345,37 @@ package body Iirs is
Set_Field3 (Target, Actual);
end Set_Actual;
- function Get_In_Conversion (Target : Iir) return Iir is
+ function Get_Actual_Conversion (Target : Iir) return Iir is
begin
pragma Assert (Target /= Null_Iir);
- pragma Assert (Has_In_Conversion (Get_Kind (Target)),
- "no field In_Conversion");
+ pragma Assert (Has_Actual_Conversion (Get_Kind (Target)),
+ "no field Actual_Conversion");
return Get_Field4 (Target);
- end Get_In_Conversion;
+ end Get_Actual_Conversion;
- procedure Set_In_Conversion (Target : Iir; Conv : Iir) is
+ procedure Set_Actual_Conversion (Target : Iir; Conv : Iir) is
begin
pragma Assert (Target /= Null_Iir);
- pragma Assert (Has_In_Conversion (Get_Kind (Target)),
- "no field In_Conversion");
+ pragma Assert (Has_Actual_Conversion (Get_Kind (Target)),
+ "no field Actual_Conversion");
Set_Field4 (Target, Conv);
- end Set_In_Conversion;
+ end Set_Actual_Conversion;
- function Get_Out_Conversion (Target : Iir) return Iir is
+ function Get_Formal_Conversion (Target : Iir) return Iir is
begin
pragma Assert (Target /= Null_Iir);
- pragma Assert (Has_Out_Conversion (Get_Kind (Target)),
- "no field Out_Conversion");
+ pragma Assert (Has_Formal_Conversion (Get_Kind (Target)),
+ "no field Formal_Conversion");
return Get_Field5 (Target);
- end Get_Out_Conversion;
+ end Get_Formal_Conversion;
- procedure Set_Out_Conversion (Target : Iir; Conv : Iir) is
+ procedure Set_Formal_Conversion (Target : Iir; Conv : Iir) is
begin
pragma Assert (Target /= Null_Iir);
- pragma Assert (Has_Out_Conversion (Get_Kind (Target)),
- "no field Out_Conversion");
+ pragma Assert (Has_Formal_Conversion (Get_Kind (Target)),
+ "no field Formal_Conversion");
Set_Field5 (Target, Conv);
- end Set_Out_Conversion;
+ end Set_Formal_Conversion;
function Get_Whole_Association_Flag (Target : Iir) return Boolean is
begin
diff --git a/src/vhdl/iirs.ads b/src/vhdl/iirs.ads
index 977a9e646..53d28cecf 100644
--- a/src/vhdl/iirs.ads
+++ b/src/vhdl/iirs.ads
@@ -445,14 +445,14 @@ package Iirs is
-- A function call or a type conversion for the actual.
-- FIXME: should be a name ?
-- Only for Iir_Kind_Association_Element_By_Expression:
- -- Get/Set_In_Conversion (Field4)
+ -- Get/Set_Actual_Conversion (Field4)
--
-- Only for Iir_Kind_Association_Element_Type:
-- Get/Set_Subprogram_Association_Chain (Field4)
--
-- A function call or a type conversion for the formal.
-- Only for Iir_Kind_Association_Element_By_Expression:
- -- Get/Set_Out_Conversion (Field5)
+ -- Get/Set_Formal_Conversion (Field5)
--
-- Owner of Actual_Type if needed.
-- Only for Iir_Kind_Association_Element_By_Individual:
@@ -5976,12 +5976,12 @@ package Iirs is
procedure Set_Actual (Target : Iir; Actual : Iir);
-- Field: Field4
- function Get_In_Conversion (Target : Iir) return Iir;
- procedure Set_In_Conversion (Target : Iir; Conv : Iir);
+ function Get_Actual_Conversion (Target : Iir) return Iir;
+ procedure Set_Actual_Conversion (Target : Iir; Conv : Iir);
-- Field: Field5
- function Get_Out_Conversion (Target : Iir) return Iir;
- procedure Set_Out_Conversion (Target : Iir; Conv : Iir);
+ function Get_Formal_Conversion (Target : Iir) return Iir;
+ procedure Set_Formal_Conversion (Target : Iir; Conv : Iir);
-- This flag is set when the formal is associated in whole (ie, not
-- individually).
diff --git a/src/vhdl/nodes_meta.adb b/src/vhdl/nodes_meta.adb
index 592fe37bd..d5aeba314 100644
--- a/src/vhdl/nodes_meta.adb
+++ b/src/vhdl/nodes_meta.adb
@@ -66,8 +66,8 @@ package body Nodes_Meta is
Field_Designated_Entity => Type_Iir,
Field_Formal => Type_Iir,
Field_Actual => Type_Iir,
- Field_In_Conversion => Type_Iir,
- Field_Out_Conversion => Type_Iir,
+ Field_Actual_Conversion => Type_Iir,
+ Field_Formal_Conversion => Type_Iir,
Field_Whole_Association_Flag => Type_Boolean,
Field_Collapse_Signal_Flag => Type_Boolean,
Field_Artificial_Flag => Type_Boolean,
@@ -445,10 +445,10 @@ package body Nodes_Meta is
return "formal";
when Field_Actual =>
return "actual";
- when Field_In_Conversion =>
- return "in_conversion";
- when Field_Out_Conversion =>
- return "out_conversion";
+ when Field_Actual_Conversion =>
+ return "actual_conversion";
+ when Field_Formal_Conversion =>
+ return "formal_conversion";
when Field_Whole_Association_Flag =>
return "whole_association_flag";
when Field_Collapse_Signal_Flag =>
@@ -1637,9 +1637,9 @@ package body Nodes_Meta is
return Attr_None;
when Field_Actual =>
return Attr_None;
- when Field_In_Conversion =>
+ when Field_Actual_Conversion =>
return Attr_None;
- when Field_Out_Conversion =>
+ when Field_Formal_Conversion =>
return Attr_None;
when Field_Whole_Association_Flag =>
return Attr_None;
@@ -2317,8 +2317,8 @@ package body Nodes_Meta is
Field_Formal,
Field_Chain,
Field_Actual,
- Field_In_Conversion,
- Field_Out_Conversion,
+ Field_Actual_Conversion,
+ Field_Formal_Conversion,
-- Iir_Kind_Association_Element_By_Individual
Field_Whole_Association_Flag,
Field_Collapse_Signal_Flag,
@@ -5014,10 +5014,10 @@ package body Nodes_Meta is
return Get_Formal (N);
when Field_Actual =>
return Get_Actual (N);
- when Field_In_Conversion =>
- return Get_In_Conversion (N);
- when Field_Out_Conversion =>
- return Get_Out_Conversion (N);
+ when Field_Actual_Conversion =>
+ return Get_Actual_Conversion (N);
+ when Field_Formal_Conversion =>
+ return Get_Formal_Conversion (N);
when Field_We_Value =>
return Get_We_Value (N);
when Field_Time =>
@@ -5412,10 +5412,10 @@ package body Nodes_Meta is
Set_Formal (N, V);
when Field_Actual =>
Set_Actual (N, V);
- when Field_In_Conversion =>
- Set_In_Conversion (N, V);
- when Field_Out_Conversion =>
- Set_Out_Conversion (N, V);
+ when Field_Actual_Conversion =>
+ Set_Actual_Conversion (N, V);
+ when Field_Formal_Conversion =>
+ Set_Formal_Conversion (N, V);
when Field_We_Value =>
Set_We_Value (N, V);
when Field_Time =>
@@ -6847,15 +6847,15 @@ package body Nodes_Meta is
end case;
end Has_Actual;
- function Has_In_Conversion (K : Iir_Kind) return Boolean is
+ function Has_Actual_Conversion (K : Iir_Kind) return Boolean is
begin
return K = Iir_Kind_Association_Element_By_Expression;
- end Has_In_Conversion;
+ end Has_Actual_Conversion;
- function Has_Out_Conversion (K : Iir_Kind) return Boolean is
+ function Has_Formal_Conversion (K : Iir_Kind) return Boolean is
begin
return K = Iir_Kind_Association_Element_By_Expression;
- end Has_Out_Conversion;
+ end Has_Formal_Conversion;
function Has_Whole_Association_Flag (K : Iir_Kind) return Boolean is
begin
diff --git a/src/vhdl/nodes_meta.ads b/src/vhdl/nodes_meta.ads
index a67db7f2e..a9da54d68 100644
--- a/src/vhdl/nodes_meta.ads
+++ b/src/vhdl/nodes_meta.ads
@@ -106,8 +106,8 @@ package Nodes_Meta is
Field_Designated_Entity,
Field_Formal,
Field_Actual,
- Field_In_Conversion,
- Field_Out_Conversion,
+ Field_Actual_Conversion,
+ Field_Formal_Conversion,
Field_Whole_Association_Flag,
Field_Collapse_Signal_Flag,
Field_Artificial_Flag,
@@ -612,8 +612,8 @@ package Nodes_Meta is
function Has_Designated_Entity (K : Iir_Kind) return Boolean;
function Has_Formal (K : Iir_Kind) return Boolean;
function Has_Actual (K : Iir_Kind) return Boolean;
- function Has_In_Conversion (K : Iir_Kind) return Boolean;
- function Has_Out_Conversion (K : Iir_Kind) return Boolean;
+ function Has_Actual_Conversion (K : Iir_Kind) return Boolean;
+ function Has_Formal_Conversion (K : Iir_Kind) return Boolean;
function Has_Whole_Association_Flag (K : Iir_Kind) return Boolean;
function Has_Collapse_Signal_Flag (K : Iir_Kind) return Boolean;
function Has_Artificial_Flag (K : Iir_Kind) return Boolean;
diff --git a/src/vhdl/sem.adb b/src/vhdl/sem.adb
index 82738da07..6fa2f3ac6 100644
--- a/src/vhdl/sem.adb
+++ b/src/vhdl/sem.adb
@@ -261,8 +261,8 @@ package body Sem is
-- the same, and sharing is not possible.
-- FIXME: optimize type conversions
-- (unsigned <-> signed <-> std_ulogic_vector <-> ...)
- if Get_In_Conversion (Assoc) /= Null_Iir
- or else Get_Out_Conversion (Assoc) /= Null_Iir
+ if Get_Actual_Conversion (Assoc) /= Null_Iir
+ or else Get_Formal_Conversion (Assoc) /= Null_Iir
then
return False;
end if;
@@ -552,7 +552,7 @@ package body Sem is
-- Expression.
Set_Collapse_Signal_Flag (Assoc, False);
- pragma Assert (Is_Null (Get_In_Conversion (Assoc)));
+ pragma Assert (Is_Null (Get_Actual_Conversion (Assoc)));
if Flags.Vhdl_Std >= Vhdl_93c then
-- LRM93 1.1.1.2 Ports
-- Moreover, the ports of a block may be associated
@@ -1467,10 +1467,10 @@ package body Sem is
when Iir_Kind_Association_Element_By_Expression =>
return Are_Trees_Equal (Get_Actual (Left), Get_Actual (Right))
and then Are_Trees_Equal (Get_Formal (Left), Get_Formal (Right))
- and then Are_Trees_Equal (Get_In_Conversion (Left),
- Get_In_Conversion (Right))
- and then Are_Trees_Equal (Get_Out_Conversion (Left),
- Get_Out_Conversion (Right));
+ and then Are_Trees_Equal (Get_Actual_Conversion (Left),
+ Get_Actual_Conversion (Right))
+ and then Are_Trees_Equal (Get_Formal_Conversion (Left),
+ Get_Formal_Conversion (Right));
when Iir_Kind_Type_Conversion =>
return Are_Trees_Equal (Get_Type_Mark (Left),
diff --git a/src/vhdl/sem_assocs.adb b/src/vhdl/sem_assocs.adb
index a00deaa26..d9fb47add 100644
--- a/src/vhdl/sem_assocs.adb
+++ b/src/vhdl/sem_assocs.adb
@@ -324,8 +324,8 @@ package body Sem_Assocs is
-- conversion appears in either the formal part or the
-- actual part of an association element that associates
-- an actual signal with a formal signal parameter.
- if Get_In_Conversion (Assoc) /= Null_Iir
- or Get_Out_Conversion (Assoc) /= Null_Iir
+ if Get_Actual_Conversion (Assoc) /= Null_Iir
+ or Get_Formal_Conversion (Assoc) /= Null_Iir
then
Error_Msg_Sem
(+Assoc,
@@ -381,8 +381,8 @@ package body Sem_Assocs is
-- an actual with a formal parameter of a file type and
-- that association element contains a conversion
-- function or type conversion.
- if Get_In_Conversion (Assoc) /= Null_Iir
- or Get_Out_Conversion (Assoc) /= Null_Iir
+ if Get_Actual_Conversion (Assoc) /= Null_Iir
+ or Get_Formal_Conversion (Assoc) /= Null_Iir
then
Error_Msg_Sem (+Assoc, "conversion are not allowed "
& "for file parameters");
@@ -568,8 +568,8 @@ package body Sem_Assocs is
Ftype : constant Iir := Get_Type (Formal);
Atype : constant Iir := Get_Type (Actual);
- F_Conv : constant Iir := Get_Out_Conversion (Assoc);
- A_Conv : constant Iir := Get_In_Conversion (Assoc);
+ F_Conv : constant Iir := Get_Formal_Conversion (Assoc);
+ A_Conv : constant Iir := Get_Actual_Conversion (Assoc);
F2a_Type : Iir;
A2f_Type : Iir;
begin
@@ -1304,7 +1304,7 @@ package body Sem_Assocs is
end if;
Set_Type (Conv, Conv_Type);
- Set_Out_Conversion (Assoc, Conv);
+ Set_Formal_Conversion (Assoc, Conv);
Set_Formal (Assoc, Name);
return Formal;
@@ -1312,8 +1312,8 @@ package body Sem_Assocs is
procedure Revert_Formal_Conversion (Assoc : Iir; Saved_Assoc : Iir) is
begin
- Sem_Name_Clean (Get_Out_Conversion (Assoc));
- Set_Out_Conversion (Assoc, Null_Iir);
+ Sem_Name_Clean (Get_Formal_Conversion (Assoc));
+ Set_Formal_Conversion (Assoc, Null_Iir);
Sem_Name_Clean (Get_Formal (Assoc));
Set_Formal (Assoc, Saved_Assoc);
end Revert_Formal_Conversion;
@@ -2079,7 +2079,7 @@ package body Sem_Assocs is
Set_Whole_Association_Flag (Assoc, Assoc_Kind = Whole);
Formal := Get_Formal (Assoc);
- Out_Conv := Get_Out_Conversion (Assoc);
+ Out_Conv := Get_Formal_Conversion (Assoc);
else
Set_Whole_Association_Flag (Assoc, True);
Out_Conv := Null_Iir;
@@ -2215,7 +2215,7 @@ package body Sem_Assocs is
-- The formal part of a named association element may be in the form of
-- a function call [...] if and only if the formal is an interface
-- object, the mode of the formal is OUT, INOUT, BUFFER or LINKAGE [...]
- Set_Out_Conversion (Assoc, Out_Conv);
+ Set_Formal_Conversion (Assoc, Out_Conv);
if Out_Conv /= Null_Iir
and then Get_Mode (Inter) = Iir_In_Mode
then
@@ -2227,7 +2227,7 @@ package body Sem_Assocs is
-- The actual part of an association element may be in the form of a
-- function call [...] if and only if the mode of the format is IN,
-- INOUT or LINKAGE [...]
- Set_In_Conversion (Assoc, In_Conv);
+ Set_Actual_Conversion (Assoc, In_Conv);
if In_Conv /= Null_Iir
and then Get_Mode (Inter) in Iir_Buffer_Mode .. Iir_Out_Mode
then
@@ -2463,7 +2463,7 @@ package body Sem_Assocs is
if Finish then
-- Free the now unused parenthesis_name.
Free_Parenthesis_Name
- (Saved_Assoc, Get_Out_Conversion (Assoc));
+ (Saved_Assoc, Get_Formal_Conversion (Assoc));
else
Revert_Formal_Conversion (Assoc, Saved_Assoc);
end if;
diff --git a/src/vhdl/translate/trans-chap4.adb b/src/vhdl/translate/trans-chap4.adb
index ba95730a1..1e7ad5fea 100644
--- a/src/vhdl/translate/trans-chap4.adb
+++ b/src/vhdl/translate/trans-chap4.adb
@@ -2643,14 +2643,14 @@ package body Trans.Chap4 is
Push_Identifier_Prefix (Mark2, "CONVIN");
Out_Type := Get_Type (Formal);
In_Type := Get_Type (Actual);
- Imp := Get_In_Conversion (Assoc);
+ Imp := Get_Actual_Conversion (Assoc);
when Conv_Mode_Out =>
-- OUT: from formal to actual.
Push_Identifier_Prefix (Mark2, "CONVOUT");
In_Type := Get_Type (Formal);
Out_Type := Get_Type (Actual);
- Imp := Get_Out_Conversion (Assoc);
+ Imp := Get_Formal_Conversion (Assoc);
end case;
-- FIXME: individual assoc -> overload.
@@ -2930,13 +2930,13 @@ package body Trans.Chap4 is
if Get_Kind (Assoc) = Iir_Kind_Association_Element_By_Expression
then
Info := null;
- if Get_In_Conversion (Assoc) /= Null_Iir then
+ if Get_Actual_Conversion (Assoc) /= Null_Iir then
Info := Add_Info (Assoc, Kind_Assoc);
Translate_Association_Subprogram
(Stmt, Block, Assoc, Inter, Conv_Mode_In, Info.Assoc_In,
Base_Block, Entity);
end if;
- if Get_Out_Conversion (Assoc) /= Null_Iir then
+ if Get_Formal_Conversion (Assoc) /= Null_Iir then
if Info = null then
Info := Add_Info (Assoc, Kind_Assoc);
end if;
@@ -3085,7 +3085,7 @@ package body Trans.Chap4 is
Assoc_Info : constant Assoc_Info_Acc := Get_Info (Assoc);
begin
Elab_Conversion
- (Get_Actual (Assoc), Formal, Get_In_Conversion (Assoc),
+ (Get_Actual (Assoc), Formal, Get_Actual_Conversion (Assoc),
Ghdl_Signal_In_Conversion, Assoc_Info.Assoc_In, Ndest);
end Elab_In_Conversion;
@@ -3097,7 +3097,7 @@ package body Trans.Chap4 is
Assoc_Info : constant Assoc_Info_Acc := Get_Info (Assoc);
begin
Elab_Conversion
- (Formal, Get_Actual (Assoc), Get_Out_Conversion (Assoc),
+ (Formal, Get_Actual (Assoc), Get_Formal_Conversion (Assoc),
Ghdl_Signal_Out_Conversion, Assoc_Info.Assoc_Out, Ndest);
end Elab_Out_Conversion;
diff --git a/src/vhdl/translate/trans-chap5.adb b/src/vhdl/translate/trans-chap5.adb
index ab0e696fa..ac054f394 100644
--- a/src/vhdl/translate/trans-chap5.adb
+++ b/src/vhdl/translate/trans-chap5.adb
@@ -378,8 +378,8 @@ package body Trans.Chap5 is
(Get_Kind (Assoc) = Iir_Kind_Association_Element_By_Expression);
Open_Temp;
- if Get_In_Conversion (Assoc) = Null_Iir
- and then Get_Out_Conversion (Assoc) = Null_Iir
+ if Get_Actual_Conversion (Assoc) = Null_Iir
+ and then Get_Formal_Conversion (Assoc) = Null_Iir
then
-- Usual case: without conversions.
if Is_Signal_Name (Actual) then
@@ -476,7 +476,7 @@ package body Trans.Chap5 is
(Formal_Sig, Formal_Type, Init_Node);
end if;
else
- if Get_In_Conversion (Assoc) /= Null_Iir then
+ if Get_Actual_Conversion (Assoc) /= Null_Iir then
Chap4.Elab_In_Conversion (Assoc, Formal, Actual_Sig);
Set_Map_Env (Formal_Env);
Formal_Sig := Chap6.Translate_Name (Formal, Mode_Signal);
@@ -487,7 +487,7 @@ package body Trans.Chap5 is
Connect (Formal_Sig, Formal_Type, Data);
Set_Map_Env (Actual_Env);
end if;
- if Get_Out_Conversion (Assoc) /= Null_Iir then
+ if Get_Formal_Conversion (Assoc) /= Null_Iir then
-- flow: FORMAL to ACTUAL
Chap4.Elab_Out_Conversion (Assoc, Formal, Formal_Sig);
Set_Map_Env (Actual_Env);
@@ -526,8 +526,8 @@ package body Trans.Chap5 is
is
Actual : constant Iir := Get_Actual (Assoc);
Actual_Type : constant Iir := Get_Type (Actual);
- In_Conv : constant Iir := Get_In_Conversion (Assoc);
- Out_Conv : constant Iir := Get_Out_Conversion (Assoc);
+ In_Conv : constant Iir := Get_Actual_Conversion (Assoc);
+ Out_Conv : constant Iir := Get_Formal_Conversion (Assoc);
function Get_Actual_Bounds (Save : Boolean) return Mnode
is
diff --git a/src/vhdl/translate/trans-chap8.adb b/src/vhdl/translate/trans-chap8.adb
index 29441bca8..2d74663e5 100644
--- a/src/vhdl/translate/trans-chap8.adb
+++ b/src/vhdl/translate/trans-chap8.adb
@@ -2665,7 +2665,7 @@ package body Trans.Chap8 is
In_Conv := Null_Iir;
when Iir_Kind_Association_Element_By_Expression =>
Act := Get_Actual (El);
- In_Conv := Get_In_Conversion (El);
+ In_Conv := Get_Actual_Conversion (El);
when Iir_Kind_Association_Element_By_Individual =>
Actual_Type := Get_Actual_Type (El);
@@ -3216,7 +3216,7 @@ package body Trans.Chap8 is
end case;
end if;
- Out_Conv := Get_Out_Conversion (El);
+ Out_Conv := Get_Formal_Conversion (El);
if Out_Conv = Null_Iir then
Out_Expr := Formal;
Val := M2E (Param);
diff --git a/src/vhdl/translate/trans-chap9.adb b/src/vhdl/translate/trans-chap9.adb
index 8f88ca0ee..2f001666e 100644
--- a/src/vhdl/translate/trans-chap9.adb
+++ b/src/vhdl/translate/trans-chap9.adb
@@ -200,7 +200,7 @@ package body Trans.Chap9 is
while Assoc /= Null_Iir loop
if Get_Kind (Assoc) = Iir_Kind_Association_Element_By_Expression
then
- Conv := Get_In_Conversion (Assoc);
+ Conv := Get_Actual_Conversion (Assoc);
In_Type := Get_Type (Get_Actual (Assoc));
if Conv /= Null_Iir
and then Is_Anonymous_Type_Definition (In_Type)