Skip to content

Commit 7d8140d

Browse files
kernel/mem: Fix Cygwin compat
Avoid error: ``` kernel/mem.cc:1683:7: error: conflicting declaration ‘using addr_t = using addr_t = uint32_t’ 1683 | using addr_t = MemContents::addr_t; | ^~~~~~ In file included from /usr/include/sys/types.h:222, from /usr/include/pthread.h:11, from /usr/lib/gcc/x86_64-pc-cygwin/12/include/c++/x86_64-pc-cygwin/bits/gthr-default.h:35, from /usr/lib/gcc/x86_64-pc-cygwin/12/include/c++/x86_64-pc-cygwin/bits/gthr.h:148, from /usr/lib/gcc/x86_64-pc-cygwin/12/include/c++/ext/atomicity.h:35, from /usr/lib/gcc/x86_64-pc-cygwin/12/include/c++/bits/cow_string.h:37, from /usr/lib/gcc/x86_64-pc-cygwin/12/include/c++/bits/basic_string.h:51, from /usr/lib/gcc/x86_64-pc-cygwin/12/include/c++/string:53, from ./kernel/yosys_common.h:27, from ./kernel/yosys.h:42, from ./kernel/mem.h:23, from kernel/mem.cc:20: /usr/include/machine/types.h:63:15: note: previous declaration as ‘typedef char* addr_t’ 63 | typedef char *addr_t; ``` According to IntelliSense, only the return types need to be prefixed with `MemContents::`, the rest are automagically using the class definition and highlight as `using Yosys::MemContents::addr_t = uint32_t`.
1 parent 16a5950 commit 7d8140d

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

kernel/mem.cc

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1680,8 +1680,6 @@ SigSpec MemWr::decompress_en(const std::vector<int> &swizzle, SigSpec sig) {
16801680
return res;
16811681
}
16821682

1683-
using addr_t = MemContents::addr_t;
1684-
16851683
MemContents::MemContents(Mem *mem) :
16861684
MemContents(ceil_log2(mem->size), mem->width)
16871685
{
@@ -1758,7 +1756,7 @@ bool MemContents::_range_overlaps(std::map<addr_t, RTLIL::Const>::iterator it, a
17581756
return !(top1 < begin_addr || top2 < _range_begin(it));
17591757
}
17601758

1761-
std::map<addr_t, RTLIL::Const>::iterator MemContents::_range_at(addr_t addr) const {
1759+
std::map<MemContents::addr_t, RTLIL::Const>::iterator MemContents::_range_at(addr_t addr) const {
17621760
// allow addr == 1<<_addr_width (which will just return end())
17631761
log_assert(addr <= (addr_t)(1<<_addr_width));
17641762
// get the first range with base > addr
@@ -1786,7 +1784,7 @@ RTLIL::Const MemContents::operator[](addr_t addr) const {
17861784
return _default_value;
17871785
}
17881786

1789-
addr_t MemContents::count_range(addr_t begin_addr, addr_t end_addr) const {
1787+
MemContents::addr_t MemContents::count_range(addr_t begin_addr, addr_t end_addr) const {
17901788
addr_t count = 0;
17911789
for(auto it = _range_at(begin_addr); _range_overlaps(it, begin_addr, end_addr); it++) {
17921790
auto first = std::max(_range_begin(it), begin_addr);
@@ -1829,7 +1827,7 @@ void MemContents::clear_range(addr_t begin_addr, addr_t end_addr) {
18291827
_values.erase(begin_it, end_it);
18301828
}
18311829

1832-
std::map<addr_t, RTLIL::Const>::iterator MemContents::_reserve_range(addr_t begin_addr, addr_t end_addr) {
1830+
std::map<MemContents::addr_t, RTLIL::Const>::iterator MemContents::_reserve_range(addr_t begin_addr, addr_t end_addr) {
18331831
if(begin_addr >= end_addr)
18341832
return _values.end(); // need a dummy value to return, end() is cheap
18351833
// find the first range containing any addr >= begin_addr - 1

0 commit comments

Comments
 (0)