github.com/YosysHQ.nextpnr
1
0
Fork 0
mirror of https://github.com/YosysHQ/nextpnr.git synced 2026-04-28 12:57:13 +00:00
Code Issues Releases Wiki Activity

refactor: id(stringf(...)) to new idf(...) helper

Browse Source 
Signed-off-by: gatecat <gatecat@ds0.me>
This commit is contained in:
gatecat
2022-08-10 10:57:17 +01:00
parent 06ce27ed38
commit 77c82b0fbf
22 changed files with 152 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
common/kernel/basectx.cc
View File

@@ -26,6 +26,18 @@
NEXTPNR_NAMESPACE_BEGIN
IdString BaseCtx::idf(const char *fmt, ...) const
{
std::string string;
va_list ap;
va_start(ap, fmt);
string = vstringf(fmt, ap);
va_end(ap);
return id(string);
}
const char *BaseCtx::nameOfBel(BelId bel) const
{
const Context *ctx = getCtx();

2
common/kernel/basectx.h
View File

@@ -162,6 +162,8 @@ struct BaseCtx
IdString id(const char *s) const { return IdString(this, s); }
IdString idf(const char *fmt, ...) const; // create IdString using printf formatting
Context *getCtx() { return as_ctx; }
const Context *getCtx() const { return as_ctx; }

8
common/kernel/nextpnr_types.cc
View File

@@ -152,8 +152,8 @@ void CellInfo::movePortBusTo(IdString old_name, int old_offset, bool old_bracket
IdString new_name, int new_offset, bool new_brackets, int width)
{
for (int i = 0; i < width; i++) {
IdString old_port = ctx->id(stringf(old_brackets ? "%s[%d]" : "%s%d", old_name.c_str(ctx), i + old_offset));
IdString new_port = ctx->id(stringf(new_brackets ? "%s[%d]" : "%s%d", new_name.c_str(ctx), i + new_offset));
IdString old_port = ctx->idf(old_brackets ? "%s[%d]" : "%s%d", old_name.c_str(ctx), i + old_offset);
IdString new_port = ctx->idf(new_brackets ? "%s[%d]" : "%s%d", new_name.c_str(ctx), i + new_offset);
movePortTo(old_port, new_cell, new_port);
}
}
@@ -171,8 +171,8 @@ void CellInfo::copyPortBusTo(IdString old_name, int old_offset, bool old_bracket
IdString new_name, int new_offset, bool new_brackets, int width)
{
for (int i = 0; i < width; i++) {
IdString old_port = ctx->id(stringf(old_brackets ? "%s[%d]" : "%s%d", old_name.c_str(ctx), i + old_offset));
IdString new_port = ctx->id(stringf(new_brackets ? "%s[%d]" : "%s%d", new_name.c_str(ctx), i + new_offset));
IdString old_port = ctx->idf(old_brackets ? "%s[%d]" : "%s%d", old_name.c_str(ctx), i + old_offset);
IdString new_port = ctx->idf(new_brackets ? "%s[%d]" : "%s%d", new_name.c_str(ctx), i + new_offset);
copyPortTo(old_port, new_cell, new_port);
}
}