diff --git a/Makefile b/Makefile index 359ba6175..c80e0c683 100644 --- a/Makefile +++ b/Makefile @@ -8,6 +8,9 @@ CONFIG := none # CONFIG := msys2-32 # CONFIG := msys2-64 +# silimate +DISABLE_MEM_PRIORITY_MASK := 1 # not logically equivalent! + # features (the more the better) ENABLE_TCL := 0 ENABLE_ABC := 0 @@ -488,6 +491,10 @@ endif endif endif +ifeq ($(DISABLE_MEM_PRIORITY_MASK),1) +CXXFLAGS += -DSILIMATE_DISABLE_MEM_PRIORITY_MASK +endif + ifeq ($(ENABLE_GHDL),1) GHDL_PREFIX ?= $(PREFIX) GHDL_INCLUDE_DIR ?= $(GHDL_PREFIX)/include diff --git a/kernel/mem.cc b/kernel/mem.cc index 5ecbcef42..62fd31cfb 100644 --- a/kernel/mem.cc +++ b/kernel/mem.cc @@ -782,7 +782,7 @@ namespace { mwr.en = cell->getPort(ID::WR_EN).extract(i * res.width, (ni - i) * res.width); mwr.addr = cell->getPort(ID::WR_ADDR).extract(i * abits, abits); mwr.data = cell->getPort(ID::WR_DATA).extract(i * res.width, (ni - i) * res.width); -#ifndef ENABLE_VERIFIC_SYSTEMVERILOG +#ifndef SILIMATE_DISABLE_MEM_PRIORITY_MASK if (!is_compat) { Const priority_mask = cell->parameters.at(ID::WR_PRIORITY_MASK).extract(i * n_wr_ports, n_wr_ports); for (int j = 0; j < n_wr_ports; j++)