caiyu/nextpnr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ice40: Renaming

Browse Source 
Signed-off-by: David Shah <davey1576@gmail.com>
This commit is contained in:
David Shah 2018-07-18 14:34:32 +02:00
parent ddd94edfe0
commit 08ceb8a059
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ice40/arch.cc
View File

@ -698,7 +698,7 @@ bool Arch::isGlobalNet(const NetInfo *net) const
} }
// Assign arch arg info // Assign arch arg info
void Arch::assignArchArgs() void Arch::assignArchInfo()
{ {
for (auto &net : getCtx()->nets) { for (auto &net : getCtx()->nets) {
NetInfo *ni = net.second.get(); NetInfo *ni = net.second.get();
@ -707,11 +707,11 @@ void Arch::assignArchArgs()
} }
for (auto &cell : getCtx()->cells) { for (auto &cell : getCtx()->cells) {
CellInfo *ci = cell.second.get(); CellInfo *ci = cell.second.get();
assignCellArgs(ci); assignCellInfo(ci);
} }
} }
void Arch::assignCellArgs(CellInfo *cell) void Arch::assignCellInfo(CellInfo *cell)
{ {
cell->belType = belTypeFromId(cell->type); cell->belType = belTypeFromId(cell->type);
if (cell->type == id_icestorm_lc) { if (cell->type == id_icestorm_lc) {

4
ice40/arch.h
View File

@ -708,8 +708,8 @@ struct Arch : BaseCtx
// ------------------------------------------------- // -------------------------------------------------
// Assign architecure-specific arguments to nets and cells, which must be called between packing or further // Assign architecure-specific arguments to nets and cells, which must be called between packing or further
// netlist modifications, and validity checks // netlist modifications, and validity checks
void assignArchArgs(); void assignArchInfo();
void assignCellArgs(CellInfo *cell); void assignCellInfo(CellInfo *cell);
IdString id_glb_buf_out; IdString id_glb_buf_out;
IdString id_icestorm_lc, id_sb_io, id_sb_gb; IdString id_icestorm_lc, id_sb_io, id_sb_gb;

2
ice40/pack.cc
View File

@ -593,7 +593,7 @@ bool Arch::pack()
pack_carries(ctx); pack_carries(ctx);
pack_ram(ctx); pack_ram(ctx);
pack_special(ctx); pack_special(ctx);
ctx->assignArchArgs(); ctx->assignArchInfo();
log_info("Checksum: 0x%08x\n", ctx->checksum()); log_info("Checksum: 0x%08x\n", ctx->checksum());
return true; return true;
} catch (log_execution_error_exception) { } catch (log_execution_error_exception) {

6
ice40/place_legaliser.cc
View File

@ -127,7 +127,7 @@ class PlacementLegaliser
legalise_others(); legalise_others();
legalise_logic_tiles(); legalise_logic_tiles();
bool replaced_cells = replace_cells(); bool replaced_cells = replace_cells();
ctx->assignArchArgs(); ctx->assignArchInfo();
return legalised_carries && replaced_cells; return legalised_carries && replaced_cells;
} }
@ -372,7 +372,7 @@ class PlacementLegaliser
NPNR_ASSERT(ctx->nets.find(co_i3_name) == ctx->nets.end()); NPNR_ASSERT(ctx->nets.find(co_i3_name) == ctx->nets.end());
ctx->nets[co_i3_name] = std::move(co_i3_net); ctx->nets[co_i3_name] = std::move(co_i3_net);
IdString name = lc->name; IdString name = lc->name;
ctx->assignCellArgs(lc.get()); ctx->assignCellInfo(lc.get());
ctx->cells[lc->name] = std::move(lc); ctx->cells[lc->name] = std::move(lc);
createdCells.insert(name); createdCells.insert(name);
return ctx->cells[name].get(); return ctx->cells[name].get();
@ -417,7 +417,7 @@ class PlacementLegaliser
ctx->nets[out_net_name] = std::move(out_net); ctx->nets[out_net_name] = std::move(out_net);
IdString name = lc->name; IdString name = lc->name;
ctx->assignCellArgs(lc.get()); ctx->assignCellInfo(lc.get());
ctx->cells[lc->name] = std::move(lc); ctx->cells[lc->name] = std::move(lc);
createdCells.insert(name); createdCells.insert(name);
return ctx->cells[name].get(); return ctx->cells[name].get();