diff options
author | Clifford Wolf <clifford@clifford.at> | 2014-10-10 16:59:44 +0200 |
---|---|---|
committer | Clifford Wolf <clifford@clifford.at> | 2014-10-10 17:07:24 +0200 |
commit | 4569a747f8af3880e23408eb93323afc8088b78b (patch) | |
tree | 81dcea51020173cd4951e8649f8bd8305e7c2591 /passes/memory | |
parent | c7f5aab625bb90e766c1852592fdf42c951716c0 (diff) | |
download | yosys-4569a747f8af3880e23408eb93323afc8088b78b.tar.gz yosys-4569a747f8af3880e23408eb93323afc8088b78b.tar.bz2 yosys-4569a747f8af3880e23408eb93323afc8088b78b.zip |
Renamed SIZE() to GetSize() because of name collision on Win32
Diffstat (limited to 'passes/memory')
-rw-r--r-- | passes/memory/memory_map.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/passes/memory/memory_map.cc b/passes/memory/memory_map.cc index 449604c1a..4fb10a989 100644 --- a/passes/memory/memory_map.cc +++ b/passes/memory/memory_map.cc @@ -58,21 +58,21 @@ struct MemoryMapWorker RTLIL::Wire *addr_decode(RTLIL::SigSpec addr_sig, RTLIL::SigSpec addr_val) { std::pair<RTLIL::SigSpec, RTLIL::SigSpec> key(addr_sig, addr_val); - log_assert(SIZE(addr_sig) == SIZE(addr_val)); + log_assert(GetSize(addr_sig) == GetSize(addr_val)); if (decoder_cache.count(key) == 0) { - if (SIZE(addr_sig) < 2) { + if (GetSize(addr_sig) < 2) { decoder_cache[key] = module->Eq(NEW_ID, addr_sig, addr_val); } else { - int split_at = SIZE(addr_sig) / 2; + int split_at = GetSize(addr_sig) / 2; RTLIL::SigBit left_eq = addr_decode(addr_sig.extract(0, split_at), addr_val.extract(0, split_at)); - RTLIL::SigBit right_eq = addr_decode(addr_sig.extract(split_at, SIZE(addr_sig) - split_at), addr_val.extract(split_at, SIZE(addr_val) - split_at)); + RTLIL::SigBit right_eq = addr_decode(addr_sig.extract(split_at, GetSize(addr_sig) - split_at), addr_val.extract(split_at, GetSize(addr_val) - split_at)); decoder_cache[key] = module->And(NEW_ID, left_eq, right_eq); } } RTLIL::SigBit bit = decoder_cache.at(key); - log_assert(bit.wire != nullptr && SIZE(bit.wire) == 1); + log_assert(bit.wire != nullptr && GetSize(bit.wire) == 1); return bit.wire; } |