diff options
| author | gatecat <gatecat@ds0.me> | 2022-03-12 20:36:31 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-12 20:36:31 +0000 |
| commit | 851007b4a1ab5d42c8bf28b95b43cc4e799db630 (patch) | |
| tree | 7773bacfcb120331e5ace98b56ffd476cf5d842a | |
| parent | 233ea62c13cc4a5da29a704619cac2c6a5de4fce (diff) | |
| parent | 9f53bd42788460d6bebd4f2f50af32a710667c93 (diff) | |
| download | nextpnr-851007b4a1ab5d42c8bf28b95b43cc4e799db630.tar.gz nextpnr-851007b4a1ab5d42c8bf28b95b43cc4e799db630.tar.bz2 nextpnr-851007b4a1ab5d42c8bf28b95b43cc4e799db630.zip | |
Merge pull request #940 from VioletEternity/truncated-config-words
ecp5: accept lowercase characters in hex strings
| -rw-r--r-- | ecp5/bitstream.cc | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/ecp5/bitstream.cc b/ecp5/bitstream.cc index a23e4cd2..40d843b9 100644 --- a/ecp5/bitstream.cc +++ b/ecp5/bitstream.cc @@ -131,7 +131,7 @@ static void tie_cib_signal(Context *ctx, ChipConfig &cc, WireId wire, bool value inline int chtohex(char c) { 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) @@ -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++) { char c = str.at((str.size() - i) - 1); 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; if (i * 4 + 1 < length) 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") { for (int i = 0; i < int(str.length()) - 2; 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'); } } else if (base == "0x") { for (int i = 0; i < int(str.length()) - 2; i++) { char c = str.at((str.size() - i) - 1); 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; if (i * 4 + 1 < length) word.at(i * 4 + 1) = nibble & 0x2; |