From fd7ce659ef9b61483dd40419552aa8036fa95bd0 Mon Sep 17 00:00:00 2001
From: Tristan Gingold <tgingold@free.fr>
Date: Sun, 6 Oct 2019 12:59:15 +0200
Subject: netlists: Remove Get_Name renaming for instances.

---
 src/synth/netlists-disp_vhdl.adb |  4 ++--
 src/synth/netlists-dump.adb      | 10 +++++-----
 src/synth/netlists-errors.adb    |  2 +-
 src/synth/netlists.ads           |  1 -
 src/synth/synth-inference.adb    |  2 +-
 5 files changed, 9 insertions(+), 10 deletions(-)

(limited to 'src/synth')

diff --git a/src/synth/netlists-disp_vhdl.adb b/src/synth/netlists-disp_vhdl.adb
index 2f6c63628..2e601e05e 100644
--- a/src/synth/netlists-disp_vhdl.adb
+++ b/src/synth/netlists-disp_vhdl.adb
@@ -153,7 +153,7 @@ package body Netlists.Disp_Vhdl is
          if Is_Self_Instance (Inst) then
             Put_Name (Get_Input_Desc (Get_Module (Inst), Idx).Name);
          else
-            Inst_Name := Get_Name (Inst);
+            Inst_Name := Get_Instance_Name (Inst);
             Put_Name (Inst_Name);
             case Get_Sname_Kind (Inst_Name) is
                when Sname_Version =>
@@ -179,7 +179,7 @@ package body Netlists.Disp_Vhdl is
       First : Boolean;
    begin
       Put ("  ");
-      Name := Get_Name (Inst);
+      Name := Get_Instance_Name (Inst);
       if Get_Sname_Kind (Name) = Sname_Version then
          Put ("inst_");
          Put_Name_Version (Name);
diff --git a/src/synth/netlists-dump.adb b/src/synth/netlists-dump.adb
index e2b6f7ee8..1848f2f82 100644
--- a/src/synth/netlists-dump.adb
+++ b/src/synth/netlists-dump.adb
@@ -84,7 +84,7 @@ package body Netlists.Dump is
       Inst : constant Instance := Get_Parent (I);
       Idx : constant Port_Idx := Get_Port_Idx (I);
    begin
-      Dump_Name (Get_Name (Inst));
+      Dump_Name (Get_Instance_Name (Inst));
       Put ('.');
       if Is_Self_Instance (Inst) then
          Dump_Name (Get_Output_Desc (Get_Module (Inst), Idx).Name);
@@ -103,7 +103,7 @@ package body Netlists.Dump is
       Inst : constant Instance := Get_Parent (N);
       Idx : constant Port_Idx := Get_Port_Idx (N);
    begin
-      Dump_Name (Get_Name (Inst));
+      Dump_Name (Get_Instance_Name (Inst));
       Put ('.');
       if Is_Self_Instance (Inst) then
          Dump_Name (Get_Input_Desc (Get_Module (Inst), Idx).Name);
@@ -135,7 +135,7 @@ package body Netlists.Dump is
    begin
       Put_Indent (Indent);
       Put ("instance ");
-      Dump_Name (Get_Name (Inst));
+      Dump_Name (Get_Instance_Name (Inst));
       Put (" {i");
       Put_Trim (Instance'Image (Inst));
       Put ('}');
@@ -291,7 +291,7 @@ package body Netlists.Dump is
             if Is_Self_Instance (Inst) then
                Dump_Name (Get_Input_Desc (Get_Module (Inst), Idx).Name);
             else
-               Dump_Name (Get_Name (Inst));
+               Dump_Name (Get_Instance_Name (Inst));
                Put ('.');
                Dump_Name (Get_Output_Desc (Get_Module (Inst), Idx).Name);
             end if;
@@ -432,7 +432,7 @@ package body Netlists.Dump is
 
       if With_Name then
          Put (' ');
-         Dump_Name (Get_Name (Inst));
+         Dump_Name (Get_Instance_Name (Inst));
       end if;
 
       if Get_Nbr_Inputs (Inst) > 0 then
diff --git a/src/synth/netlists-errors.adb b/src/synth/netlists-errors.adb
index 880ae1418..0bee02e6a 100644
--- a/src/synth/netlists-errors.adb
+++ b/src/synth/netlists-errors.adb
@@ -68,7 +68,7 @@ package body Netlists.Errors is
       Inst : constant Instance := Instance (Val);
    begin
       if Format = 'n' then
-         Output_Name_1 (Get_Name (Inst));
+         Output_Name_1 (Get_Instance_Name (Inst));
       else
          raise Internal_Error;
       end if;
diff --git a/src/synth/netlists.ads b/src/synth/netlists.ads
index 49c9144db..bfe4522b3 100644
--- a/src/synth/netlists.ads
+++ b/src/synth/netlists.ads
@@ -246,7 +246,6 @@ package Netlists is
    function Is_Self_Instance (I : Instance) return Boolean;
    function Get_Module (Inst : Instance) return Module;
    function Get_Instance_Name (Inst : Instance) return Sname;
-   function Get_Name (Inst : Instance) return Sname renames Get_Instance_Name;
    function Get_Instance_Parent (Inst : Instance) return Module;
    function Get_Parent (Inst : Instance) return Module
      renames Get_Instance_Parent;
diff --git a/src/synth/synth-inference.adb b/src/synth/synth-inference.adb
index 94d1734ec..b1d8c79dd 100644
--- a/src/synth/synth-inference.adb
+++ b/src/synth/synth-inference.adb
@@ -493,7 +493,7 @@ package body Synth.Inference is
             end loop;
          end;
       else
-         Name := Get_Name (Get_Net_Parent (Prev_Val));
+         Name := Get_Instance_Name (Get_Net_Parent (Prev_Val));
       end if;
       Error_Msg_Synth (+Stmt, "latch infered for net %n", +Name);
 
-- 
cgit v1.2.3