diff options
| author | Eddie Hung <eddie@fpgeh.com> | 2019-06-20 16:08:58 -0700 |
|---|---|---|
| committer | Eddie Hung <eddie@fpgeh.com> | 2019-06-20 16:08:58 -0700 |
| commit | 99ff7b5c8c74371841e74d81b7a0d63cd9487e61 (patch) | |
| tree | 72e3b31c807eef5f39c797c8eb3530da98f78980 /frontends | |
| parent | 31b0dee7f3f12c76b721f2fa8e11c722307abb09 (diff) | |
| parent | 3b8f3a93ada563fbae62772b0bf642bb54170954 (diff) | |
| download | yosys-99ff7b5c8c74371841e74d81b7a0d63cd9487e61.tar.gz yosys-99ff7b5c8c74371841e74d81b7a0d63cd9487e61.tar.bz2 yosys-99ff7b5c8c74371841e74d81b7a0d63cd9487e61.zip | |
Merge remote-tracking branch 'origin/eddie/fix1115' into xc7mux
Diffstat (limited to 'frontends')
| -rw-r--r-- | frontends/verilog/const2ast.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/frontends/verilog/const2ast.cc b/frontends/verilog/const2ast.cc index 57d366dbf..3a3634d34 100644 --- a/frontends/verilog/const2ast.cc +++ b/frontends/verilog/const2ast.cc @@ -204,7 +204,7 @@ AstNode *VERILOG_FRONTEND::const2ast(std::string code, char case_type, bool warn { std::vector<RTLIL::State> data; bool is_signed = false; - bool is_unsized = false; + bool is_unsized = len_in_bits < 0; if (*(endptr+1) == 's') { is_signed = true; endptr++; @@ -213,25 +213,25 @@ AstNode *VERILOG_FRONTEND::const2ast(std::string code, char case_type, bool warn { case 'b': case 'B': - my_strtobin(data, endptr+2, len_in_bits, 2, case_type, false); + my_strtobin(data, endptr+2, len_in_bits, 2, case_type, is_unsized); break; case 'o': case 'O': - my_strtobin(data, endptr+2, len_in_bits, 8, case_type, false); + my_strtobin(data, endptr+2, len_in_bits, 8, case_type, is_unsized); break; case 'd': case 'D': - my_strtobin(data, endptr+2, len_in_bits, 10, case_type, false); + my_strtobin(data, endptr+2, len_in_bits, 10, case_type, is_unsized); break; case 'h': case 'H': - my_strtobin(data, endptr+2, len_in_bits, 16, case_type, false); + my_strtobin(data, endptr+2, len_in_bits, 16, case_type, is_unsized); break; default: char next_char = char(tolower(*(endptr+1))); if (next_char == '0' || next_char == '1' || next_char == 'x' || next_char == 'z') { - my_strtobin(data, endptr+1, 1, 2, case_type, true); is_unsized = true; + my_strtobin(data, endptr+1, 1, 2, case_type, is_unsized); } else { return NULL; } |