caiyu/nextpnr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #940 from VioletEternity/truncated-config-words

Browse Source 
ecp5: accept lowercase characters in hex strings
This commit is contained in:
gatecat 2022-03-12 20:36:31 +00:00 committed by GitHub
commit 851007b4a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ecp5/bitstream.cc
View File

@ -131,7 +131,7 @@ static void tie_cib_signal(Context *ctx, ChipConfig &cc, WireId wire, bool value
inline int chtohex(char c) inline int chtohex(char c)
{ {
static const std::string hex = "0123456789ABCDEF"; static const std::string hex = "0123456789ABCDEF";
return hex.find(c); return hex.find(std::toupper(c));
} }
std::vector<bool> parse_init_str(const Property &p, int length, const char *cellname) std::vector<bool> parse_init_str(const Property &p, int length, const char *cellname)
@ -149,6 +149,8 @@ std::vector<bool> parse_init_str(const Property &p, int length, const char *cell
for (int i = 0; i < int(str.length()) - 2; i++) { for (int i = 0; i < int(str.length()) - 2; i++) {
char c = str.at((str.size() - i) - 1); char c = str.at((str.size() - i) - 1);
int nibble = chtohex(c); int nibble = chtohex(c);
if (nibble == (int)std::string::npos)
log_error("hex string has invalid char '%c' at position %d.\n", c, i);
result.at(i * 4) = nibble & 0x1; result.at(i * 4) = nibble & 0x1;
if (i * 4 + 1 < length) if (i * 4 + 1 < length)
result.at(i * 4 + 1) = nibble & 0x2; result.at(i * 4 + 1) = nibble & 0x2;
@ -582,13 +584,16 @@ static std::vector<bool> parse_config_str(const Property &p, int length)
if (base == "0b") { if (base == "0b") {
for (int i = 0; i < int(str.length()) - 2; i++) { for (int i = 0; i < int(str.length()) - 2; i++) {
char c = str.at((str.size() - 1) - i); char c = str.at((str.size() - 1) - i);
NPNR_ASSERT(c == '0' || c == '1'); if (!(c == '0' || c == '1'))
log_error("binary string has invalid char '%c' at position %d.\n", c, i);
word.at(i) = (c == '1'); word.at(i) = (c == '1');
} }
} else if (base == "0x") { } else if (base == "0x") {
for (int i = 0; i < int(str.length()) - 2; i++) { for (int i = 0; i < int(str.length()) - 2; i++) {
char c = str.at((str.size() - i) - 1); char c = str.at((str.size() - i) - 1);
int nibble = chtohex(c); int nibble = chtohex(c);
if (nibble == (int)std::string::npos)
log_error("hex string has invalid char '%c' at position %d.\n", c, i);
word.at(i * 4) = nibble & 0x1; word.at(i * 4) = nibble & 0x1;
if (i * 4 + 1 < length) if (i * 4 + 1 < length)
word.at(i * 4 + 1) = nibble & 0x2; word.at(i * 4 + 1) = nibble & 0x2;