3
0
Fork 0
mirror of https://github.com/YosysHQ/yosys synced 2025-11-05 13:56:04 +00:00

Use chunks iterator for SigSpec::extract()

This commit is contained in:
Robert O'Callahan 2025-10-30 17:42:58 +00:00
parent ab525643a7
commit 1af5d4f2db

View file

@ -5166,33 +5166,27 @@ RTLIL::SigSpec RTLIL::SigSpec::extract(int offset, int length) const
cover("kernel.rtlil.sigspec.extract_pos"); cover("kernel.rtlil.sigspec.extract_pos");
if (packed()) {
SigSpec extracted; SigSpec extracted;
extracted.width_ = length; Chunks cs = chunks();
auto it = cs.begin();
auto it = chunks_.begin(); for (; offset; offset -= it->width, ++it) {
for (; offset; offset -= it->width, it++) {
if (offset < it->width) { if (offset < it->width) {
int chunk_length = min(it->width - offset, length); int chunk_length = min(it->width - offset, length);
extracted.chunks_.emplace_back(it->extract(offset, chunk_length)); extracted.append(it->extract(offset, chunk_length));
length -= chunk_length; length -= chunk_length;
it++; ++it;
break; break;
} }
} }
for (; length; length -= it->width, it++) { for (; length; length -= it->width, ++it) {
if (length >= it->width) { if (length >= it->width) {
extracted.chunks_.emplace_back(*it); extracted.append(*it);
} else { } else {
extracted.chunks_.emplace_back(it->extract(0, length)); extracted.append(it->extract(0, length));
break; break;
} }
} }
return extracted; return extracted;
} else {
return std::vector<RTLIL::SigBit>(bits_.begin() + offset, bits_.begin() + offset + length);
}
} }
void RTLIL::SigSpec::rewrite_wires(std::function<void(RTLIL::Wire*& wire)> rewrite) void RTLIL::SigSpec::rewrite_wires(std::function<void(RTLIL::Wire*& wire)> rewrite)