diff options
| author | Clifford Wolf <clifford@clifford.at> | 2019-06-21 16:58:12 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-21 16:58:12 +0200 |
| commit | 918460ddd312d25b8a3a889393b88025261a4b4b (patch) | |
| tree | 676f3a271c51ea8e81b6b6a80aa73848deb07802 | |
| parent | f0955452aecb528db4931d3a1844637e0f3f4cef (diff) | |
| parent | f15def325c7f2621cf8299ca61b5eeb3ddd3667e (diff) | |
| download | yosys-918460ddd312d25b8a3a889393b88025261a4b4b.tar.gz yosys-918460ddd312d25b8a3a889393b88025261a4b4b.tar.bz2 yosys-918460ddd312d25b8a3a889393b88025261a4b4b.zip | |
Merge pull request #1122 from YosysHQ/clifford/jsonports
Added JSON upto and offset
| -rw-r--r-- | backends/json/json.cc | 4 | ||||
| -rw-r--r-- | frontends/json/jsonparse.cc | 12 |
2 files changed, 16 insertions, 0 deletions
diff --git a/backends/json/json.cc b/backends/json/json.cc index 5022d5da1..1781a28cd 100644 --- a/backends/json/json.cc +++ b/backends/json/json.cc @@ -189,6 +189,10 @@ struct JsonWriter f << stringf(" %s: {\n", get_name(w->name).c_str()); f << stringf(" \"hide_name\": %s,\n", w->name[0] == '$' ? "1" : "0"); f << stringf(" \"bits\": %s,\n", get_bits(w).c_str()); + if (w->start_offset) + f << stringf(" \"offset\": %d,\n", w->start_offset); + if (w->upto) + f << stringf(" \"upto\": 1,\n"); f << stringf(" \"attributes\": {"); write_parameters(w->attributes); f << stringf("\n }\n"); diff --git a/frontends/json/jsonparse.cc b/frontends/json/jsonparse.cc index 82361ea9b..344b8c2c8 100644 --- a/frontends/json/jsonparse.cc +++ b/frontends/json/jsonparse.cc @@ -372,6 +372,18 @@ void json_import(Design *design, string &modname, JsonNode *node) if (wire == nullptr) wire = module->addWire(net_name, GetSize(bits_node->data_array)); + if (net_node->data_dict.count("upto") != 0) { + JsonNode *val = net_node->data_dict.at("offset"); + if (val->type == 'N') + wire->upto = val->data_number != 0; + } + + if (net_node->data_dict.count("offset") != 0) { + JsonNode *val = net_node->data_dict.at("offset"); + if (val->type == 'N') + wire->start_offset = val->data_number; + } + for (int i = 0; i < GetSize(bits_node->data_array); i++) { JsonNode *bitval_node = bits_node->data_array.at(i); |