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

bitparser: add verbose mode

This commit is contained in:
Gwenhael Goavec-Merou 2019-11-21 08:55:58 +01:00
parent 52defc14fd
commit 7b4b2cbadf
2 changed files with 25 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
bitparser.cpp
View File

@ -6,16 +6,12 @@
using namespace std; using namespace std;
#ifdef DEBUG
#define display(...) \ #define display(...) \
do { if (1) fprintf(stdout, __VA_ARGS__);} while(0) do { if (_verbose) fprintf(stdout, __VA_ARGS__);} while(0)
#else
#define display(...) do {} while(0)
#endif
BitParser::BitParser(string filename): BitParser::BitParser(string filename, bool verbose):
ConfigBitstreamParser(filename, ConfigBitstreamParser::BIN_MODE), ConfigBitstreamParser(filename, ConfigBitstreamParser::BIN_MODE,
fieldA(), part_name(), date(), hour(), verbose), fieldA(), part_name(), date(), hour(),
design_name(), userID(), toolVersion() design_name(), userID(), toolVersion()
{ {
} }
@ -41,28 +37,28 @@ int BitParser::parseField()
length = 4; length = 4;
} }
_fd.read(tmp, sizeof(uint8_t)*length); _fd.read(tmp, sizeof(uint8_t)*length);
#ifdef DEBUG if (_verbose) {
for (int i = 0; i < length; i++) for (int i = 0; i < length; i++)
printf("%c", tmp[i]); printf("%c", tmp[i]);
printf("\n"); printf("\n");
#endif }
switch (type) { switch (type) {
case 'a': /* design name:userid:synthesize tool version */ case 'a': /* design name:userid:synthesize tool version */
fieldA=(tmp); fieldA=(tmp);
prev_pos = 0; prev_pos = 0;
pos = fieldA.find(";"); pos = fieldA.find(";");
design_name = fieldA.substr(prev_pos, pos); design_name = fieldA.substr(prev_pos, pos);
printf("%d %d %s\n", prev_pos, pos, design_name.c_str()); display("%d %d %s\n", prev_pos, pos, design_name.c_str());
prev_pos = pos+1; prev_pos = pos+1;
pos = fieldA.find(";", prev_pos); pos = fieldA.find(";", prev_pos);
userID = fieldA.substr(prev_pos, pos-prev_pos); userID = fieldA.substr(prev_pos, pos-prev_pos);
printf("%d %d %s\n", prev_pos, pos, userID.c_str()); display("%d %d %s\n", prev_pos, pos, userID.c_str());
prev_pos = pos+1; prev_pos = pos+1;
//pos = fieldA.find(";", prev_pos); //pos = fieldA.find(";", prev_pos);
toolVersion = fieldA.substr(prev_pos); toolVersion = fieldA.substr(prev_pos);
printf("%d %d %s\n", prev_pos, pos, toolVersion.c_str()); display("%d %d %s\n", prev_pos, pos, toolVersion.c_str());
break; break;
case 'b': /* FPGA model */ case 'b': /* FPGA model */
part_name = (tmp); part_name = (tmp);
@ -76,15 +72,11 @@ int BitParser::parseField()
case 'e': /* file size */ case 'e': /* file size */
_bit_length = 0; _bit_length = 0;
for (int i = 0; i < 4; i++) { for (int i = 0; i < 4; i++) {
#ifdef DEBUG display("%x %x\n", 0xff & tmp[i], _bit_length);
printf("%x %x\n", 0xff & tmp[i], _bit_length);
#endif
_bit_length <<= 8; _bit_length <<= 8;
_bit_length |= 0xff & tmp[i]; _bit_length |= 0xff & tmp[i];
} }
#ifdef DEBUG display(" %x\n", _bit_length);
printf(" %x\n", _bit_length);
#endif
ret = 0; ret = 0;
break; break;
@ -108,18 +100,20 @@ int BitParser::parse()
/* process all field */ /* process all field */
do {} while (parseField()); do {} while (parseField());
display("results\n\n"); if (_verbose) {
display("results\n\n");
cout << "fieldA : " << fieldA << endl; cout << "fieldA : " << fieldA << endl;
cout << " : " << design_name << ";" << userID << ";" << toolVersion << endl; cout << " : " << design_name << ";" << userID << ";" << toolVersion << endl;
cout << "part name : " << part_name << endl; cout << "part name : " << part_name << endl;
cout << "date : " << date << endl; cout << "date : " << date << endl;
cout << "hour : " << hour << endl; cout << "hour : " << hour << endl;
cout << "file length : " << _bit_length << endl; cout << "file length : " << _bit_length << endl;
}
/* rest of the file is data to send */ /* rest of the file is data to send */
int pos = _fd.tellg(); int pos = _fd.tellg();
cout << pos + _bit_length << endl; display("%d %d\n", pos, _bit_length);
_fd.read((char *)&_bit_data[0], sizeof(uint8_t) * _bit_length); _fd.read((char *)&_bit_data[0], sizeof(uint8_t) * _bit_length);
if (_fd.gcount() != _bit_length) { if (_fd.gcount() != _bit_length) {
cerr << "Error: data read different to asked length "; cerr << "Error: data read different to asked length ";

2
bitparser.hpp
View File

@ -8,7 +8,7 @@
class BitParser: public ConfigBitstreamParser { class BitParser: public ConfigBitstreamParser {
public: public:
BitParser(std::string filename); BitParser(std::string filename, bool verbose = false);
~BitParser(); ~BitParser();
int parse(); int parse();