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

json: Parse cell attributes

Browse Source 
Signed-off-by: David Shah <davey1576@gmail.com>
This commit is contained in:
David Shah 2018-06-09 19:33:35 +02:00
parent 8cabb39d6d
commit e15620ccd4
1 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
frontend/json/jsonparse.cc
View File

@ -312,9 +312,9 @@ bool is_blackbox(JsonNode *node)
return true; return true;
} }
void json_import_cell_attributes(Design *design, string &modname, void json_import_cell_params(Design *design, string &modname, CellInfo *cell,
CellInfo *cell, JsonNode *param_node, JsonNode *param_node,
int param_id) dict<IdString, std::string> *dest, int param_id)
{ {
// //
JsonNode *param; JsonNode *param;
@ -324,9 +324,9 @@ void json_import_cell_attributes(Design *design, string &modname,
pId = param_node->data_dict_keys[param_id]; pId = param_node->data_dict_keys[param_id];
if (param->type == 'N') { if (param->type == 'N') {
cell->params[pId] = std::to_string(param->data_number); (*dest)[pId] = std::to_string(param->data_number);
} else if (param->type == 'S') } else if (param->type == 'S')
cell->params[pId] = param->data_string; (*dest)[pId] = param->data_string;
else else
log_error( log_error(
"JSON parameter type of \"%s\' of cell \'%s\' not supported\n", "JSON parameter type of \"%s\' of cell \'%s\' not supported\n",
@ -529,7 +529,7 @@ void json_import_cell_ports(Design *design, string &modname, CellInfo *cell,
void json_import_cell(Design *design, string modname, JsonNode *cell_node, void json_import_cell(Design *design, string modname, JsonNode *cell_node,
string cell_name) string cell_name)
{ {
JsonNode *cell_type, *param_node; JsonNode *cell_type, *param_node, *attr_node;
cell_type = cell_node->data_dict.at("type"); cell_type = cell_node->data_dict.at("type");
if (cell_type == NULL) if (cell_type == NULL)
@ -557,7 +557,24 @@ void json_import_cell(Design *design, string modname, JsonNode *cell_node,
for (int paramid = 0; paramid < GetSize(param_node->data_dict_keys); for (int paramid = 0; paramid < GetSize(param_node->data_dict_keys);
paramid++) { paramid++) {
json_import_cell_attributes(design, modname, cell, param_node, paramid); json_import_cell_params(design, modname, cell, param_node,
&cell->params, paramid);
}
attr_node = cell_node->data_dict.at("attributes");
if (attr_node->type != 'D')
log_error("JSON attribute list of \'%s\' is not a data dictionary\n",
cell->name.c_str());
//
// Loop through all attributes, adding them into the
// design to annotate the cell
//
for (int attrid = 0; attrid < GetSize(attr_node->data_dict_keys);
attrid++) {
json_import_cell_params(design, modname, cell, attr_node, &cell->attrs,
attrid);
} }
// //