diff options
| author | Jim Lawson <ucbjrl@berkeley.edu> | 2018-09-17 14:31:57 -0700 |
|---|---|---|
| committer | Jim Lawson <ucbjrl@berkeley.edu> | 2018-09-17 14:31:57 -0700 |
| commit | 6a809a1bb15327dfa0134b872455d47b0ebef73c (patch) | |
| tree | 1f65cca24d5309f79b19e399210d5545d2010e3c /passes | |
| parent | 036e3f9c1b62f42812cd3bdd933af7d6a8e2209c (diff) | |
| parent | 592a82c0ad8beb6de023aa2a131aab6472f949e8 (diff) | |
| download | yosys-6a809a1bb15327dfa0134b872455d47b0ebef73c.tar.gz yosys-6a809a1bb15327dfa0134b872455d47b0ebef73c.tar.bz2 yosys-6a809a1bb15327dfa0134b872455d47b0ebef73c.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'passes')
| -rw-r--r-- | passes/cmds/setundef.cc | 8 | ||||
| -rw-r--r-- | passes/sat/sim.cc | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/passes/cmds/setundef.cc b/passes/cmds/setundef.cc index 62d940ce6..a1dfa9b5c 100644 --- a/passes/cmds/setundef.cc +++ b/passes/cmds/setundef.cc @@ -162,7 +162,6 @@ struct SetundefPass : public Pass { continue; } if (args[argidx] == "-expose") { - got_value = true; expose_mode = true; continue; } @@ -212,6 +211,13 @@ struct SetundefPass : public Pass { } extra_args(args, argidx, design); + if (!got_value && expose_mode) { + log("Using default as -undef with -expose.\n"); + got_value = true; + worker.next_bit_mode = MODE_UNDEF; + worker.next_bit_state = 0; + } + if (expose_mode && !undriven_mode) log_cmd_error("Option -expose must be used with option -undriven.\n"); if (!got_value) diff --git a/passes/sat/sim.cc b/passes/sat/sim.cc index fadffcdbc..53e248adf 100644 --- a/passes/sat/sim.cc +++ b/passes/sat/sim.cc @@ -778,7 +778,7 @@ struct SimPass : public Pass { log(" number of cycles to simulate (default: 20)\n"); log("\n"); log(" -a\n"); - log(" include all nets in VCD output, nut just those with public names\n"); + log(" include all nets in VCD output, not just those with public names\n"); log("\n"); log(" -w\n"); log(" writeback mode: use final simulation state as new init state\n"); |