Ensure fid() calls make_id() for consistency; tests/simple/dff_init.v fails

Mark dff_init.v as expected to fail since it uses "initial value".

diff --git a/backends/firrtl/firrtl.cc b/backends/firrtl/firrtl.cc
index 88c1038b7ebeb8dec2ed5db61bfaa91f778bd6ff..eef6401b23c1d8921e4961c692f0d483730e4ece 100644 (file)
--- 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 5bc75347b9bf31baedfdc66c3bc3a77de9984ba9..50d69351383b7aa62f37b399dd837356b9f2393a 100644 (file)
--- 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