mirror of https://github.com/YosysHQ/yosys.git
Compare commits
10 Commits
e67c3706eb
...
c9645fbabe
Author | SHA1 | Date |
---|---|---|
George Rennie | c9645fbabe | |
KrystalDelusion | 6f3376cbe6 | |
github-actions[bot] | 87742fa688 | |
Martin Povišer | 646c5a19a8 | |
KrystalDelusion | f428163252 | |
Krystine Sherwin | e649c1a8e1 | |
Krystine Sherwin | 44b68fb498 | |
George Rennie | d7c6688905 | |
Krystine Sherwin | 1476eaba00 | |
George Rennie | 9047290683 |
2
Makefile
2
Makefile
|
@ -155,7 +155,7 @@ ifeq ($(OS), Haiku)
|
||||||
CXXFLAGS += -D_DEFAULT_SOURCE
|
CXXFLAGS += -D_DEFAULT_SOURCE
|
||||||
endif
|
endif
|
||||||
|
|
||||||
YOSYS_VER := 0.47+121
|
YOSYS_VER := 0.47+135
|
||||||
|
|
||||||
# Note: We arrange for .gitcommit to contain the (short) commit hash in
|
# Note: We arrange for .gitcommit to contain the (short) commit hash in
|
||||||
# tarballs generated with git-archive(1) using .gitattributes. The git repo
|
# tarballs generated with git-archive(1) using .gitattributes. The git repo
|
||||||
|
|
|
@ -508,7 +508,7 @@ struct BtorWorker
|
||||||
goto okay;
|
goto okay;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (cell->type.in(ID($not), ID($neg), ID($_NOT_), ID($pos)))
|
if (cell->type.in(ID($not), ID($neg), ID($_NOT_), ID($pos), ID($buf), ID($_BUF_)))
|
||||||
{
|
{
|
||||||
string btor_op;
|
string btor_op;
|
||||||
if (cell->type.in(ID($not), ID($_NOT_))) btor_op = "not";
|
if (cell->type.in(ID($not), ID($_NOT_))) btor_op = "not";
|
||||||
|
@ -520,9 +520,9 @@ struct BtorWorker
|
||||||
int nid_a = get_sig_nid(cell->getPort(ID::A), width, a_signed);
|
int nid_a = get_sig_nid(cell->getPort(ID::A), width, a_signed);
|
||||||
SigSpec sig = sigmap(cell->getPort(ID::Y));
|
SigSpec sig = sigmap(cell->getPort(ID::Y));
|
||||||
|
|
||||||
// the $pos cell just passes through, all other cells need an actual operation applied
|
// the $pos/$buf cells just pass through, all other cells need an actual operation applied
|
||||||
int nid = nid_a;
|
int nid = nid_a;
|
||||||
if (cell->type != ID($pos))
|
if (!cell->type.in(ID($pos), ID($buf), ID($_BUF_)))
|
||||||
{
|
{
|
||||||
log_assert(!btor_op.empty());
|
log_assert(!btor_op.empty());
|
||||||
int sid = get_bv_sid(width);
|
int sid = get_bv_sid(width);
|
||||||
|
|
|
@ -56,6 +56,9 @@ if os.getenv("READTHEDOCS"):
|
||||||
else:
|
else:
|
||||||
release = yosys_ver
|
release = yosys_ver
|
||||||
todo_include_todos = False
|
todo_include_todos = False
|
||||||
|
elif os.getenv("YOSYS_DOCS_RELEASE") is not None:
|
||||||
|
release = yosys_ver
|
||||||
|
todo_include_todos = False
|
||||||
else:
|
else:
|
||||||
release = yosys_ver
|
release = yosys_ver
|
||||||
todo_include_todos = True
|
todo_include_todos = True
|
||||||
|
@ -87,5 +90,9 @@ def setup(app: Sphinx) -> None:
|
||||||
from util.RtlilLexer import RtlilLexer
|
from util.RtlilLexer import RtlilLexer
|
||||||
app.add_lexer("RTLIL", RtlilLexer)
|
app.add_lexer("RTLIL", RtlilLexer)
|
||||||
|
|
||||||
from furo_ys.lexers.YoscryptLexer import YoscryptLexer
|
try:
|
||||||
app.add_lexer("yoscrypt", YoscryptLexer)
|
from furo_ys.lexers.YoscryptLexer import YoscryptLexer
|
||||||
|
app.add_lexer("yoscrypt", YoscryptLexer)
|
||||||
|
except ModuleNotFoundError:
|
||||||
|
from pygments.lexers.special import TextLexer
|
||||||
|
app.add_lexer("yoscrypt", TextLexer)
|
||||||
|
|
|
@ -814,6 +814,7 @@ struct RTLIL::AttrObject
|
||||||
void set_bool_attribute(const RTLIL::IdString &id, bool value=true);
|
void set_bool_attribute(const RTLIL::IdString &id, bool value=true);
|
||||||
bool get_bool_attribute(const RTLIL::IdString &id) const;
|
bool get_bool_attribute(const RTLIL::IdString &id) const;
|
||||||
|
|
||||||
|
[[deprecated("Use Module::get_blackbox_attribute() instead.")]]
|
||||||
bool get_blackbox_attribute(bool ignore_wb=false) const {
|
bool get_blackbox_attribute(bool ignore_wb=false) const {
|
||||||
return get_bool_attribute(ID::blackbox) || (!ignore_wb && get_bool_attribute(ID::whitebox));
|
return get_bool_attribute(ID::blackbox) || (!ignore_wb && get_bool_attribute(ID::whitebox));
|
||||||
}
|
}
|
||||||
|
@ -1291,6 +1292,10 @@ public:
|
||||||
virtual void optimize();
|
virtual void optimize();
|
||||||
virtual void makeblackbox();
|
virtual void makeblackbox();
|
||||||
|
|
||||||
|
bool get_blackbox_attribute(bool ignore_wb=false) const {
|
||||||
|
return get_bool_attribute(ID::blackbox) || (!ignore_wb && get_bool_attribute(ID::whitebox));
|
||||||
|
}
|
||||||
|
|
||||||
void connect(const RTLIL::SigSig &conn);
|
void connect(const RTLIL::SigSig &conn);
|
||||||
void connect(const RTLIL::SigSpec &lhs, const RTLIL::SigSpec &rhs);
|
void connect(const RTLIL::SigSpec &lhs, const RTLIL::SigSpec &rhs);
|
||||||
void new_connections(const std::vector<RTLIL::SigSig> &new_conn);
|
void new_connections(const std::vector<RTLIL::SigSig> &new_conn);
|
||||||
|
|
Loading…
Reference in New Issue