libghdl: also add synthesis part. For #884

3 files changed, 4 insertions, 44 deletions

diff --git a/src/synth/ghdlsynth.h b/src/synth/ghdlsynth.h
index 35d123f32..d8b5ec784 100644
--- a/src/synth/ghdlsynth.h
+++ b/src/synth/ghdlsynth.h
@@ -118,10 +118,10 @@ namespace GhdlSynth {
 
   GHDLSYNTH_ADA_WRAPPER_WWD(get_input_net, Net, Instance, Port_Idx);
 
-  extern "C" unsigned int libghdlsynth__synth(int argc, const char **argv);
+  extern "C" unsigned int ghdlsynth__ghdl_synth(int argc, const char **argv);
   inline Module ghdl_synth(int argc, const char **argv) {
     Module res;
-    res.id = libghdlsynth__synth(argc, argv);
+    res.id = ghdlsynth__ghdl_synth(argc, argv);
     return res;
   }
 
@@ -129,6 +129,5 @@ namespace GhdlSynth {
   extern "C" void ghdlcomp__disp_config (void);
 
   // Initialize and finalize the whole library.
-  extern "C" void libghdlsynth_init (void);
-  extern "C" void libghdlsynth_final (void);
+  extern "C" void libghdl_init (void);
 };
diff --git a/src/synth/libghdlsynth.adb b/src/synth/libghdlsynth.adb
index 0931b48b6..94fd62899 100644
--- a/src/synth/libghdlsynth.adb
+++ b/src/synth/libghdlsynth.adb
@@ -18,44 +18,11 @@
 --  Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
 --  MA 02110-1301, USA.
 
-with GNAT.OS_Lib; use GNAT.OS_Lib;
-
-with Ghdlmain; use Ghdlmain;
 with Ghdlsynth;
 with Options; use Options;
 with Errorout.Console;
 
 package body Libghdlsynth is
-   function Synth (Argc : Natural; Argv : C_String_Array_Acc) return Module
-   is
-      Args : Argument_List (1 .. Argc);
-      Res : Module;
-      Cmd : Command_Acc;
-      First_Arg : Natural;
-   begin
-      --  Create arguments list.
-      for I in 0 .. Argc - 1 loop
-         declare
-            Arg : constant Ghdl_C_String := Argv (I);
-         begin
-            Args (I + 1) := new String'(Arg (1 .. strlen (Arg)));
-         end;
-      end loop;
-
-      --  Find the command.  This is a little bit convoluted...
-      Decode_Command_Options ("--synth", Cmd, Args, First_Arg);
-
-      --  Do the real work!
-      Res := Ghdlsynth.Ghdl_Synth (Args (First_Arg .. Args'Last));
-
-      return Res;
-   exception
-      when Option_Error =>
-         return No_Module;
-      when others =>
-         --  Avoid possible issues with exceptions...
-         return No_Module;
-   end Synth;
 
    Gnat_Version : constant String := "unknown compiler version" & ASCII.NUL;
    pragma Export (C, Gnat_Version, "__gnat_version");
diff --git a/src/synth/libghdlsynth.ads b/src/synth/libghdlsynth.ads
index 0824dea69..97f5c3378 100644
--- a/src/synth/libghdlsynth.ads
+++ b/src/synth/libghdlsynth.ads
@@ -18,12 +18,6 @@
 --  Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
 --  MA 02110-1301, USA.
 
-with Grt.Types; use Grt.Types;
-with Netlists; use Netlists;
-
 package Libghdlsynth is
-   type C_String_Array is array (Natural) of Ghdl_C_String;
-   type C_String_Array_Acc is access C_String_Array;
-
-   function Synth (Argc : Natural; Argv : C_String_Array_Acc) return Module;
+   pragma Elaborate_Body;
 end Libghdlsynth;