@@ -795,7 +795,6 @@ static void LoadPinLoc(pugi::xml_node Locations,
795
795
for (int height = 0 ; height < type->height ; ++height) {
796
796
for (e_side side : {TOP, RIGHT, BOTTOM, LEFT}) {
797
797
for (int pin = 0 ; pin < type->num_pin_loc_assignments [width][height][side]; ++pin) {
798
-
799
798
auto pin_range = ProcessCustomPinLoc (Locations,
800
799
type,
801
800
type->pin_loc_assignments [width][height][side][pin],
@@ -840,23 +839,23 @@ static std::pair<int, int> ProcessCustomPinLoc(pugi::xml_node Locations,
840
839
841
840
if (token.type != TOKEN_STRING || 0 != strcmp (token.data , type->name )) {
842
841
archfpga_throw (loc_data.filename_c_str (), loc_data.line (Locations),
843
- " Wrong physical type name of the port: %s\n " , pin_loc_string);
842
+ " Wrong physical type name of the port: %s\n " , pin_loc_string);
844
843
}
845
844
846
845
token_index++;
847
846
token = tokens[token_index];
848
847
849
848
if (token.type != TOKEN_DOT) {
850
849
archfpga_throw (loc_data.filename_c_str (), loc_data.line (Locations),
851
- " No dot is present to separate type name and port name: %s\n " , pin_loc_string);
850
+ " No dot is present to separate type name and port name: %s\n " , pin_loc_string);
852
851
}
853
852
854
853
token_index++;
855
854
token = tokens[token_index];
856
855
857
856
if (token.type != TOKEN_STRING) {
858
857
archfpga_throw (loc_data.filename_c_str (), loc_data.line (Locations),
859
- " No port name is present: %s\n " , pin_loc_string);
858
+ " No port name is present: %s\n " , pin_loc_string);
860
859
}
861
860
862
861
auto port = get_port_by_name (type, token.data );
@@ -876,15 +875,15 @@ static std::pair<int, int> ProcessCustomPinLoc(pugi::xml_node Locations,
876
875
877
876
if (token.type != TOKEN_OPEN_SQUARE_BRACKET) {
878
877
archfpga_throw (loc_data.filename_c_str (), loc_data.line (Locations),
879
- " No open square bracket present: %s\n " , pin_loc_string);
878
+ " No open square bracket present: %s\n " , pin_loc_string);
880
879
}
881
880
882
881
token_index++;
883
882
token = tokens[token_index];
884
883
885
884
if (token.type != TOKEN_INT) {
886
885
archfpga_throw (loc_data.filename_c_str (), loc_data.line (Locations),
887
- " No integer to indicate least significant pin index: %s\n " , pin_loc_string);
886
+ " No integer to indicate least significant pin index: %s\n " , pin_loc_string);
888
887
}
889
888
890
889
int first_pin = vtr::atoi (token.data );
@@ -896,14 +895,14 @@ static std::pair<int, int> ProcessCustomPinLoc(pugi::xml_node Locations,
896
895
if (token.type != TOKEN_COLON) {
897
896
if (token.type != TOKEN_CLOSE_SQUARE_BRACKET) {
898
897
archfpga_throw (loc_data.filename_c_str (), loc_data.line (Locations),
899
- " No closing bracket: %s\n " , pin_loc_string);
898
+ " No closing bracket: %s\n " , pin_loc_string);
900
899
}
901
900
902
901
token_index++;
903
902
904
903
if (token_index != num_tokens) {
905
904
archfpga_throw (loc_data.filename_c_str (), loc_data.line (Locations),
906
- " pin location should be completed, but more tokens are present: %s\n " , pin_loc_string);
905
+ " pin location should be completed, but more tokens are present: %s\n " , pin_loc_string);
907
906
}
908
907
909
908
return std::make_pair (abs_first_pin_idx + first_pin, abs_first_pin_idx + first_pin + 1 );
@@ -914,7 +913,7 @@ static std::pair<int, int> ProcessCustomPinLoc(pugi::xml_node Locations,
914
913
915
914
if (token.type != TOKEN_INT) {
916
915
archfpga_throw (loc_data.filename_c_str (), loc_data.line (Locations),
917
- " No integer to indicate most significant pin index: %s\n " , pin_loc_string);
916
+ " No integer to indicate most significant pin index: %s\n " , pin_loc_string);
918
917
}
919
918
920
919
int last_pin = vtr::atoi (token.data );
@@ -924,14 +923,14 @@ static std::pair<int, int> ProcessCustomPinLoc(pugi::xml_node Locations,
924
923
925
924
if (token.type != TOKEN_CLOSE_SQUARE_BRACKET) {
926
925
archfpga_throw (loc_data.filename_c_str (), loc_data.line (Locations),
927
- " No closed square bracket: %s\n " , pin_loc_string);
926
+ " No closed square bracket: %s\n " , pin_loc_string);
928
927
}
929
928
930
929
token_index++;
931
930
932
931
if (token_index != num_tokens) {
933
932
archfpga_throw (loc_data.filename_c_str (), loc_data.line (Locations),
934
- " pin location should be completed, but more tokens are present: %s\n " , pin_loc_string);
933
+ " pin location should be completed, but more tokens are present: %s\n " , pin_loc_string);
935
934
}
936
935
937
936
if (first_pin > last_pin) {
@@ -2977,7 +2976,6 @@ static void ProcessTiles(pugi::xml_node Node,
2977
2976
SetupPinLocationsAndPinClasses (Cur, &PhysicalTileType, loc_data);
2978
2977
LoadPinLoc (Cur, &PhysicalTileType, loc_data);
2979
2978
2980
-
2981
2979
// Warn that gridlocations is no longer supported
2982
2980
// TODO: eventually remove
2983
2981
try {
0 commit comments