aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClifford Wolf <clifford@clifford.at>2019-08-09 18:54:03 +0200
committerClifford Wolf <clifford@clifford.at>2019-08-11 11:39:46 +0200
commitb5534b66c8fb0cfb4f3e62a6ee694d1f603dc7d8 (patch)
tree3d8dc532ec0324f76e655628934a38598eeec351
parentc851dc13108021834533094a8a3236da6d9e0161 (diff)
downloadyosys-b5534b66c8fb0cfb4f3e62a6ee694d1f603dc7d8.tar.gz
yosys-b5534b66c8fb0cfb4f3e62a6ee694d1f603dc7d8.tar.bz2
yosys-b5534b66c8fb0cfb4f3e62a6ee694d1f603dc7d8.zip
Improve API of ID() macro
Signed-off-by: Clifford Wolf <clifford@clifford.at>
-rw-r--r--kernel/yosys.h12
1 files changed, 10 insertions, 2 deletions
diff --git a/kernel/yosys.h b/kernel/yosys.h
index 09e8139bb..49716ed52 100644
--- a/kernel/yosys.h
+++ b/kernel/yosys.h
@@ -305,8 +305,16 @@ RTLIL::IdString new_id(std::string file, int line, std::string func);
#define NEW_ID \
YOSYS_NAMESPACE_PREFIX new_id(__FILE__, __LINE__, __FUNCTION__)
-#define ID(_str) \
- ([]() { static YOSYS_NAMESPACE_PREFIX RTLIL::IdString _id(_str); return _id; })()
+// Create a statically allocated IdString object, using for example ID(A) or ID($add).
+//
+// Recipe for Converting old code that is using conversion of strings like "\\A" and
+// "$add" for creating IdStrings: Run below SED command on the .cc file and then use for
+// example "meld foo.cc foo.cc.orig" to manually compile errors, if necessary.
+//
+// sed -i.orig -r 's/"\\\\([a-zA-Z0-9_]+)"/ID(\1)/g; s/"(\$[a-zA-Z0-9_]+)"/ID(\1)/g;' <filename>
+//
+#define ID(_id) ([]() { const char *p = "\\" #_id, *q = p[1] == '$' ? p+1 : p; \
+ static const YOSYS_NAMESPACE_PREFIX RTLIL::IdString id(q); return id; })()
RTLIL::Design *yosys_get_design();
std::string proc_self_dirname();