Merge pull request #134 from FFY00/arch-pkgs
github: build archlinux package
diff --git a/libtrellis/tools/ecpbram.cpp b/libtrellis/tools/ecpbram.cpp
index 275a10d..a1bc205 100644
--- a/libtrellis/tools/ecpbram.cpp
+++ b/libtrellis/tools/ecpbram.cpp
@@ -69,10 +69,11 @@
hexfile.back().at(i) = true;
}
-void parse_hexfile_line(const char *filename, int linenr, vector<vector<bool>> &hexfile, string &line)
+void parse_hexfile_line(const char *filename, int linenr, vector<vector<bool>> &hexfile, string &line, int &address)
{
vector<int> digits;
-
+ bool reading_address = false;
+
for (char c : line) {
if ('0' <= c && c <= '9')
digits.push_back(c - '0');
@@ -85,9 +86,29 @@
digits.push_back(0);
else if ('_' == c)
;
- else if (' ' == c || '\t' == c || '\r' == c) {
- push_back_bitvector(hexfile, digits);
- digits.clear();
+ else if ('@' == c) {
+ if (reading_address || !digits.empty())
+ goto error;
+ else
+ reading_address = true;
+ } else if (' ' == c || '\t' == c || '\r' == c) {
+ if (reading_address) {
+ int file_address = 0;
+ for (int i = 0; i < int(digits.size()); i++ ) {
+ file_address <<= 4;
+ file_address |= digits.at(i);
+ }
+ if (file_address != address) {
+ fprintf(stderr, "Non-contiguous address (expected @%X) at line %d of %s: %s\n", address, linenr, filename, line.c_str());
+ exit(1);
+ }
+ } else {
+ push_back_bitvector(hexfile, digits);
+ if( !digits.empty() )
+ address++;
+ }
+ digits.clear();
+ reading_address = false;
} else goto error;
}
@@ -243,12 +264,12 @@
vector<vector<bool>> to_hexfile;
string line;
+
+ for (int i = 1, address = 0; getline(from_hexfile_f, line); i++)
+ parse_hexfile_line(from_hexfile_n, i, from_hexfile, line, address);
- for (int i = 1; getline(from_hexfile_f, line); i++)
- parse_hexfile_line(from_hexfile_n, i, from_hexfile, line);
-
- for (int i = 1; getline(to_hexfile_f, line); i++)
- parse_hexfile_line(to_hexfile_n, i, to_hexfile, line);
+ for (int i = 1, address = 0; getline(to_hexfile_f, line); i++)
+ parse_hexfile_line(to_hexfile_n, i, to_hexfile, line, address);
if (to_hexfile.size() > 0 && from_hexfile.size() > to_hexfile.size()) {
if (verbose)
