diff options
| author | Xiretza <xiretza@xiretza.xyz> | 2020-07-03 13:13:21 +0200 |
|---|---|---|
| committer | Marcelina Kościelnicka <mwk@0x04.net> | 2020-08-18 19:36:24 +0200 |
| commit | 916028906ab8b74db835e4857fa21580be353f85 (patch) | |
| tree | 8c9e2c2272a0e6670de3a69a25c49f74ef4e6daf | |
| parent | 928fd40c2ebc8b83b76c02d80d751d2531341d9d (diff) | |
| download | yosys-916028906ab8b74db835e4857fa21580be353f85.tar.gz yosys-916028906ab8b74db835e4857fa21580be353f85.tar.bz2 yosys-916028906ab8b74db835e4857fa21580be353f85.zip | |
Ensure \A_SIGNED is never used with $shiftx
It has no effect on the output ($shiftx doesn't perform any sign
extension whatsoever), so an attempt to use it should be caught early.
| -rw-r--r-- | kernel/rtlil.cc | 6 | ||||
| -rw-r--r-- | passes/tests/test_cell.cc | 4 |
2 files changed, 9 insertions, 1 deletions
diff --git a/kernel/rtlil.cc b/kernel/rtlil.cc index d7d226942..c56f0dcab 100644 --- a/kernel/rtlil.cc +++ b/kernel/rtlil.cc @@ -1035,7 +1035,11 @@ namespace { } if (cell->type.in(ID($shift), ID($shiftx))) { - param_bool(ID::A_SIGNED); + if (cell->type == ID($shiftx)) { + param_bool(ID::A_SIGNED, /*expected=*/false); + } else { + param_bool(ID::A_SIGNED); + } param_bool(ID::B_SIGNED); port(ID::A, param(ID::A_WIDTH)); port(ID::B, param(ID::B_WIDTH)); diff --git a/passes/tests/test_cell.cc b/passes/tests/test_cell.cc index bdb475d3b..228b6b67a 100644 --- a/passes/tests/test_cell.cc +++ b/passes/tests/test_cell.cc @@ -264,6 +264,10 @@ static void create_gold_module(RTLIL::Design *design, RTLIL::IdString cell_type, cell->setPort(ID::Y, wire); } + if (cell_type.in(ID($shiftx))) { + cell->parameters[ID::A_SIGNED] = false; + } + if (cell_type.in(ID($shl), ID($shr), ID($sshl), ID($sshr))) { cell->parameters[ID::B_SIGNED] = false; } |