mirrors/yosys
3
0
Fork 0
mirror of https://github.com/YosysHQ/yosys synced 2025-04-13 04:28:18 +00:00
Code Activity

Fix for all zero mask

Browse source
This commit is contained in:
eddiehung 2015-05-03 12:53:09 +01:00
parent 079c1205fe
commit 7c62318239
2 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Makefile
View file

@ -1,5 +1,5 @@
CONFIG := clang CONFIG := icc
# CONFIG := gcc # CONFIG := gcc
# CONFIG := gcc-4.6 # CONFIG := gcc-4.6
# CONFIG := emcc # CONFIG := emcc
@ -109,6 +109,10 @@ ABCMKARGS += ARCHFLAGS="-DSIZEOF_VOID_P=4 -DSIZEOF_LONG=4 -DSIZEOF_INT=4 -DWIN32
ABCMKARGS += LIBS="lib/x86/pthreadVC2.lib -s" READLINE=0 CC="$(CXX)" CXX="$(CXX)" ABCMKARGS += LIBS="lib/x86/pthreadVC2.lib -s" READLINE=0 CC="$(CXX)" CXX="$(CXX)"
EXE = .exe EXE = .exe
else ifeq ($(CONFIG),icc)
CXX = icpc
CXXFLAGS += -std=gnu++0x -Os
else ifneq ($(CONFIG),none) else ifneq ($(CONFIG),none)
$(error Invalid CONFIG setting '$(CONFIG)'. Valid values: clang, gcc, gcc-4.6, emcc, none) $(error Invalid CONFIG setting '$(CONFIG)'. Valid values: clang, gcc, gcc-4.6, emcc, none)
endif endif

11
backends/blif/blif.cc
View file

@ -234,13 +234,24 @@ struct BlifDumper
f << stringf(" %s", cstr(output)); f << stringf(" %s", cstr(output));
f << stringf("\n"); f << stringf("\n");
RTLIL::SigSpec mask = cell->parameters.at("\\LUT"); RTLIL::SigSpec mask = cell->parameters.at("\\LUT");
bool one = false;
for (int i = 0; i < (1 << width); i++) for (int i = 0; i < (1 << width); i++)
if (mask[i] == RTLIL::S1) { if (mask[i] == RTLIL::S1) {
for (int j = width-1; j >= 0; j--) { for (int j = width-1; j >= 0; j--) {
f << ((i>>j)&1 ? '1' : '0'); f << ((i>>j)&1 ? '1' : '0');
} }
f << " 1\n"; f << " 1\n";
one = true;
} }
/* For some reason, sometimes we get LUTs with
* an all zero mask, which won't give any
* .names entries, so write one entry with
* all don't cares */
if (!one) {
for (int j = width-1; j >= 0; j--)
f << '-';
f << " 0\n";
}
continue; continue;
} }