aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ice40/arch.cc6
-rw-r--r--ice40/arch.h4
-rw-r--r--ice40/pack.cc2
-rw-r--r--ice40/place_legaliser.cc6
4 files changed, 9 insertions, 9 deletions
diff --git a/ice40/arch.cc b/ice40/arch.cc
index 1825c142..0decc513 100644
--- a/ice40/arch.cc
+++ b/ice40/arch.cc
@@ -698,7 +698,7 @@ bool Arch::isGlobalNet(const NetInfo *net) const
}
// Assign arch arg info
-void Arch::assignArchArgs()
+void Arch::assignArchInfo()
{
for (auto &net : getCtx()->nets) {
NetInfo *ni = net.second.get();
@@ -707,11 +707,11 @@ void Arch::assignArchArgs()
}
for (auto &cell : getCtx()->cells) {
CellInfo *ci = cell.second.get();
- assignCellArgs(ci);
+ assignCellInfo(ci);
}
}
-void Arch::assignCellArgs(CellInfo *cell)
+void Arch::assignCellInfo(CellInfo *cell)
{
cell->belType = belTypeFromId(cell->type);
if (cell->type == id_icestorm_lc) {
diff --git a/ice40/arch.h b/ice40/arch.h
index 8c1a3d41..f0f734ce 100644
--- a/ice40/arch.h
+++ b/ice40/arch.h
@@ -708,8 +708,8 @@ struct Arch : BaseCtx
// -------------------------------------------------
// Assign architecure-specific arguments to nets and cells, which must be called between packing or further
// netlist modifications, and validity checks
- void assignArchArgs();
- void assignCellArgs(CellInfo *cell);
+ void assignArchInfo();
+ void assignCellInfo(CellInfo *cell);
IdString id_glb_buf_out;
IdString id_icestorm_lc, id_sb_io, id_sb_gb;
diff --git a/ice40/pack.cc b/ice40/pack.cc
index 76e36151..5f7e95f3 100644
--- a/ice40/pack.cc
+++ b/ice40/pack.cc
@@ -593,7 +593,7 @@ bool Arch::pack()
pack_carries(ctx);
pack_ram(ctx);
pack_special(ctx);
- ctx->assignArchArgs();
+ ctx->assignArchInfo();
log_info("Checksum: 0x%08x\n", ctx->checksum());
return true;
} catch (log_execution_error_exception) {
diff --git a/ice40/place_legaliser.cc b/ice40/place_legaliser.cc
index 3c82a1bd..2aefb839 100644
--- a/ice40/place_legaliser.cc
+++ b/ice40/place_legaliser.cc
@@ -127,7 +127,7 @@ class PlacementLegaliser
legalise_others();
legalise_logic_tiles();
bool replaced_cells = replace_cells();
- ctx->assignArchArgs();
+ ctx->assignArchInfo();
return legalised_carries && replaced_cells;
}
@@ -372,7 +372,7 @@ class PlacementLegaliser
NPNR_ASSERT(ctx->nets.find(co_i3_name) == ctx->nets.end());
ctx->nets[co_i3_name] = std::move(co_i3_net);
IdString name = lc->name;
- ctx->assignCellArgs(lc.get());
+ ctx->assignCellInfo(lc.get());
ctx->cells[lc->name] = std::move(lc);
createdCells.insert(name);
return ctx->cells[name].get();
@@ -417,7 +417,7 @@ class PlacementLegaliser
ctx->nets[out_net_name] = std::move(out_net);
IdString name = lc->name;
- ctx->assignCellArgs(lc.get());
+ ctx->assignCellInfo(lc.get());
ctx->cells[lc->name] = std::move(lc);
createdCells.insert(name);
return ctx->cells[name].get();