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

bitparser: drop garbage characters, use _hdr, best header parsing and display

This commit is contained in:
Gwenhael Goavec-Merou 2021-02-17 19:02:57 +01:00
parent 4a555bb102
commit 48e65fa0ad
2 changed files with 30 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
src/bitparser.cpp
View File

@ -1,4 +1,5 @@
#include "bitparser.hpp" #include "bitparser.hpp"
#include "display.hpp"
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <iostream> #include <iostream>
@ -16,8 +17,7 @@ using namespace std;
BitParser::BitParser(const string &filename, bool reverseOrder, bool verbose): BitParser::BitParser(const string &filename, bool reverseOrder, bool verbose):
ConfigBitstreamParser(filename, ConfigBitstreamParser::BIN_MODE, ConfigBitstreamParser(filename, ConfigBitstreamParser::BIN_MODE,
verbose), fieldA(), part_name(), date(), hour(), verbose), _reverseOrder(reverseOrder)
design_name(), userID(), toolVersion(), _reverseOrder(reverseOrder)
{ {
} }
BitParser::~BitParser() BitParser::~BitParser()
@ -28,7 +28,7 @@ int BitParser::parseField()
{ {
int ret = 1; int ret = 1;
short length; short length;
char tmp[64]; string tmp(64, ' ');
int pos, prev_pos; int pos, prev_pos;
/* type */ /* type */
@ -41,47 +41,38 @@ int BitParser::parseField()
} else { } else {
length = 4; length = 4;
} }
_fd.read(tmp, sizeof(uint8_t)*length); _fd.read(&tmp[0], sizeof(uint8_t)*length);
if (_verbose) {
for (int i = 0; i < length; i++)
printf("%c", tmp[i]);
printf("\n");
}
switch (type) { switch (type) {
case 'a': /* design name:userid:synthesize tool version */ case 'a': /* design name:userid:synthesize tool version */
fieldA=(tmp);
prev_pos = 0; prev_pos = 0;
pos = fieldA.find(";"); pos = tmp.find(";");
design_name = fieldA.substr(prev_pos, pos); _hdr["design_name"] = tmp.substr(prev_pos, pos);
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 = tmp.find(";", prev_pos);
userID = fieldA.substr(prev_pos, pos-prev_pos); prev_pos = tmp.find("=", prev_pos) + 1;
display("%d %d %s\n", prev_pos, pos, userID.c_str()); _hdr["userID"] = tmp.substr(prev_pos, pos-prev_pos);
prev_pos = pos+1; prev_pos = pos+1;
//pos = fieldA.find(";", prev_pos); prev_pos = tmp.find("=", prev_pos) + 1;
toolVersion = fieldA.substr(prev_pos); _hdr["toolVersion"] = tmp.substr(prev_pos);
display("%d %d %s\n", prev_pos, pos, toolVersion.c_str());
break; break;
case 'b': /* FPGA model */ case 'b': /* FPGA model */
part_name = (tmp); _hdr["part_name"] = tmp;
break; break;
case 'c': /* buildDate */ case 'c': /* buildDate */
date = (tmp); _hdr["date"] = tmp;
break; break;
case 'd': /* buildHour */ case 'd': /* buildHour */
hour = (tmp); _hdr["hour"] = tmp;
break; break;
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++) {
display("%x %x\n", 0xff & tmp[i], _bit_length);
_bit_length <<= 8; _bit_length <<= 8;
_bit_length |= 0xff & tmp[i]; _bit_length |= 0xff & tmp[i];
} }
display(" %x\n", _bit_length);
ret = 0; ret = 0;
break; break;
@ -106,23 +97,19 @@ int BitParser::parse()
do {} while (parseField()); do {} while (parseField());
if (_verbose) { if (_verbose) {
display("results\n\n"); cout << "bitstream header infos" << endl;
for (auto it = _hdr.begin(); it != _hdr.end(); it++) {
cout << "fieldA : " << fieldA << endl; printInfo((*it).first + ": ", false);
cout << " : " << design_name << ";" << userID << ";" << toolVersion << endl; printSuccess((*it).second);
cout << "part name : " << part_name << endl; }
cout << "date : " << date << endl; cout << endl;
cout << "hour : " << hour << 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();
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 "; printError("Error: data read different to asked length ", false);
cerr << to_string(_fd.gcount()) << " " << to_string(_bit_length) << endl; printError(to_string(_fd.gcount()) + " " + to_string(_bit_length));
return -1; return -1;
} }

14
src/bitparser.hpp
View File

@ -14,13 +14,13 @@ class BitParser: public ConfigBitstreamParser {
private: private:
int parseField(); int parseField();
std::string fieldA; //std::string fieldA;
std::string part_name; //std::string part_name;
std::string date; //std::string date;
std::string hour; //std::string hour;
std::string design_name; //std::string design_name;
std::string userID; //std::string userID;
std::string toolVersion; //std::string toolVersion;
bool _reverseOrder; bool _reverseOrder;
}; };