riscv
/
yosys
mirror of https://github.com/YosysHQ/yosys.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Replaced more old SigChunk programming patterns

This commit is contained in:
Clifford Wolf 2014-07-24 22:47:57 +02:00
parent 7a608437c6
commit 6aa792c864
17 changed files with 101 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
backends/autotest/autotest.cc
View File

@ -119,10 +119,9 @@ static void autotest(FILE *f, RTLIL::Design *design)
if ((*it4)->type == RTLIL::ST0 || (*it4)->type == RTLIL::ST1) if ((*it4)->type == RTLIL::ST0 || (*it4)->type == RTLIL::ST1)
continue; continue;
RTLIL::SigSpec &signal = (*it4)->signal; RTLIL::SigSpec &signal = (*it4)->signal;
for (size_t i = 0; i < signal.chunks().size(); i++) { for (auto &c : signal.chunks())
if (signal.chunks()[i].wire == wire) if (c.wire == wire)
is_clksignal = true; is_clksignal = true;
}
} }
if (is_clksignal && wire->attributes.count("\\gentb_constant") == 0) { if (is_clksignal && wire->attributes.count("\\gentb_constant") == 0) {
signal_clk[idy("sig", mod->name, wire->name)] = wire->width; signal_clk[idy("sig", mod->name, wire->name)] = wire->width;

14
backends/blif/blif.cc
View File

@ -68,20 +68,18 @@ struct BlifDumper
return cstr_buf.back().c_str(); return cstr_buf.back().c_str();
} }
const char *cstr(RTLIL::SigSpec sig) const char *cstr(RTLIL::SigBit sig)
{ {
log_assert(sig.size() == 1); if (sig.wire == NULL)
return sig == RTLIL::State::S1 ? "$true" : "$false";
if (sig.chunks().at(0).wire == NULL) std::string str = RTLIL::unescape_id(sig.wire->name);
return sig.chunks().at(0).data.bits.at(0) == RTLIL::State::S1 ? "$true" : "$false";
std::string str = RTLIL::unescape_id(sig.chunks().at(0).wire->name);
for (size_t i = 0; i < str.size(); i++) for (size_t i = 0; i < str.size(); i++)
if (str[i] == '#' || str[i] == '=') if (str[i] == '#' || str[i] == '=')
str[i] = '?'; str[i] = '?';
if (sig.chunks().at(0).wire->width != 1) if (sig.wire->width != 1)
str += stringf("[%d]", sig.chunks().at(0).offset); str += stringf("[%d]", sig.offset);
cstr_buf.push_back(str); cstr_buf.push_back(str);
return cstr_buf.back().c_str(); return cstr_buf.back().c_str();

15
backends/edif/edif.cc
View File

@ -314,12 +314,9 @@ struct EdifBackend : public Backend {
} }
} }
for (auto &it : net_join_db) { for (auto &it : net_join_db) {
RTLIL::SigSpec sig = it.first; RTLIL::SigBit sig = it.first;
log_assert(sig.size() == 1); if (sig.wire == NULL && sig != RTLIL::State::S0 && sig != RTLIL::State::S1)
if (sig.chunks().at(0).wire == NULL) { continue;
if (sig.chunks().at(0).data.bits.at(0) != RTLIL::State::S0 && sig.chunks().at(0).data.bits.at(0) != RTLIL::State::S1)
continue;
}
std::string netname = log_signal(sig); std::string netname = log_signal(sig);
for (size_t i = 0; i < netname.size(); i++) for (size_t i = 0; i < netname.size(); i++)
if (netname[i] == ' ' || netname[i] == '\\') if (netname[i] == ' ' || netname[i] == '\\')
@ -327,10 +324,10 @@ struct EdifBackend : public Backend {
fprintf(f, " (net %s (joined\n", EDIF_DEF(netname)); fprintf(f, " (net %s (joined\n", EDIF_DEF(netname));
for (auto &ref : it.second) for (auto &ref : it.second)
fprintf(f, " %s\n", ref.c_str()); fprintf(f, " %s\n", ref.c_str());
if (sig.chunks().at(0).wire == NULL) { if (sig.wire == NULL) {
if (sig.chunks().at(0).data.bits.at(0) == RTLIL::State::S0) if (sig == RTLIL::State::S0)
fprintf(f, " (portRef G (instanceRef GND))\n"); fprintf(f, " (portRef G (instanceRef GND))\n");
if (sig.chunks().at(0).data.bits.at(0) == RTLIL::State::S1) if (sig == RTLIL::State::S1)
fprintf(f, " (portRef P (instanceRef VCC))\n"); fprintf(f, " (portRef P (instanceRef VCC))\n");
} }
fprintf(f, " ))\n"); fprintf(f, " ))\n");

2
backends/ilang/ilang_backend.cc
View File

@ -103,7 +103,7 @@ void ILANG_BACKEND::dump_sigchunk(FILE *f, const RTLIL::SigChunk &chunk, bool au
void ILANG_BACKEND::dump_sigspec(FILE *f, const RTLIL::SigSpec &sig, bool autoint) void ILANG_BACKEND::dump_sigspec(FILE *f, const RTLIL::SigSpec &sig, bool autoint)
{ {
if (sig.chunks().size() == 1) { if (sig.chunks().size() == 1) {
dump_sigchunk(f, sig.chunks()[0], autoint); dump_sigchunk(f, sig.chunks().front(), autoint);
} else { } else {
fprintf(f, "{ "); fprintf(f, "{ ");
for (auto it = sig.chunks().rbegin(); it != sig.chunks().rend(); it++) { for (auto it = sig.chunks().rbegin(); it != sig.chunks().rend(); it++) {

16
backends/intersynth/intersynth.cc
View File

@ -28,23 +28,19 @@
static std::string netname(std::set<std::string> &conntypes_code, std::set<std::string> &celltypes_code, std::set<std::string> &constcells_code, RTLIL::SigSpec sig) static std::string netname(std::set<std::string> &conntypes_code, std::set<std::string> &celltypes_code, std::set<std::string> &constcells_code, RTLIL::SigSpec sig)
{ {
if (sig.chunks().size() != 1) if (!sig.is_fully_const() && !sig.is_wire())
error:
log_error("Can't export composite or non-word-wide signal %s.\n", log_signal(sig)); log_error("Can't export composite or non-word-wide signal %s.\n", log_signal(sig));
conntypes_code.insert(stringf("conntype b%d %d 2 %d\n", sig.size(), sig.size(), sig.size())); conntypes_code.insert(stringf("conntype b%d %d 2 %d\n", sig.size(), sig.size(), sig.size()));
if (sig.chunks()[0].wire == NULL) { if (sig.is_fully_const()) {
celltypes_code.insert(stringf("celltype CONST_%d b%d *CONST cfg:%d VALUE\n", sig.size(), sig.size(), sig.size())); celltypes_code.insert(stringf("celltype CONST_%d b%d *CONST cfg:%d VALUE\n", sig.size(), sig.size(), sig.size()));
constcells_code.insert(stringf("node CONST_%d_0x%x CONST_%d CONST CONST_%d_0x%x VALUE 0x%x\n", sig.size(), sig.chunks()[0].data.as_int(), constcells_code.insert(stringf("node CONST_%d_0x%x CONST_%d CONST CONST_%d_0x%x VALUE 0x%x\n",
sig.size(), sig.size(), sig.chunks()[0].data.as_int(), sig.chunks()[0].data.as_int())); sig.size(), sig.as_int(), sig.size(), sig.size(), sig.as_int(), sig.as_int()));
return stringf("CONST_%d_0x%x", sig.size(), sig.chunks()[0].data.as_int()); return stringf("CONST_%d_0x%x", sig.size(), sig.as_int());
} }
if (sig.chunks()[0].offset != 0 || sig.size() != sig.chunks()[0].wire->width) return RTLIL::unescape_id(sig.as_wire()->name);
goto error;
return RTLIL::unescape_id(sig.chunks()[0].wire->name);
} }
struct IntersynthBackend : public Backend { struct IntersynthBackend : public Backend {

16
backends/spice/spice.cc
View File

@ -25,18 +25,17 @@
#include <string> #include <string>
#include <assert.h> #include <assert.h>
static void print_spice_net(FILE *f, RTLIL::SigSpec s, std::string &neg, std::string &pos, std::string &ncpf, int &nc_counter) static void print_spice_net(FILE *f, RTLIL::SigBit s, std::string &neg, std::string &pos, std::string &ncpf, int &nc_counter)
{ {
log_assert(s.chunks().size() == 1 && s.chunks()[0].width == 1); if (s.wire) {
if (s.chunks()[0].wire) { if (s.wire->width > 1)
if (s.chunks()[0].wire->width > 1) fprintf(f, " %s[%d]", RTLIL::id2cstr(s.wire->name), s.offset);
fprintf(f, " %s[%d]", RTLIL::id2cstr(s.chunks()[0].wire->name), s.chunks()[0].offset);
else else
fprintf(f, " %s", RTLIL::id2cstr(s.chunks()[0].wire->name)); fprintf(f, " %s", RTLIL::id2cstr(s.wire->name));
} else { } else {
if (s.chunks()[0].data.bits.at(0) == RTLIL::State::S0) if (s == RTLIL::State::S0)
fprintf(f, " %s", neg.c_str()); fprintf(f, " %s", neg.c_str());
else if (s.chunks()[0].data.bits.at(0) == RTLIL::State::S1) else if (s == RTLIL::State::S1)
fprintf(f, " %s", pos.c_str()); fprintf(f, " %s", pos.c_str());
else else
fprintf(f, " %s%d", ncpf.c_str(), nc_counter++); fprintf(f, " %s%d", ncpf.c_str(), nc_counter++);
@ -92,7 +91,6 @@ static void print_spice_module(FILE *f, RTLIL::Module *module, RTLIL::Design *de
for (auto &sig : port_sigs) { for (auto &sig : port_sigs) {
for (int i = 0; i < sig.size(); i++) { for (int i = 0; i < sig.size(); i++) {
RTLIL::SigSpec s = sig.extract(big_endian ? sig.size() - 1 - i : i, 1); RTLIL::SigSpec s = sig.extract(big_endian ? sig.size() - 1 - i : i, 1);
log_assert(s.chunks().size() == 1 && s.chunks()[0].width == 1);
print_spice_net(f, s, neg, pos, ncpf, nc_counter); print_spice_net(f, s, neg, pos, ncpf, nc_counter);
} }
} }

14
frontends/ast/genrtlil.cc
View File

@ -294,9 +294,9 @@ struct AST_INTERNAL::ProcessGenerator
assert(init_lvalue.size() == init_rvalue.size()); assert(init_lvalue.size() == init_rvalue.size());
int offset = 0; int offset = 0;
for (size_t i = 0; i < init_lvalue.chunks().size(); i++) { for (auto &init_lvalue_c : init_lvalue.chunks()) {
RTLIL::SigSpec lhs = init_lvalue.chunks()[i]; RTLIL::SigSpec lhs = init_lvalue_c;
RTLIL::SigSpec rhs = init_rvalue.extract(offset, init_lvalue.chunks()[i].width); RTLIL::SigSpec rhs = init_rvalue.extract(offset, init_lvalue_c.width);
sync->actions.push_back(RTLIL::SigSig(lhs, rhs)); sync->actions.push_back(RTLIL::SigSig(lhs, rhs));
offset += lhs.size(); offset += lhs.size();
} }
@ -398,10 +398,10 @@ struct AST_INTERNAL::ProcessGenerator
assert(lvalue.size() == rvalue.size()); assert(lvalue.size() == rvalue.size());
int offset = 0; int offset = 0;
for (size_t i = 0; i < lvalue.chunks().size(); i++) { for (auto &lvalue_c : lvalue.chunks()) {
RTLIL::SigSpec lhs = lvalue.chunks()[i]; RTLIL::SigSpec lhs = lvalue_c;
RTLIL::SigSpec rhs = rvalue.extract(offset, lvalue.chunks()[i].width); RTLIL::SigSpec rhs = rvalue.extract(offset, lvalue_c.width);
if (inSyncRule && lvalue.chunks()[i].wire && lvalue.chunks()[i].wire->get_bool_attribute("\\nosync")) if (inSyncRule && lvalue_c.wire && lvalue_c.wire->get_bool_attribute("\\nosync"))
rhs = RTLIL::SigSpec(RTLIL::State::Sx, rhs.size()); rhs = RTLIL::SigSpec(RTLIL::State::Sx, rhs.size());
actions.push_back(RTLIL::SigSig(lhs, rhs)); actions.push_back(RTLIL::SigSig(lhs, rhs));
offset += lhs.size(); offset += lhs.size();

10
kernel/bitpattern.h
View File

@ -35,10 +35,8 @@ struct BitPatternPool
if (width > 0) { if (width > 0) {
std::vector<RTLIL::State> pattern(width); std::vector<RTLIL::State> pattern(width);
for (int i = 0; i < width; i++) { for (int i = 0; i < width; i++) {
RTLIL::SigSpec s = sig.extract(i, 1); if (sig[i].wire == NULL && sig[i].data <= RTLIL::State::S1)
assert(s.chunks().size() == 1); pattern[i] = sig[i].data;
if (s.chunks()[0].wire == NULL && s.chunks()[0].data.bits[0] <= RTLIL::State::S1)
pattern[i] = s.chunks()[0].data.bits[0];
else else
pattern[i] = RTLIL::State::Sa; pattern[i] = RTLIL::State::Sa;
} }
@ -59,9 +57,7 @@ struct BitPatternPool
bits_t sig2bits(RTLIL::SigSpec sig) bits_t sig2bits(RTLIL::SigSpec sig)
{ {
assert(sig.is_fully_const()); bits_t bits = sig.as_const().bits;
assert(sig.chunks().size() == 1);
bits_t bits = sig.chunks()[0].data.bits;
for (auto &b : bits) for (auto &b : bits)
if (b > RTLIL::State::S1) if (b > RTLIL::State::S1)
b = RTLIL::State::Sa; b = RTLIL::State::Sa;

6
kernel/consteval.h
View File

@ -207,9 +207,9 @@ struct ConstEval
if (sig.is_fully_const()) if (sig.is_fully_const())
return true; return true;
for (size_t i = 0; i < sig.chunks().size(); i++) for (auto &c : sig.chunks())
if (sig.chunks()[i].wire != NULL) if (c.wire != NULL)
undef.append(sig.chunks()[i]); undef.append(c);
return false; return false;
} }

17
kernel/rtlil.cc
View File

@ -1999,6 +1999,14 @@ bool RTLIL::SigSpec::operator ==(const RTLIL::SigSpec &other) const
return true; return true;
} }
bool RTLIL::SigSpec::is_wire() const
{
cover("kernel.rtlil.sigspec.is_wire");
pack();
return SIZE(chunks_) == 1 && chunks_[0].wire && chunks_[0].wire->width == width_;
}
bool RTLIL::SigSpec::is_fully_const() const bool RTLIL::SigSpec::is_fully_const() const
{ {
cover("kernel.rtlil.sigspec.is_fully_const"); cover("kernel.rtlil.sigspec.is_fully_const");
@ -2104,6 +2112,15 @@ RTLIL::Const RTLIL::SigSpec::as_const() const
return RTLIL::Const(); return RTLIL::Const();
} }
RTLIL::Wire *RTLIL::SigSpec::as_wire() const
{
cover("kernel.rtlil.sigspec.as_wire");
pack();
assert(is_wire());
return chunks_[0].wire;
}
bool RTLIL::SigSpec::match(std::string pattern) const bool RTLIL::SigSpec::match(std::string pattern) const
{ {
cover("kernel.rtlil.sigspec.match"); cover("kernel.rtlil.sigspec.match");

4
kernel/rtlil.h
View File

@ -576,6 +576,7 @@ public:
bool operator ==(const RTLIL::SigSpec &other) const; bool operator ==(const RTLIL::SigSpec &other) const;
inline bool operator !=(const RTLIL::SigSpec &other) const { return !(*this == other); } inline bool operator !=(const RTLIL::SigSpec &other) const { return !(*this == other); }
bool is_wire() const;
bool is_fully_const() const; bool is_fully_const() const;
bool is_fully_def() const; bool is_fully_def() const;
bool is_fully_undef() const; bool is_fully_undef() const;
@ -585,6 +586,7 @@ public:
int as_int() const; int as_int() const;
std::string as_string() const; std::string as_string() const;
RTLIL::Const as_const() const; RTLIL::Const as_const() const;
RTLIL::Wire *as_wire() const;
bool match(std::string pattern) const; bool match(std::string pattern) const;
@ -612,7 +614,7 @@ inline RTLIL::SigBit &RTLIL::SigSpecIterator::operator*() const {
inline RTLIL::SigBit::SigBit(const RTLIL::SigSpec &sig) { inline RTLIL::SigBit::SigBit(const RTLIL::SigSpec &sig) {
assert(sig.size() == 1 && sig.chunks().size() == 1); assert(sig.size() == 1 && sig.chunks().size() == 1);
*this = SigBit(sig.chunks()[0]); *this = SigBit(sig.chunks().front());
} }
struct RTLIL::CaseRule { struct RTLIL::CaseRule {

38
passes/abc/abc.cc
View File

@ -709,15 +709,15 @@ static void abc_module(RTLIL::Design *design, RTLIL::Module *current_module, std
cell_stats[RTLIL::unescape_id(c->type)]++; cell_stats[RTLIL::unescape_id(c->type)]++;
if (c->type == "\\ZERO" || c->type == "\\ONE") { if (c->type == "\\ZERO" || c->type == "\\ONE") {
RTLIL::SigSig conn; RTLIL::SigSig conn;
conn.first = RTLIL::SigSpec(module->wires[remap_name(c->connections["\\Y"].chunks()[0].wire->name)]); conn.first = RTLIL::SigSpec(module->wires[remap_name(c->connections["\\Y"].as_wire()->name)]);
conn.second = RTLIL::SigSpec(c->type == "\\ZERO" ? 0 : 1, 1); conn.second = RTLIL::SigSpec(c->type == "\\ZERO" ? 0 : 1, 1);
module->connections.push_back(conn); module->connections.push_back(conn);
continue; continue;
} }
if (c->type == "\\BUF") { if (c->type == "\\BUF") {
RTLIL::SigSig conn; RTLIL::SigSig conn;
conn.first = RTLIL::SigSpec(module->wires[remap_name(c->connections["\\Y"].chunks()[0].wire->name)]); conn.first = RTLIL::SigSpec(module->wires[remap_name(c->connections["\\Y"].as_wire()->name)]);
conn.second = RTLIL::SigSpec(module->wires[remap_name(c->connections["\\A"].chunks()[0].wire->name)]); conn.second = RTLIL::SigSpec(module->wires[remap_name(c->connections["\\A"].as_wire()->name)]);
module->connections.push_back(conn); module->connections.push_back(conn);
continue; continue;
} }
@ -725,8 +725,8 @@ static void abc_module(RTLIL::Design *design, RTLIL::Module *current_module, std
RTLIL::Cell *cell = new RTLIL::Cell; RTLIL::Cell *cell = new RTLIL::Cell;
cell->type = "$_INV_"; cell->type = "$_INV_";
cell->name = remap_name(c->name); cell->name = remap_name(c->name);
cell->connections["\\A"] = RTLIL::SigSpec(module->wires[remap_name(c->connections["\\A"].chunks()[0].wire->name)]); cell->connections["\\A"] = RTLIL::SigSpec(module->wires[remap_name(c->connections["\\A"].as_wire()->name)]);
cell->connections["\\Y"] = RTLIL::SigSpec(module->wires[remap_name(c->connections["\\Y"].chunks()[0].wire->name)]); cell->connections["\\Y"] = RTLIL::SigSpec(module->wires[remap_name(c->connections["\\Y"].as_wire()->name)]);
module->cells[cell->name] = cell; module->cells[cell->name] = cell;
design->select(module, cell); design->select(module, cell);
continue; continue;
@ -735,9 +735,9 @@ static void abc_module(RTLIL::Design *design, RTLIL::Module *current_module, std
RTLIL::Cell *cell = new RTLIL::Cell; RTLIL::Cell *cell = new RTLIL::Cell;
cell->type = "$_" + c->type.substr(1) + "_"; cell->type = "$_" + c->type.substr(1) + "_";
cell->name = remap_name(c->name); cell->name = remap_name(c->name);
cell->connections["\\A"] = RTLIL::SigSpec(module->wires[remap_name(c->connections["\\A"].chunks()[0].wire->name)]); cell->connections["\\A"] = RTLIL::SigSpec(module->wires[remap_name(c->connections["\\A"].as_wire()->name)]);
cell->connections["\\B"] = RTLIL::SigSpec(module->wires[remap_name(c->connections["\\B"].chunks()[0].wire->name)]); cell->connections["\\B"] = RTLIL::SigSpec(module->wires[remap_name(c->connections["\\B"].as_wire()->name)]);
cell->connections["\\Y"] = RTLIL::SigSpec(module->wires[remap_name(c->connections["\\Y"].chunks()[0].wire->name)]); cell->connections["\\Y"] = RTLIL::SigSpec(module->wires[remap_name(c->connections["\\Y"].as_wire()->name)]);
module->cells[cell->name] = cell; module->cells[cell->name] = cell;
design->select(module, cell); design->select(module, cell);
continue; continue;
@ -746,10 +746,10 @@ static void abc_module(RTLIL::Design *design, RTLIL::Module *current_module, std
RTLIL::Cell *cell = new RTLIL::Cell; RTLIL::Cell *cell = new RTLIL::Cell;
cell->type = "$_MUX_"; cell->type = "$_MUX_";
cell->name = remap_name(c->name); cell->name = remap_name(c->name);
cell->connections["\\A"] = RTLIL::SigSpec(module->wires[remap_name(c->connections["\\A"].chunks()[0].wire->name)]); cell->connections["\\A"] = RTLIL::SigSpec(module->wires[remap_name(c->connections["\\A"].as_wire()->name)]);
cell->connections["\\B"] = RTLIL::SigSpec(module->wires[remap_name(c->connections["\\B"].chunks()[0].wire->name)]); cell->connections["\\B"] = RTLIL::SigSpec(module->wires[remap_name(c->connections["\\B"].as_wire()->name)]);
cell->connections["\\S"] = RTLIL::SigSpec(module->wires[remap_name(c->connections["\\S"].chunks()[0].wire->name)]); cell->connections["\\S"] = RTLIL::SigSpec(module->wires[remap_name(c->connections["\\S"].as_wire()->name)]);
cell->connections["\\Y"] = RTLIL::SigSpec(module->wires[remap_name(c->connections["\\Y"].chunks()[0].wire->name)]); cell->connections["\\Y"] = RTLIL::SigSpec(module->wires[remap_name(c->connections["\\Y"].as_wire()->name)]);
module->cells[cell->name] = cell; module->cells[cell->name] = cell;
design->select(module, cell); design->select(module, cell);
continue; continue;
@ -759,8 +759,8 @@ static void abc_module(RTLIL::Design *design, RTLIL::Module *current_module, std
RTLIL::Cell *cell = new RTLIL::Cell; RTLIL::Cell *cell = new RTLIL::Cell;
cell->type = clk_polarity ? "$_DFF_P_" : "$_DFF_N_"; cell->type = clk_polarity ? "$_DFF_P_" : "$_DFF_N_";
cell->name = remap_name(c->name); cell->name = remap_name(c->name);
cell->connections["\\D"] = RTLIL::SigSpec(module->wires[remap_name(c->connections["\\D"].chunks()[0].wire->name)]); cell->connections["\\D"] = RTLIL::SigSpec(module->wires[remap_name(c->connections["\\D"].as_wire()->name)]);
cell->connections["\\Q"] = RTLIL::SigSpec(module->wires[remap_name(c->connections["\\Q"].chunks()[0].wire->name)]); cell->connections["\\Q"] = RTLIL::SigSpec(module->wires[remap_name(c->connections["\\Q"].as_wire()->name)]);
cell->connections["\\C"] = clk_sig; cell->connections["\\C"] = clk_sig;
module->cells[cell->name] = cell; module->cells[cell->name] = cell;
design->select(module, cell); design->select(module, cell);
@ -777,7 +777,7 @@ static void abc_module(RTLIL::Design *design, RTLIL::Module *current_module, std
cell_stats[RTLIL::unescape_id(c->type)]++; cell_stats[RTLIL::unescape_id(c->type)]++;
if (c->type == "\\_const0_" || c->type == "\\_const1_") { if (c->type == "\\_const0_" || c->type == "\\_const1_") {
RTLIL::SigSig conn; RTLIL::SigSig conn;
conn.first = RTLIL::SigSpec(module->wires[remap_name(c->connections.begin()->second.chunks()[0].wire->name)]); conn.first = RTLIL::SigSpec(module->wires[remap_name(c->connections.begin()->second.as_wire()->name)]);
conn.second = RTLIL::SigSpec(c->type == "\\_const0_" ? 0 : 1, 1); conn.second = RTLIL::SigSpec(c->type == "\\_const0_" ? 0 : 1, 1);
module->connections.push_back(conn); module->connections.push_back(conn);
continue; continue;
@ -787,8 +787,8 @@ static void abc_module(RTLIL::Design *design, RTLIL::Module *current_module, std
RTLIL::Cell *cell = new RTLIL::Cell; RTLIL::Cell *cell = new RTLIL::Cell;
cell->type = clk_polarity ? "$_DFF_P_" : "$_DFF_N_"; cell->type = clk_polarity ? "$_DFF_P_" : "$_DFF_N_";
cell->name = remap_name(c->name); cell->name = remap_name(c->name);
cell->connections["\\D"] = RTLIL::SigSpec(module->wires[remap_name(c->connections["\\D"].chunks()[0].wire->name)]); cell->connections["\\D"] = RTLIL::SigSpec(module->wires[remap_name(c->connections["\\D"].as_wire()->name)]);
cell->connections["\\Q"] = RTLIL::SigSpec(module->wires[remap_name(c->connections["\\Q"].chunks()[0].wire->name)]); cell->connections["\\Q"] = RTLIL::SigSpec(module->wires[remap_name(c->connections["\\Q"].as_wire()->name)]);
cell->connections["\\C"] = clk_sig; cell->connections["\\C"] = clk_sig;
module->cells[cell->name] = cell; module->cells[cell->name] = cell;
design->select(module, cell); design->select(module, cell);
@ -815,9 +815,9 @@ static void abc_module(RTLIL::Design *design, RTLIL::Module *current_module, std
for (auto conn : mapped_mod->connections) { for (auto conn : mapped_mod->connections) {
if (!conn.first.is_fully_const()) if (!conn.first.is_fully_const())
conn.first = RTLIL::SigSpec(module->wires[remap_name(conn.first.chunks()[0].wire->name)]); conn.first = RTLIL::SigSpec(module->wires[remap_name(conn.first.as_wire()->name)]);
if (!conn.second.is_fully_const()) if (!conn.second.is_fully_const())
conn.second = RTLIL::SigSpec(module->wires[remap_name(conn.second.chunks()[0].wire->name)]); conn.second = RTLIL::SigSpec(module->wires[remap_name(conn.second.as_wire()->name)]);
module->connections.push_back(conn); module->connections.push_back(conn);
} }

4
passes/cmds/show.cc
View File

@ -177,7 +177,7 @@ struct ShowWorker
} }
if (sig.chunks().size() == 1) { if (sig.chunks().size() == 1) {
const RTLIL::SigChunk &c = sig.chunks()[0]; const RTLIL::SigChunk &c = sig.chunks().front();
if (c.wire != NULL && design->selected_member(module->name, c.wire->name)) { if (c.wire != NULL && design->selected_member(module->name, c.wire->name)) {
if (!range_check || c.wire->width == c.width) if (!range_check || c.wire->width == c.width)
return stringf("n%d", id2num(c.wire->name)); return stringf("n%d", id2num(c.wire->name));
@ -200,7 +200,7 @@ struct ShowWorker
int pos = sig.size()-1; int pos = sig.size()-1;
int idx = single_idx_count++; int idx = single_idx_count++;
for (int i = int(sig.chunks().size())-1; i >= 0; i--) { for (int i = int(sig.chunks().size())-1; i >= 0; i--) {
const RTLIL::SigChunk &c = sig.chunks()[i]; const RTLIL::SigChunk &c = sig.chunks().at(i);
net = gen_signode_simple(c, false); net = gen_signode_simple(c, false);
assert(!net.empty()); assert(!net.empty());
if (driver) { if (driver) {

10
passes/memory/memory_collect.cc
View File

@ -147,8 +147,8 @@ static void handle_memory(RTLIL::Module *module, RTLIL::Memory *memory)
assert(sig_wr_en.size() == wr_ports * memory->width); assert(sig_wr_en.size() == wr_ports * memory->width);
mem->parameters["\\WR_PORTS"] = RTLIL::Const(wr_ports); mem->parameters["\\WR_PORTS"] = RTLIL::Const(wr_ports);
mem->parameters["\\WR_CLK_ENABLE"] = wr_ports ? sig_wr_clk_enable.chunks()[0].data : RTLIL::Const(0, 0); mem->parameters["\\WR_CLK_ENABLE"] = wr_ports ? sig_wr_clk_enable.as_const() : RTLIL::Const(0, 0);
mem->parameters["\\WR_CLK_POLARITY"] = wr_ports ? sig_wr_clk_polarity.chunks()[0].data : RTLIL::Const(0, 0); mem->parameters["\\WR_CLK_POLARITY"] = wr_ports ? sig_wr_clk_polarity.as_const() : RTLIL::Const(0, 0);
mem->connections["\\WR_CLK"] = sig_wr_clk; mem->connections["\\WR_CLK"] = sig_wr_clk;
mem->connections["\\WR_ADDR"] = sig_wr_addr; mem->connections["\\WR_ADDR"] = sig_wr_addr;
@ -162,9 +162,9 @@ static void handle_memory(RTLIL::Module *module, RTLIL::Memory *memory)
assert(sig_rd_data.size() == rd_ports * memory->width); assert(sig_rd_data.size() == rd_ports * memory->width);
mem->parameters["\\RD_PORTS"] = RTLIL::Const(rd_ports); mem->parameters["\\RD_PORTS"] = RTLIL::Const(rd_ports);
mem->parameters["\\RD_CLK_ENABLE"] = rd_ports ? sig_rd_clk_enable.chunks()[0].data : RTLIL::Const(0, 0); mem->parameters["\\RD_CLK_ENABLE"] = rd_ports ? sig_rd_clk_enable.as_const() : RTLIL::Const(0, 0);
mem->parameters["\\RD_CLK_POLARITY"] = rd_ports ? sig_rd_clk_polarity.chunks()[0].data : RTLIL::Const(0, 0); mem->parameters["\\RD_CLK_POLARITY"] = rd_ports ? sig_rd_clk_polarity.as_const() : RTLIL::Const(0, 0);
mem->parameters["\\RD_TRANSPARENT"] = rd_ports ? sig_rd_transparent.chunks()[0].data : RTLIL::Const(0, 0); mem->parameters["\\RD_TRANSPARENT"] = rd_ports ? sig_rd_transparent.as_const() : RTLIL::Const(0, 0);
mem->connections["\\RD_CLK"] = sig_rd_clk; mem->connections["\\RD_CLK"] = sig_rd_clk;
mem->connections["\\RD_ADDR"] = sig_rd_addr; mem->connections["\\RD_ADDR"] = sig_rd_addr;

13
passes/opt/opt_clean.cc
View File

@ -104,15 +104,10 @@ static int count_nontrivial_wire_attrs(RTLIL::Wire *w)
return count; return count;
} }
static bool compare_signals(RTLIL::SigSpec &s1, RTLIL::SigSpec &s2, SigPool &regs, SigPool &conns, std::set<RTLIL::Wire*> &direct_wires) static bool compare_signals(RTLIL::SigBit &s1, RTLIL::SigBit &s2, SigPool &regs, SigPool &conns, std::set<RTLIL::Wire*> &direct_wires)
{ {
assert(s1.size() == 1); RTLIL::Wire *w1 = s1.wire;
assert(s2.size() == 1); RTLIL::Wire *w2 = s2.wire;
assert(s1.chunks().size() == 1);
assert(s2.chunks().size() == 1);
RTLIL::Wire *w1 = s1.chunks()[0].wire;
RTLIL::Wire *w2 = s2.chunks()[0].wire;
if (w1 == NULL || w2 == NULL) if (w1 == NULL || w2 == NULL)
return w2 == NULL; return w2 == NULL;
@ -189,7 +184,7 @@ static void rmunused_module_signals(RTLIL::Module *module, bool purge_mode, bool
for (auto &it : module->wires) { for (auto &it : module->wires) {
RTLIL::Wire *wire = it.second; RTLIL::Wire *wire = it.second;
for (int i = 0; i < wire->width; i++) { for (int i = 0; i < wire->width; i++) {
RTLIL::SigSpec s1 = RTLIL::SigSpec(wire, i), s2 = assign_map(s1); RTLIL::SigBit s1 = RTLIL::SigBit(wire, i), s2 = assign_map(s1);
if (!compare_signals(s1, s2, register_signals, connected_signals, direct_wires)) if (!compare_signals(s1, s2, register_signals, connected_signals, direct_wires))
assign_map.add(s1); assign_map.add(s1);
} }

2
passes/proc/proc_dff.cc
View File

@ -382,7 +382,7 @@ static void proc_dff(RTLIL::Module *mod, RTLIL::Process *proc, ConstEval &ce)
sync_edge->signal, sync_level->signal, proc); sync_edge->signal, sync_level->signal, proc);
} }
else else
gen_dff(mod, insig, rstval.chunks()[0].data, sig, gen_dff(mod, insig, rstval.as_const(), sig,
sync_edge->type == RTLIL::SyncType::STp, sync_edge->type == RTLIL::SyncType::STp,
sync_level && sync_level->type == RTLIL::SyncType::ST1, sync_level && sync_level->type == RTLIL::SyncType::ST1,
sync_edge->signal, sync_level ? &sync_level->signal : NULL, proc); sync_edge->signal, sync_level ? &sync_level->signal : NULL, proc);

19
passes/proc/proc_init.cc
View File

@ -58,16 +58,15 @@ static void proc_init(RTLIL::Module *mod, RTLIL::Process *proc)
log_cmd_error("Failed to get a constant init value for %s: %s\n", log_signal(lhs), log_signal(rhs)); log_cmd_error("Failed to get a constant init value for %s: %s\n", log_signal(lhs), log_signal(rhs));
int offset = 0; int offset = 0;
for (size_t i = 0; i < lhs.chunks().size(); i++) { for (auto &lhs_c : lhs.chunks()) {
if (lhs.chunks()[i].wire == NULL) if (lhs_c.wire != NULL) {
continue; RTLIL::SigSpec value = rhs.extract(offset, lhs_c.width);
RTLIL::Wire *wire = lhs.chunks()[i].wire; if (value.size() != lhs_c.wire->width)
RTLIL::SigSpec value = rhs.extract(offset, lhs.chunks()[i].width); log_cmd_error("Init value is not for the entire wire: %s = %s\n", log_signal(lhs_c), log_signal(value));
if (value.size() != wire->width) log(" Setting init value: %s = %s\n", log_signal(lhs_c.wire), log_signal(value));
log_cmd_error("Init value is not for the entire wire: %s = %s\n", log_signal(lhs.chunks()[i]), log_signal(value)); lhs_c.wire->attributes["\\init"] = value.as_const();
log(" Setting init value: %s = %s\n", log_signal(wire), log_signal(value)); }
wire->attributes["\\init"] = value.as_const(); offset += lhs_c.width;
offset += wire->width;
} }
} }
} }