diff options
| author | Clifford Wolf <clifford@clifford.at> | 2018-06-18 14:15:41 +0200 |
|---|---|---|
| committer | Clifford Wolf <clifford@clifford.at> | 2018-06-18 14:15:41 +0200 |
| commit | f30d477c8129c3c189866a4bc862724d4e8d4398 (patch) | |
| tree | 552fe4a537e6776ce9fbc360ceb9e5d62677385c /common/design.h | |
| parent | 2f5e9542c2d9132b2c01d4dbc8c4d2dff97c60cf (diff) | |
| parent | cbcd2ea3acaf257bf39b25a38d9f591e82a66f37 (diff) | |
| download | nextpnr-f30d477c8129c3c189866a4bc862724d4e8d4398.tar.gz nextpnr-f30d477c8129c3c189866a4bc862724d4e8d4398.tar.bz2 nextpnr-f30d477c8129c3c189866a4bc862724d4e8d4398.zip | |
Merge branch 'refactor'
Diffstat (limited to 'common/design.h')
| -rw-r--r-- | common/design.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/common/design.h b/common/design.h index e763ed48..cae50904 100644 --- a/common/design.h +++ b/common/design.h @@ -70,17 +70,15 @@ struct CellInfo std::unordered_map<IdString, IdString> pins; }; -struct Design +struct Context : Arch { - struct Chip chip; + std::unordered_map<IdString, NetInfo *> nets; + std::unordered_map<IdString, CellInfo *> cells; - Design(ChipArgs args) : chip(args) + Context(ArchArgs args) : Arch(args) { // ... } - - std::unordered_map<IdString, NetInfo *> nets; - std::unordered_map<IdString, CellInfo *> cells; }; NEXTPNR_NAMESPACE_END |