diff options
| author | Clifford Wolf <clifford@clifford.at> | 2018-09-23 10:04:37 +0200 |
|---|---|---|
| committer | Clifford Wolf <clifford@clifford.at> | 2018-09-23 10:04:37 +0200 |
| commit | 9659f7a99effda1bb699f3843d3819f248c05bd0 (patch) | |
| tree | afeb00d75e72054a8867d2971222928962f7ea0b | |
| parent | 138ba7126414a3d524e7edfbbce2bdf590ac8a21 (diff) | |
| parent | 41affeeeb9935db73bb2774e74e6038a70cf667d (diff) | |
| download | yosys-9659f7a99effda1bb699f3843d3819f248c05bd0.tar.gz yosys-9659f7a99effda1bb699f3843d3819f248c05bd0.tar.bz2 yosys-9659f7a99effda1bb699f3843d3819f248c05bd0.zip | |
Merge branch 'master' of https://github.com/mmicko/yosys into yosys-0.8-rc
| -rw-r--r-- | backends/firrtl/firrtl.cc | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/backends/firrtl/firrtl.cc b/backends/firrtl/firrtl.cc index 94236d0b1..32410a651 100644 --- a/backends/firrtl/firrtl.cc +++ b/backends/firrtl/firrtl.cc @@ -33,22 +33,22 @@ dict<IdString, string> namecache; int autoid_counter; typedef unsigned FDirection; -static const FDirection NODIRECTION = 0x0; -static const FDirection IN = 0x1; -static const FDirection OUT = 0x2; -static const FDirection INOUT = 0x3; +static const FDirection FD_NODIRECTION = 0x0; +static const FDirection FD_IN = 0x1; +static const FDirection FD_OUT = 0x2; +static const FDirection FD_INOUT = 0x3; // Get a port direction with respect to a specific module. FDirection getPortFDirection(IdString id, Module *module) { Wire *wire = module->wires_.at(id); - FDirection direction = NODIRECTION; + FDirection direction = FD_NODIRECTION; if (wire && wire->port_id) { if (wire->port_input) - direction |= IN; + direction |= FD_IN; if (wire->port_output) - direction |= OUT; + direction |= FD_OUT; } return direction; } @@ -193,16 +193,16 @@ struct FirrtlWorker FDirection dir = getPortFDirection(it->first, instModule); std::string source, sink; switch (dir) { - case INOUT: + case FD_INOUT: log_warning("Instance port connection %s.%s is INOUT; treating as OUT\n", log_id(cell_type), log_signal(it->second)); - case OUT: + case FD_OUT: source = firstName; sink = secondName; break; - case NODIRECTION: + case FD_NODIRECTION: log_warning("Instance port connection %s.%s is NODIRECTION; treating as IN\n", log_id(cell_type), log_signal(it->second)); /* FALL_THROUGH */ - case IN: + case FD_IN: source = secondName; sink = firstName; break; |