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

Fixed packing non pod

Browse Source
This commit is contained in:
Miodrag Milanovic 2018-07-25 17:42:32 +02:00
parent a8001daf6f
commit 790d7159bb
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ecp5/arch.cc
View File

@ -328,7 +328,7 @@ BelId Arch::getPackagePinBel(const std::string &pin) const
std::string Arch::getBelPackagePin(BelId bel) const std::string Arch::getBelPackagePin(BelId bel) const
{ {
for (int i = 0; i < package_info->num_pins; i++) { for (int i = 0; i < package_info->num_pins; i++) {
if (package_info->pin_data[i].abs_loc == bel.location && package_info->pin_data[i].bel_index == bel.index) { if (Location(package_info->pin_data[i].abs_loc) == bel.location && package_info->pin_data[i].bel_index == bel.index) {
return package_info->pin_data[i].name.get(); return package_info->pin_data[i].name.get();
} }
} }
@ -338,7 +338,7 @@ std::string Arch::getBelPackagePin(BelId bel) const
int Arch::getPioBelBank(BelId bel) const int Arch::getPioBelBank(BelId bel) const
{ {
for (int i = 0; i < chip_info->num_pios; i++) { for (int i = 0; i < chip_info->num_pios; i++) {
if (chip_info->pio_info[i].abs_loc == bel.location && chip_info->pio_info[i].bel_index == bel.index) { if (Location(chip_info->pio_info[i].abs_loc) == bel.location && chip_info->pio_info[i].bel_index == bel.index) {
return chip_info->pio_info[i].bank; return chip_info->pio_info[i].bank;
} }
} }
@ -348,7 +348,7 @@ int Arch::getPioBelBank(BelId bel) const
std::string Arch::getPioFunctionName(BelId bel) const std::string Arch::getPioFunctionName(BelId bel) const
{ {
for (int i = 0; i < chip_info->num_pios; i++) { for (int i = 0; i < chip_info->num_pios; i++) {
if (chip_info->pio_info[i].abs_loc == bel.location && chip_info->pio_info[i].bel_index == bel.index) { if (Location(chip_info->pio_info[i].abs_loc) == bel.location && chip_info->pio_info[i].bel_index == bel.index) {
const char *func = chip_info->pio_info[i].function_name.get(); const char *func = chip_info->pio_info[i].function_name.get();
if (func == nullptr) if (func == nullptr)
return ""; return "";

4
ecp5/arch.h
View File

@ -98,7 +98,7 @@ NPNR_PACKED_STRUCT(struct LocationTypePOD {
}); });
NPNR_PACKED_STRUCT(struct PIOInfoPOD { NPNR_PACKED_STRUCT(struct PIOInfoPOD {
Location abs_loc; LocationPOD abs_loc;
int32_t bel_index; int32_t bel_index;
RelPtr<char> function_name; RelPtr<char> function_name;
int16_t bank; int16_t bank;
@ -107,7 +107,7 @@ NPNR_PACKED_STRUCT(struct PIOInfoPOD {
NPNR_PACKED_STRUCT(struct PackagePinPOD { NPNR_PACKED_STRUCT(struct PackagePinPOD {
RelPtr<char> name; RelPtr<char> name;
Location abs_loc; LocationPOD abs_loc;
int32_t bel_index; int32_t bel_index;
}); });