Proper quotation for overriding vhdl generics for Xilinx Xsim, resolves

olofk/fusesoc#543
olofk · Feb 9, 2022 · b35e152 · b35e152
1 parent 0b31cd1
commit b35e152
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/edalize/xsim.py b/edalize/xsim.py
@@ -128,7 +128,7 @@ def _write_config_files(self):
             gen_param.update(self.generic)
             gen_param_args = " ".join(
                 [
-                    "--generic_top {}={}".format(k, self._param_value_str(v))
+                    '--generic_top "{}={}"'.format(k, self._param_value_str(v))
                     for k, v in gen_param.items()
                 ]
             )

diff --git a/tests/test_xsim/config.mk b/tests/test_xsim/config.mk
@@ -4,7 +4,7 @@ TOPLEVEL      = top_module
 
 VLOG_DEFINES  = --define vlogdefine_bool=1 --define vlogdefine_int=42 --define vlogdefine_str=hello
 VLOG_INCLUDES = -i .
-GEN_PARAMS    = --generic_top vlogparam_bool=1 --generic_top vlogparam_int=42 --generic_top vlogparam_str=hello --generic_top generic_bool=1 --generic_top generic_int=42 --generic_top generic_str=hello
+GEN_PARAMS    = --generic_top "vlogparam_bool=1" --generic_top "vlogparam_int=42" --generic_top "vlogparam_str=hello" --generic_top "generic_bool=1" --generic_top "generic_int=42" --generic_top "generic_str=hello"
 
 XELAB_OPTIONS =	some xelab_options
 XSIM_OPTIONS  = a few xsim_options
diff --git a/tests/test_xsim/mfc/config.mk b/tests/test_xsim/mfc/config.mk
@@ -4,7 +4,7 @@ TOPLEVEL      = top_module
 
 VLOG_DEFINES  = --define vlogdefine_bool=1 --define vlogdefine_int=42 --define vlogdefine_str=hello
 VLOG_INCLUDES = -i .
-GEN_PARAMS    = --generic_top vlogparam_bool=1 --generic_top vlogparam_int=42 --generic_top vlogparam_str=hello --generic_top generic_bool=1 --generic_top generic_int=42 --generic_top generic_str=hello
+GEN_PARAMS    = --generic_top "vlogparam_bool=1" --generic_top "vlogparam_int=42" --generic_top "vlogparam_str=hello" --generic_top "generic_bool=1" --generic_top "generic_int=42" --generic_top "generic_str=hello"
 
 XELAB_OPTIONS =	some xelab_options
 XSIM_OPTIONS  = a few xsim_options