From 852b1e064f81c7c7108c45847872a266e995d31c Mon Sep 17 00:00:00 2001
From: Tristan Gingold <tgingold@free.fr>
Date: Sun, 28 Nov 2021 10:50:31 +0100
Subject: synth: adjustments for foreign_module
---
src/ghdldrv/ghdlsynth.adb | 13 ++++++++++---
src/vhdl/vhdl-configuration.adb | 2 ++
2 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/src/ghdldrv/ghdlsynth.adb b/src/ghdldrv/ghdlsynth.adb
index 229edcb1b..669588132 100644
--- a/src/ghdldrv/ghdlsynth.adb
+++ b/src/ghdldrv/ghdlsynth.adb
@@ -375,7 +375,7 @@ package body Ghdlsynth is
Foreign_Resolve_Instances.all;
end if;
- if Get_Kind (Config) = Iir_Kind_Design_Unit then
+ if Get_Kind (Get_Library_Unit (Config)) /= Iir_Kind_Foreign_Module then
-- Check (and possibly abandon) if entity can be at the top of the
-- hierarchy.
declare
@@ -421,7 +421,8 @@ package body Ghdlsynth is
when Format_Dot =>
Netlists.Disp_Dot.Disp_Dot_Top_Module (Res);
when Format_Vhdl =>
- if Get_Kind (Config) = Iir_Kind_Foreign_Module then
+ if Get_Kind (Get_Library_Unit (Config)) = Iir_Kind_Foreign_Module
+ then
-- Not a VHDL design.
Netlists.Disp_Vhdl.Disp_Vhdl (Res);
else
@@ -506,6 +507,7 @@ package body Ghdlsynth is
Res : Module;
Inst : Synth_Instance_Acc;
Config : Iir;
+ Lib_Unit : Iir;
begin
Config := Ghdl_Synth_Configure (True, Cmd, Args);
@@ -517,7 +519,12 @@ package body Ghdlsynth is
end if;
end if;
- Inst := Elab.Vhdl_Insts.Elab_Top_Unit (Get_Library_Unit (Config));
+ Lib_Unit := Get_Library_Unit (Config);
+ if Get_Kind (Lib_Unit) /= Iir_Kind_Foreign_Module then
+ Inst := Elab.Vhdl_Insts.Elab_Top_Unit (Lib_Unit);
+ else
+ Inst := null;
+ end if;
if Errorout.Nbr_Errors > 0 then
Res := No_Module;
diff --git a/src/vhdl/vhdl-configuration.adb b/src/vhdl/vhdl-configuration.adb
index a20131908..aeb737028 100644
--- a/src/vhdl/vhdl-configuration.adb
+++ b/src/vhdl/vhdl-configuration.adb
@@ -747,6 +747,8 @@ package body Vhdl.Configuration is
return Null_Iir;
end if;
Top := Unit;
+ when Iir_Kind_Foreign_Module =>
+ Top := Unit;
when others =>
Error_Msg_Elab ("%i is neither an entity nor a configuration",
+Primary_Id);
--
cgit v1.2.3