github/verilator
1
0
Fork 1
mirror of https://github.com/verilator/verilator.git synced 2025-01-01 04:07:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Travis-CI failures.

Browse Source
This commit is contained in:
Wilson Snyder 2020-04-02 09:22:10 -04:00
parent 8aec436b5e
commit 6f4a8fe695
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
MANIFEST.SKIP
View File

@ -28,7 +28,7 @@
/obj_vcs/ /obj_vcs/
/obj_vlt/ /obj_vlt/
/obj_vltmt/ /obj_vltmt/
/INCA_libs/ INCA_libs/
/cov_work/ /cov_work/
/logs/ /logs/
^Makefile$ ^Makefile$
@ -37,6 +37,7 @@ bin/verilator_bin.*
bin/verilator_coverage_bin.* bin/verilator_coverage_bin.*
docs/.*\.html$ docs/.*\.html$
docs/Makefile$ docs/Makefile$
docs/clang-format.txt$
docs/doxygen-doc/.* docs/doxygen-doc/.*
examples/xml_py/copied/ examples/xml_py/copied/
examples/xml_py/graph.* examples/xml_py/graph.*

4
include/verilated.h
View File

@ -2252,7 +2252,7 @@ static inline QData VL_RTOIROUND_Q_D(int bits, double lhs) VL_PURE {
// IEEE format: [63]=sign [62:52]=exp+1023 [51:0]=mantissa // IEEE format: [63]=sign [62:52]=exp+1023 [51:0]=mantissa
// This does not need to support subnormals as they are sub-integral // This does not need to support subnormals as they are sub-integral
lhs = VL_ROUND(lhs); lhs = VL_ROUND(lhs);
if (!lhs) return 0; if (lhs == 0.0) return 0;
QData q = VL_CVT_Q_D(lhs); QData q = VL_CVT_Q_D(lhs);
int lsb = static_cast<int>((q >> VL_ULL(52)) & VL_MASK_Q(11)) - 1023 - 52; int lsb = static_cast<int>((q >> VL_ULL(52)) & VL_MASK_Q(11)) - 1023 - 52;
vluint64_t mantissa = (q & VL_MASK_Q(52)) | (VL_ULL(1) << 52); vluint64_t mantissa = (q & VL_MASK_Q(52)) | (VL_ULL(1) << 52);
@ -2273,7 +2273,7 @@ static inline WDataOutP VL_RTOIROUND_W_D(int obits, WDataOutP owp, double lhs) V
// This does not need to support subnormals as they are sub-integral // This does not need to support subnormals as they are sub-integral
lhs = VL_ROUND(lhs); lhs = VL_ROUND(lhs);
VL_ZERO_W(obits, owp); VL_ZERO_W(obits, owp);
if (!lhs) return owp; if (lhs == 0.0) return owp;
QData q = VL_CVT_Q_D(lhs); QData q = VL_CVT_Q_D(lhs);
int lsb = static_cast<int>((q >> VL_ULL(52)) & VL_MASK_Q(11)) - 1023 - 52; int lsb = static_cast<int>((q >> VL_ULL(52)) & VL_MASK_Q(11)) - 1023 - 52;
vluint64_t mantissa = (q & VL_MASK_Q(52)) | (VL_ULL(1) << 52); vluint64_t mantissa = (q & VL_MASK_Q(52)) | (VL_ULL(1) << 52);

5
src/VlcMain.cpp
View File

@ -68,7 +68,8 @@ void VlcOptions::parseOptsList(int argc, char** argv) {
// Parse parameters // Parse parameters
// Note argc and argv DO NOT INCLUDE the filename in [0]!!! // Note argc and argv DO NOT INCLUDE the filename in [0]!!!
// May be called recursively when there are -f files. // May be called recursively when there are -f files.
#define shift { ++i; } #define shift \
{ ++i; }
for (int i = 0; i < argc;) { for (int i = 0; i < argc;) {
UINFO(9, " Option: " << argv[i] << endl); UINFO(9, " Option: " << argv[i] << endl);
if (argv[i][0] == '-') { if (argv[i][0] == '-') {
@ -77,7 +78,7 @@ void VlcOptions::parseOptsList(int argc, char** argv) {
// Allow gnu -- switches // Allow gnu -- switches
if (sw[0] == '-' && sw[1] == '-') ++sw; if (sw[0] == '-' && sw[1] == '-') ++sw;
// Single switches // Single switches
else if (onoff(sw, "-annotate-all", flag /*ref*/)) { if (onoff(sw, "-annotate-all", flag /*ref*/)) {
m_annotateAll = flag; m_annotateAll = flag;
} else if (onoff(sw, "-rank", flag /*ref*/)) { } else if (onoff(sw, "-rank", flag /*ref*/)) {
m_rank = flag; m_rank = flag;