From 71b6dff34567897f29dca4bf50d4339e2adf68c4 Mon Sep 17 00:00:00 2001 From: Alain Dargelas Date: Thu, 17 Oct 2024 13:32:02 -0700 Subject: [PATCH 1/2] Correct path for activity.o --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index fa6904534..d7c0f7b6f 100644 --- a/Makefile +++ b/Makefile @@ -749,8 +749,8 @@ OBJS += passes/cmds/splitcells.o OBJS += passes/cmds/splitfanout.o OBJS += passes/cmds/splitnets.o OBJS += passes/cmds/tee.o +OBJS += passes/cmds/activity.o OBJS += passes/sat/sim.o -OBJS += passes/sat/activity.o include $(YOSYS_SRC)/passes/hierarchy/Makefile.inc include $(YOSYS_SRC)/passes/memory/Makefile.inc From a54f450eb981683dfeb6de37258dbf0c659425fa Mon Sep 17 00:00:00 2001 From: Alain Dargelas Date: Thu, 17 Oct 2024 13:43:41 -0700 Subject: [PATCH 2/2] Fix coredump when wire is nullptr --- passes/sat/sim.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/passes/sat/sim.cc b/passes/sat/sim.cc index 46614cd4f..2b4bce71f 100644 --- a/passes/sat/sim.cc +++ b/passes/sat/sim.cc @@ -2516,7 +2516,7 @@ struct AnnotateActivity : public OutputWriter { }, [this, use_signal, dataMap, max_time, real_timescale, clk_period, debug] (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; std::string full_name = form_vcd_name(name, size, w); SignalActivityDataMap::const_iterator itr = dataMap.find(id);