mirrors/yosys
3
0
Fork 0
mirror of https://github.com/YosysHQ/yosys synced 2026-07-05 15:06:11 +00:00
Code Activity

Merge pull request #5985 from YosysHQ/logid_left

Browse source 
Remove leftover use of log_id
This commit is contained in:
Miodrag Milanović 2026-06-24 07:15:32 +00:00 • committed by GitHub
commit 23aadd92ab
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
passes/cmds/check.cc
View file

@ -502,12 +502,12 @@ struct CheckMemPass : public Pass {
for (auto &init : mem.inits) { for (auto &init : mem.inits) {
int start = init.addr.as_int(); int start = init.addr.as_int();
if (start < min_addr) { if (start < min_addr) {
log_warning("Mem %s.%s starts at %d but initializes address %d.\n", log_id(module), log_id(mem.mem), min_addr, start); log_warning("Mem %s.%s starts at %d but initializes address %d.\n", module, mem.mem, min_addr, start);
counter++; counter++;
} }
int end = start + (GetSize(init.data) / mem.width) - 1; int end = start + (GetSize(init.data) / mem.width) - 1;
if (end > max_addr) { if (end > max_addr) {
log_warning("Mem %s.%s ends at %d but initializes address %d.\n", log_id(module), log_id(mem.mem), max_addr, end); log_warning("Mem %s.%s ends at %d but initializes address %d.\n", module, mem.mem, max_addr, end);
counter++; counter++;
} }
} }
@ -516,7 +516,7 @@ struct CheckMemPass : public Pass {
if (addr_sig.is_fully_const()) { if (addr_sig.is_fully_const()) {
auto addr = addr_sig.as_int(); auto addr = addr_sig.as_int();
if (addr < min_addr || addr > max_addr) { if (addr < min_addr || addr > max_addr) {
log_warning("Mem %s.%s contains entries for addresses %d..%d but %s address %d.\n", log_id(module), log_id(mem.mem), min_addr, max_addr, access, addr); log_warning("Mem %s.%s contains entries for addresses %d..%d but %s address %d.\n", module, mem.mem, min_addr, max_addr, access, addr);
counter++; counter++;
} }
} else if (nonconst_mode) { } else if (nonconst_mode) {
@ -525,7 +525,7 @@ struct CheckMemPass : public Pass {
int addr_sig_min = 0; int addr_sig_min = 0;
int addr_sig_max = (1 << addr_sig.size()) - 1; int addr_sig_max = (1 << addr_sig.size()) - 1;
if (min_addr > addr_sig_min || max_addr < addr_sig_max) { if (min_addr > addr_sig_min || max_addr < addr_sig_max) {
log_warning("Mem %s.%s contains entries for addresses %d..%d but has a potentially dangerous non-const input %s\n", log_id(module), log_id(mem.mem), min_addr, max_addr, log_signal(addr_sig)); log_warning("Mem %s.%s contains entries for addresses %d..%d but has a potentially dangerous non-const input %s\n", module, mem.mem, min_addr, max_addr, log_signal(addr_sig));
counter++; counter++;
} }
} }

6
passes/sat/sim.cc
View file

@ -1326,7 +1326,7 @@ struct SimInstance
if (shared->sim_mode == SimulationMode::gate && !fst_val.is_fully_def()) { // FST data contains X if (shared->sim_mode == SimulationMode::gate && !fst_val.is_fully_def()) { // FST data contains X
for(int i=0;i<fst_val.size();i++) { for(int i=0;i<fst_val.size();i++) {
if (fst_val[i]!=State::Sx && fst_val[i]!=sim_val[i]) { if (fst_val[i]!=State::Sx && fst_val[i]!=sim_val[i]) {
log_warning("Signal '%s.%s' in file %s in simulation %s\n", scope, log_id(item.first), log_signal(fst_val, true), log_signal(sim_val, true)); log_warning("Signal '%s.%s' in file %s in simulation %s\n", scope, item.first, log_signal(fst_val, true), log_signal(sim_val, true));
retVal = true; retVal = true;
break; break;
} }
@ -1334,14 +1334,14 @@ struct SimInstance
} else if (shared->sim_mode == SimulationMode::gold && !sim_val.is_fully_def()) { // sim data contains X } else if (shared->sim_mode == SimulationMode::gold && !sim_val.is_fully_def()) { // sim data contains X
for(int i=0;i<sim_val.size();i++) { for(int i=0;i<sim_val.size();i++) {
if (sim_val[i]!=State::Sx && fst_val[i]!=sim_val[i]) { if (sim_val[i]!=State::Sx && fst_val[i]!=sim_val[i]) {
log_warning("Signal '%s.%s' in file %s in simulation %s\n", scope, log_id(item.first), log_signal(fst_val, true), log_signal(sim_val, true)); log_warning("Signal '%s.%s' in file %s in simulation %s\n", scope, item.first, log_signal(fst_val, true), log_signal(sim_val, true));
retVal = true; retVal = true;
break; break;
} }
} }
} else { } else {
if (fst_val!=sim_val) { if (fst_val!=sim_val) {
log_warning("Signal '%s.%s' in file %s in simulation '%s'\n", scope, log_id(item.first), log_signal(fst_val, true), log_signal(sim_val, true)); log_warning("Signal '%s.%s' in file %s in simulation '%s'\n", scope, item.first, log_signal(fst_val, true), log_signal(sim_val, true));
retVal = true; retVal = true;
} }
} }