all parser:

- _raw_data is now filled in configBitstreamParser
- source may be a file or a pipe
- displayHeader become a common method (configBitstreamParser)
- improve/rewrite some parser (efinixHexparser 1s -> 11ms)

src/bitparser.cpp

@@ -3,6 +3,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <iostream>
+#include <sstream>
+#include <string>
+#include <utility>
 #ifndef _WIN32
 #include <arpa/inet.h>
 #else
@@ -20,98 +23,91 @@ BitParser::BitParser(const string &filename, bool reverseOrder, bool verbose):
 	verbose), _reverseOrder(reverseOrder)
 {
 }
-BitParser::~BitParser() 
+
+BitParser::~BitParser()
 {
 }
 
-int BitParser::parseField()
+int BitParser::parseHeader()
 {
+	int pos_data = 0;
 	int ret = 1;
 	short length;
 	string tmp(64, ' ');
 	int pos, prev_pos;
 
-	/* type */
-	uint8_t type;
-	_fd.read((char *)&type, sizeof(uint8_t));
+	/* Field 1 : misc header */
+	length = *(uint16_t *)&_raw_data[0];
+	length = ntohs(length);
+	pos_data += length + 2;
 
-	if (type != 'e') {
-		_fd.read((char*)&length, sizeof(uint16_t));
-		length = ntohs(length);
-	} else {
-		length = 4;
+	length = *(uint16_t *)&_raw_data[pos_data];
+	length = ntohs(length);
+	pos_data += 2;
+
+	while (1) {
+		/* type */
+		uint8_t type;
+		type = (uint8_t)_raw_data[pos_data++];
+
+		if (type != 'e') {
+			length = *(uint16_t *)&_raw_data[pos_data];
+			length = ntohs(length);
+			pos_data += 2;
+		} else {
+			length = 4;
+		}
+		tmp = _raw_data.substr(pos_data, length);
+		pos_data += length;
+
+		switch (type) {
+			case 'a': /* design name:userid:synthesize tool version */
+				prev_pos = 0;
+				pos = tmp.find(";");
+				_hdr["design_name"] = tmp.substr(prev_pos, pos);
+				prev_pos = pos+1;
+
+				pos = tmp.find(";", prev_pos);
+				prev_pos = tmp.find("=", prev_pos) + 1;
+				_hdr["userID"] = tmp.substr(prev_pos, pos-prev_pos);
+				prev_pos = pos+1;
+
+				prev_pos = tmp.find("=", prev_pos) + 1;
+				_hdr["toolVersion"] = tmp.substr(prev_pos, length-prev_pos);
+				break;
+			case 'b': /* FPGA model */
+				_hdr["part_name"] = tmp.substr(0, length);
+				break;
+			case 'c': /* buildDate */
+				_hdr["date"] = tmp.substr(0, length);
+				break;
+			case 'd': /* buildHour */
+				_hdr["hour"] = tmp.substr(0, length);
+				break;
+			case 'e': /* file size */
+				_bit_length = 0;
+				for (int i = 0; i < 4; i++) {
+					_bit_length <<= 8;
+					_bit_length |= 0xff & tmp[i];
+				}
+				return pos_data;
+
+				break;
+		}
 	}
-	_fd.read(&tmp[0], sizeof(uint8_t)*length);
 
-	switch (type) {
-		case 'a': /* design name:userid:synthesize tool version */
-			prev_pos = 0;
-			pos = tmp.find(";");
-			_hdr["design_name"] = tmp.substr(prev_pos, pos);
-			prev_pos = pos+1;
-
-			pos = tmp.find(";", prev_pos);
-			prev_pos = tmp.find("=", prev_pos) + 1;
-			_hdr["userID"] = tmp.substr(prev_pos, pos-prev_pos);
-			prev_pos = pos+1;
-
-			prev_pos = tmp.find("=", prev_pos) + 1;
-			_hdr["toolVersion"] = tmp.substr(prev_pos);
-			break;
-		case 'b': /* FPGA model */
-			_hdr["part_name"] = tmp;
-			break;
-		case 'c': /* buildDate */
-			_hdr["date"] = tmp;
-			break;
-		case 'd': /* buildHour */
-			_hdr["hour"] = tmp;
-			break;
-		case 'e': /* file size */
-			_bit_length = 0;
-			for (int i = 0; i < 4; i++) {
-				_bit_length <<= 8;
-				_bit_length |= 0xff & tmp[i];
-			}
-			ret = 0;
-
-			break;
-	}
 	return ret;
-
 }
+
 int BitParser::parse()
 {
-	uint16_t length;
-	display("parser\n\n");
-
-	/* Field 1 : misc header */
-	_fd.read((char*)&length, sizeof(uint16_t));
-	length = ntohs(length);
-	_fd.seekg(length, _fd.cur);
-
-	_fd.read((char*)&length, sizeof(uint16_t));
-	length = ntohs(length);
-
 	/* process all field */
-	do {} while (parseField());
-
-	if (_verbose) {
-		cout << "bitstream header infos" << endl;
-		for (auto it = _hdr.begin(); it != _hdr.end(); it++) {
-				printInfo((*it).first + ": ", false);
-				printSuccess((*it).second);
-		}
-		cout << endl;
-	}
+	int pos = parseHeader();
 
 	/* rest of the file is data to send */
-	_fd.read((char *)&_bit_data[0], sizeof(uint8_t) * _bit_length);
-	if (_fd.gcount() != _bit_length) {
-		printError("Error: data read different to asked length ", false);
-		printError(to_string(_fd.gcount()) + " " + to_string(_bit_length));
-		return -1;
-	}
+	_bit_data.resize(_raw_data.size() - pos);
+	std::move(_raw_data.begin() + pos, _raw_data.end(), _bit_data.begin());
+	_bit_length = _bit_data.size();
 
 	if (_reverseOrder) {
 		for (int i = 0; i < _bit_length; i++) {