diff options
| author | Clifford Wolf <clifford@clifford.at> | 2019-03-05 15:19:28 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-05 15:19:28 -0800 |
| commit | 855b9dc60661f79252d1f49e0a93911ce7b5a9b4 (patch) | |
| tree | 84a1eea62211c9ed70d4e04499e1ecdc4615c2de | |
| parent | 13844c765818b5d8c0d16d62dcc530f688d2c28a (diff) | |
| parent | d6c4dfb9020ee19eebe3adadca89b65627184d81 (diff) | |
| download | yosys-855b9dc60661f79252d1f49e0a93911ce7b5a9b4.tar.gz yosys-855b9dc60661f79252d1f49e0a93911ce7b5a9b4.tar.bz2 yosys-855b9dc60661f79252d1f49e0a93911ce7b5a9b4.zip | |
Merge pull request #852 from ucb-bar/firrtlfixes
Ensure fid() calls make_id() for consistency; tests/simple/dff_init.v fails
| -rw-r--r-- | backends/firrtl/firrtl.cc | 3 | ||||
| -rw-r--r-- | tests/simple/xfirrtl | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/backends/firrtl/firrtl.cc b/backends/firrtl/firrtl.cc index 88c1038b7..eef6401b2 100644 --- a/backends/firrtl/firrtl.cc +++ b/backends/firrtl/firrtl.cc @@ -165,8 +165,7 @@ struct FirrtlWorker std::string fid(RTLIL::IdString internal_id) { - const char *str = internal_id.c_str(); - return *str == '\\' ? str + 1 : str; + return make_id(internal_id); } std::string cellname(RTLIL::Cell *cell) diff --git a/tests/simple/xfirrtl b/tests/simple/xfirrtl index 5bc75347b..50d693513 100644 --- a/tests/simple/xfirrtl +++ b/tests/simple/xfirrtl @@ -1,6 +1,7 @@ # This file contains the names of verilog files to exclude from verilog to FIRRTL regression tests due to known failures. arraycells.v inst id[0] of dff_different_styles.v +dff_init.v Initial value not supported generate.v combinational loop hierdefparam.v inst id[0] of i2c_master_tests.v $adff |