luke
/
openFPGALoader
mirror of https://github.com/trabucayre/openFPGALoader.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

jedParser: fix checksum when configuration data size is not multiple of 8bits

This commit is contained in:
Gwenhael Goavec-Merou 2021-09-25 15:06:13 +02:00
parent 8114b7ff74
commit bd903be6b6
1 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/jedParser.cpp
View File

@ -263,12 +263,21 @@ int JedParser::parse()
*/ */
std::vector<string>lines; std::vector<string>lines;
int first_pos; int first_pos;
char instr;
do { do {
lines = readJEDLine(); lines = readJEDLine();
if (lines.size() == 0) /* empty or end of file */
break; if (lines.size() == 0) {
if (_ss.eof()) {
break;
} else {
instr = 0;
continue;
}
}
instr = lines[0][0];
switch (lines[0][0]) { switch (instr) {
case 'N': // note case 'N': // note
/* note may start with "N " or "NOTE " */ /* note may start with "N " or "NOTE " */
first_pos = lines[0].find_first_of(' ', 0) + 1; first_pos = lines[0].find_first_of(' ', 0) + 1;
@ -338,15 +347,24 @@ int JedParser::parse()
cout << lines[0]<< endl; cout << lines[0]<< endl;
return EXIT_FAILURE; return EXIT_FAILURE;
} }
} while (lines[0][0] != 0x03); } while (instr != 0x03);
int size = 0; int size = 0;
for (size_t area = 0; area < _data_list.size(); area++) { for (size_t area = 0; area < _data_list.size(); area++) {
size += _data_list[area].len; size += _data_list[area].len;
} }
for (size_t i = 0; i < fuselist.size(); i+=8) std::string fuses;
_compute_checksum += reverseByte(std::stoi(fuselist.substr(i, 8), std::copy(fuselist.begin(), fuselist.end(), std::back_inserter(fuses));
if (fuses.size() % 8) {
int diff = (((fuses.size() / 8) + 1) * 8) - fuses.size();
for (int i = 0; i < diff; i++)
fuses += '0';
}
for (size_t i = 0; i < fuses.size(); i+=8)
_compute_checksum += reverseByte(std::stoi(fuses.substr(i, 8),
nullptr, 2)); nullptr, 2));
if (_verbose) if (_verbose)