aboutsummaryrefslogtreecommitdiffstats
path: root/frontends
diff options
context:
space:
mode:
authorEddie Hung <eddie@fpgeh.com>2019-06-21 17:44:21 -0700
committerEddie Hung <eddie@fpgeh.com>2019-06-21 17:44:21 -0700
commit6c2cb519965ac9b4057a90cd46f474c092967be2 (patch)
tree45f545af7700a244f64a0e42f96fae37df9f2914 /frontends
parent301e065aeee2d6a4b5009ebdc50028bafd3aac5d (diff)
parent1abe93e48d8bb78cd0753d46dfbe1885a1e803eb (diff)
downloadyosys-6c2cb519965ac9b4057a90cd46f474c092967be2.tar.gz
yosys-6c2cb519965ac9b4057a90cd46f474c092967be2.tar.bz2
yosys-6c2cb519965ac9b4057a90cd46f474c092967be2.zip
Merge remote-tracking branch 'origin/xaig' into xc7mux
Diffstat (limited to 'frontends')
-rw-r--r--frontends/json/jsonparse.cc12
1 files changed, 12 insertions, 0 deletions
diff --git a/frontends/json/jsonparse.cc b/frontends/json/jsonparse.cc
index 82361ea9b..b74d41dd2 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("upto");
+ 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);