mirror of
https://github.com/YosysHQ/yosys
synced 2025-05-13 02:34:44 +00:00
Merge pull request #10 from alaindargelas/makefile_activity_fix
Correct path for activity.o and null wire check
This commit is contained in:
commit
e5adc0a6ac
2 changed files with 2 additions and 2 deletions
2
Makefile
2
Makefile
|
@ -749,8 +749,8 @@ OBJS += passes/cmds/splitcells.o
|
||||||
OBJS += passes/cmds/splitfanout.o
|
OBJS += passes/cmds/splitfanout.o
|
||||||
OBJS += passes/cmds/splitnets.o
|
OBJS += passes/cmds/splitnets.o
|
||||||
OBJS += passes/cmds/tee.o
|
OBJS += passes/cmds/tee.o
|
||||||
|
OBJS += passes/cmds/activity.o
|
||||||
OBJS += passes/sat/sim.o
|
OBJS += passes/sat/sim.o
|
||||||
OBJS += passes/sat/activity.o
|
|
||||||
|
|
||||||
include $(YOSYS_SRC)/passes/hierarchy/Makefile.inc
|
include $(YOSYS_SRC)/passes/hierarchy/Makefile.inc
|
||||||
include $(YOSYS_SRC)/passes/memory/Makefile.inc
|
include $(YOSYS_SRC)/passes/memory/Makefile.inc
|
||||||
|
|
|
@ -2516,7 +2516,7 @@ struct AnnotateActivity : public OutputWriter {
|
||||||
},
|
},
|
||||||
[this, use_signal, dataMap, max_time, real_timescale, clk_period, debug]
|
[this, use_signal, dataMap, max_time, real_timescale, clk_period, debug]
|
||||||
(const char *name, int size, Wire *w, int id, bool is_reg) {
|
(const char *name, int size, Wire *w, int id, bool is_reg) {
|
||||||
if (!use_signal.at(id))
|
if (!use_signal.at(id) || (w == nullptr))
|
||||||
return;
|
return;
|
||||||
std::string full_name = form_vcd_name(name, size, w);
|
std::string full_name = form_vcd_name(name, size, w);
|
||||||
SignalActivityDataMap::const_iterator itr = dataMap.find(id);
|
SignalActivityDataMap::const_iterator itr = dataMap.find(id);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue