caiyu/nextpnr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed erroneous BEL assignment in JSON parser

Browse Source
This commit is contained in:
ZipCPU 2018-06-06 07:49:35 -04:00
parent bd08f9e698
commit 2e6d0b752a
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/design.h
View File

@ -108,7 +108,7 @@ struct CellInfo
BelId bel;
// cell_port -> bel_pin
dict<IdString, IdString> pins;
dict<IdString, IdString> pins;
};
struct Design
@ -119,8 +119,8 @@ struct Design
// ...
}
dict<IdString, NetInfo*> nets;
dict<IdString, CellInfo*> cells;
dict<IdString, NetInfo*> nets;
dict<IdString, CellInfo*> cells;
};
#endif

13
frontend/json/jsonparse.cc
View File

@ -305,7 +305,8 @@ log_info("Processing modname = %s\n", modname.c_str());
CellInfo *cell = new CellInfo;
cell->name = cell_parent->data_dict_keys[cellid];
cell->bel = design->chip.getBelByName(cell_type->data_string);
cell->type = cell_type;
// No BEL assignment here/yet
log_info(" Processing %s $ %s\n", modname.c_str(), cell->name.c_str());
param_node = here->data_dict.at("parameters");
@ -429,15 +430,18 @@ log_info("Examining port %s, node %s\n", key.c_str(),
this_net = new NetInfo;
this_net->name = "" + net_id;
design->nets[net_id] = this_net;
this_net->driver.cell = NULL;
this_net->driver.port = "";
} else
this_net = design->nets[net_id];
port_ref.cell = cell;
port_ref.port = port_info.name;
if (port_info.type != PORT_IN)
if (port_info.type != PORT_IN) {
assert(this_net->driver->cell == NULL);
this_net->driver = port_ref;
else
} else
this_net->users.push_back(port_ref);
}
@ -485,7 +489,8 @@ int main(int argc, char **argv) {
chip_args.type = ChipArgs::LP384;
Design *design = new Design(chip_args);
std::string fname = "../../ice40/blinky.json";
// std::string fname = "../../ice40/blinky.json";
std::string fname = "/home/dan/work/rnd/opencores/icozip/trunk/rtl/icozip/icozip.json";
std::istream *f = new std::ifstream(fname);
parser->execute(f, fname, design);