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

nexus: Globals and naming fixes

Browse Source 
Signed-off-by: David Shah <dave@ds0.me>
This commit is contained in:
David Shah 2020-01-15 12:59:20 +00:00
parent b5d46a0235
commit 46010f33ad
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nexus/arch.h
View File

@ -213,7 +213,7 @@ NPNR_PACKED_STRUCT(struct GlobalHrowInfoPOD {
uint16_t hrow_col; uint16_t hrow_col;
uint16_t padding; uint16_t padding;
uint32_t num_spine_cols; uint32_t num_spine_cols;
RelPtr<uint16_t> spine_cols; RelPtr<uint32_t> spine_cols;
}); });
NPNR_PACKED_STRUCT(struct GlobalInfoPOD { NPNR_PACKED_STRUCT(struct GlobalInfoPOD {
@ -799,7 +799,7 @@ struct Arch : BaseCtx
{ {
std::string name = "X"; std::string name = "X";
name += std::to_string(bel.tile % chip_info->width); name += std::to_string(bel.tile % chip_info->width);
name += "Y"; name += "/Y";
name += std::to_string(bel.tile / chip_info->width); name += std::to_string(bel.tile / chip_info->width);
name += "/"; name += "/";
name += nameOf(IdString(bel_data(bel).name)); name += nameOf(IdString(bel_data(bel).name));
@ -910,7 +910,7 @@ struct Arch : BaseCtx
{ {
std::string name = "X"; std::string name = "X";
name += std::to_string(wire.tile % chip_info->width); name += std::to_string(wire.tile % chip_info->width);
name += "Y"; name += "/Y";
name += std::to_string(wire.tile / chip_info->width); name += std::to_string(wire.tile / chip_info->width);
name += "/"; name += "/";
name += nameOf(IdString(wire_data(wire).name)); name += nameOf(IdString(wire_data(wire).name));