From f1c30ad16e0914455ee2c84e80714f6b271021f2 Mon Sep 17 00:00:00 2001
From: Tristan Gingold <tgingold@free.fr>
Date: Wed, 30 Dec 2020 10:29:16 +0100
Subject: Rework initialization and finalization.

libghdl can now be re-initialized.
---
 pyGHDL/dom/Misc.py         |  3 +++
 pyGHDL/libghdl/__init__.py | 11 +++++++++++
 2 files changed, 14 insertions(+)

(limited to 'pyGHDL')

diff --git a/pyGHDL/dom/Misc.py b/pyGHDL/dom/Misc.py
index df1ab4cce..0c9736cb0 100644
--- a/pyGHDL/dom/Misc.py
+++ b/pyGHDL/dom/Misc.py
@@ -27,6 +27,9 @@ class Design(VHDLModel_Design):
 
 	def __ghdl_init(self):
 		"""Initialization: set options and then load libraries"""
+		# Initialize libghdl
+		libghdl.finalize()
+		libghdl.initialize()
 
 		# Collect error messages in memory
 		errorout_memory.Install_Handler()
diff --git a/pyGHDL/libghdl/__init__.py b/pyGHDL/libghdl/__init__.py
index da39a4475..431008df3 100644
--- a/pyGHDL/libghdl/__init__.py
+++ b/pyGHDL/libghdl/__init__.py
@@ -76,7 +76,9 @@ _libghdl_path = _get_libghdl_path()
 libghdl = ctypes.CDLL(_libghdl_path)
 
 # Initialize it.
+# First Ada elaboration (must be the first call)
 libghdl.libghdl_init()
+# Then 'normal' initialization (set hooks)
 libghdl.libghdl__set_hooks_for_analysis()
 
 # Set the prefix in order to locate the vhdl libraries.
@@ -84,6 +86,15 @@ libghdl.libghdl__set_exec_prefix(
     *_to_char_p(dirname(dirname(_libghdl_path)).encode("utf-8"))
 )
 
+def finalize():
+    "Free all the memory, be ready for a new initialization"
+    libghdl.options__finalize()
+
+
+def initialize():
+    "Initialize or re-initialize the library"
+    libghdl.options__initialize()
+
 
 def set_option(opt):
     "Set option OPT.  Return true iff the option is known and handled"
-- 
cgit v1.2.3