aboutsummaryrefslogtreecommitdiffstats
path: root/json
diff options
context:
space:
mode:
authorDavid Shah <davey1576@gmail.com>2018-11-29 19:46:05 +0000
committerGitHub <noreply@github.com>2018-11-29 19:46:05 +0000
commit58e9c6f32e7ab6a5f83245141f00c3955b91d905 (patch)
tree534505a2b1c3e8fddb773207c47da615ba865d7f /json
parentfc08856537aaa33e09642e55de0b9a95a53d3fd7 (diff)
parent8af367ad0ad7a2ea0bc11f4f20326dacfeb26d65 (diff)
downloadnextpnr-58e9c6f32e7ab6a5f83245141f00c3955b91d905.tar.gz
nextpnr-58e9c6f32e7ab6a5f83245141f00c3955b91d905.tar.bz2
nextpnr-58e9c6f32e7ab6a5f83245141f00c3955b91d905.zip
Merge pull request #158 from YosysHQ/improve_error
Error reporting improvements
Diffstat (limited to 'json')
-rw-r--r--json/jsonparse.cc6
1 files changed, 5 insertions, 1 deletions
diff --git a/json/jsonparse.cc b/json/jsonparse.cc
index bddbee0b..b953fc7c 100644
--- a/json/jsonparse.cc
+++ b/json/jsonparse.cc
@@ -594,7 +594,11 @@ void json_import_cell(Context *ctx, string modname, const std::vector<IdString>
if (type == PORT_IN || type == PORT_INOUT) {
net->users.push_back(pr);
} else if (type == PORT_OUT) {
- assert(net->driver.cell == nullptr);
+ if (net->driver.cell != nullptr)
+ log_error("multiple drivers on net '%s' (%s.%s and %s.%s)\n",
+ net->name.c_str(ctx), net->driver.cell->name.c_str(ctx),
+ net->driver.port.c_str(ctx), pr.cell->name.c_str(ctx),
+ pr.port.c_str(ctx));
net->driver = pr;
}
}