github-mirrors/ibex
1
0
Fork 0
mirror of https://github.com/lowRISC/ibex.git synced 2025-06-28 09:17:17 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix quoting in ibex_config.py

Browse source 
This didn't quite work properly for Xcelium (giving strings with an
embedded space: '-define IBEX_CFG_RV32M=ibex_pkg::RV32MSingleCycle').
It turned out not to matter because we were evaluating one time too
often in the shell, but we're about to stop doing that.
This commit is contained in:
Rupert Swarbrick 2022-04-20 12:18:08 +01:00 • committed by Rupert Swarbrick
parent 3264fe85c6
commit c9b0c11076
1 changed files with 19 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

42
util/ibex_config.py
View file

@ -186,21 +186,17 @@ class SimOpts:
for parameter, value in config_dict.items(): for parameter, value in config_dict.items():
if isinstance(value, str): if isinstance(value, str):
parameter_define = args.string_define_prefix + parameter parameter_define = args.string_define_prefix + parameter
define_set_str = self.define_set_fn(parameter_define, value) define_opts = self.define_set_fn(parameter_define, value)
sim_opts += [shlex.quote(arg) for arg in define_opts]
if define_set_str:
sim_opts.append(shlex.quote(define_set_str))
else: else:
if isinstance(value, bool): if isinstance(value, bool):
val_str = '1' if value else '0' val_str = '1' if value else '0'
else: else:
val_str = str(value) val_str = str(value)
param_set_str = self.param_set_fn(ins_hier_path + parameter, full_param = ins_hier_path + parameter
val_str) param_opts = self.param_set_fn(full_param, val_str)
sim_opts += [shlex.quote(arg) for arg in param_opts]
if param_set_str:
sim_opts.append(shlex.quote(param_set_str))
return ' '.join(sim_opts) return ' '.join(sim_opts)
@ -252,26 +248,26 @@ def main():
outputters = [ outputters = [
FusesocOpts(), FusesocOpts(),
SimOpts('vcs_opts', 'VCS compile', SimOpts('vcs_opts', 'VCS compile',
lambda p, v: '-pvalue+' + p + '=' + v, lambda p, v: ['-pvalue+' + p + '=' + v],
lambda d, v: '+define+' + d + '=' + v, '.'), lambda d, v: ['+define+' + d + '=' + v], '.'),
SimOpts('riviera_sim_opts', 'Riviera simulate', SimOpts('riviera_sim_opts', 'Riviera simulate',
lambda p, v: '-g/' + p + '=' + v, lambda p, v: ['-g/' + p + '=' + v],
lambda d, v: None, '/'), lambda d, v: [], '/'),
SimOpts('riviera_compile_opts', 'Riviera compile', SimOpts('riviera_compile_opts', 'Riviera compile',
lambda p, v: None, lambda p, v: [],
lambda d, v: '+define+' + d + '=' + v, '/'), lambda d, v: ['+define+' + d + '=' + v], '/'),
SimOpts('questa_sim_opts', 'Questa simulate', SimOpts('questa_sim_opts', 'Questa simulate',
lambda p, v: '-g/' + p + '=' + v, lambda p, v: ['-g/' + p + '=' + v],
lambda d, v: None, '/'), lambda d, v: [], '/'),
SimOpts('questa_compile_opts', 'Questa compile', SimOpts('questa_compile_opts', 'Questa compile',
lambda p, v: None, lambda p, v: [],
lambda d, v: '+define+' + d + '=' + v, '/'), lambda d, v: ['+define+' + d + '=' + v], '/'),
SimOpts('xlm_opts', 'Xcelium compile', SimOpts('xlm_opts', 'Xcelium compile',
lambda p, v: '-defparam ' + p + '=' + v, lambda p, v: ['-defparam', p + '=' + v],
lambda d, v: '-define ' + d + '=' + v, '.'), lambda d, v: ['-define', d + '=' + v], '.'),
SimOpts('dsim_compile_opts', 'DSim compile', SimOpts('dsim_compile_opts', 'DSim compile',
lambda p, v: '+define+' + p + '=' + v, lambda p, v: ['+define+' + p + '=' + v],
lambda d, v: None, '/'), lambda d, v: [], '/'),
] ]
argparser = argparse.ArgumentParser(description=( argparser = argparse.ArgumentParser(description=(