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

Handle possible non-memory indexed data

This commit is contained in:
Miodrag Milanovic 2022-05-06 08:05:23 +02:00
parent 8b3657454b
commit d8adbff72f
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
kernel/fstdata.cc
View File

@ -141,11 +141,12 @@ void FstData::extractVarNames()
char *endptr; char *endptr;
int mem_addr = strtol(addr.c_str(), &endptr, 16); int mem_addr = strtol(addr.c_str(), &endptr, 16);
if (*endptr) { if (*endptr) {
log_error("Error parsing memory address in : %s\n", clean_name.c_str()); log_warning("Error parsing memory address in : %s\n", clean_name.c_str());
} else {
memory_to_handle[var.scope+"."+mem_cell][mem_addr] = var.id;
name_to_handle[stringf("%s.%s[%d]",var.scope.c_str(),mem_cell.c_str(),mem_addr)] = h->u.var.handle;
continue;
} }
memory_to_handle[var.scope+"."+mem_cell][mem_addr] = var.id;
name_to_handle[stringf("%s.%s[%d]",var.scope.c_str(),mem_cell.c_str(),mem_addr)] = h->u.var.handle;
continue;
} }
pos = clean_name.find_last_of("["); pos = clean_name.find_last_of("[");
if (pos != std::string::npos) { if (pos != std::string::npos) {
@ -155,11 +156,12 @@ void FstData::extractVarNames()
char *endptr; char *endptr;
int mem_addr = strtol(addr.c_str(), &endptr, 10); int mem_addr = strtol(addr.c_str(), &endptr, 10);
if (*endptr) { if (*endptr) {
log_error("Error parsing memory address in : %s\n", clean_name.c_str()); log_warning("Error parsing memory address in : %s\n", clean_name.c_str());
} else {
memory_to_handle[var.scope+"."+mem_cell][mem_addr] = var.id;
name_to_handle[stringf("%s.%s[%d]",var.scope.c_str(),mem_cell.c_str(),mem_addr)] = h->u.var.handle;
continue;
} }
memory_to_handle[var.scope+"."+mem_cell][mem_addr] = var.id;
name_to_handle[stringf("%s.%s[%d]",var.scope.c_str(),mem_cell.c_str(),mem_addr)] = h->u.var.handle;
continue;
} }
name_to_handle[var.scope+"."+clean_name] = h->u.var.handle; name_to_handle[var.scope+"."+clean_name] = h->u.var.handle;
break; break;