luke
/
verilator
mirror of https://github.com/verilator/verilator.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix cast from packed structs, broke with $cast (#2684)

This commit is contained in:
Wilson Snyder 2020-12-10 18:36:06 -05:00
parent 2df1b72ce2
commit a5fa468343
2 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/V3Width.cpp
View File

@ -5990,13 +5990,13 @@ private:
toDtp = toDtp->skipRefToEnump();
fromDtp = fromDtp->skipRefToEnump();
if (toDtp == fromDtp) return COMPATIBLE;
bool fromNumericable = VN_IS(fromDtp, BasicDType) || VN_IS(fromDtp, EnumDType)
|| VN_IS(fromDtp, NodeUOrStructDType);
// UNSUP unpacked struct/unions (treated like BasicDType)
if (VN_IS(toDtp, BasicDType) || VN_IS(toDtp, NodeUOrStructDType)) {
if (VN_IS(fromDtp, BasicDType)) return COMPATIBLE;
if (VN_IS(fromDtp, EnumDType)) return COMPATIBLE;
if (VN_IS(fromDtp, NodeUOrStructDType)) return COMPATIBLE;
if (fromNumericable) return COMPATIBLE;
} else if (VN_IS(toDtp, EnumDType)) {
if (VN_IS(fromDtp, BasicDType) || VN_IS(fromDtp, EnumDType)) return DYNAMIC_ENUM;
if (fromNumericable) return DYNAMIC_ENUM;
} else if (VN_IS(toDtp, ClassRefDType) && VN_IS(fromConstp, Const)) {
if (VN_IS(fromConstp, Const) && VN_CAST(fromConstp, Const)->num().isNull())
return COMPATIBLE;

17
test_regress/t/t_cast.v
View File

@ -13,12 +13,18 @@ module t;
logic [15:0] data;
} packed_t;
typedef enum [15:0] {
ONE = 1
} enum_t;
packed_t pdata;
packed_t pdata_reg;
assign pdata.data = 16'h1234;
logic [7:0] logic8bit;
assign logic8bit = $bits(logic8bit)'(pdata >> 8);
mc_t o;
enum_t e;
logic [15:0] allones = 16'hffff;
parameter FOUR = 4;
@ -55,6 +61,17 @@ module t;
if ((FOUR+2)'(allones) !== 6'h3f) $stop;
if (50 !== RESULT) $stop;
e = ONE;
if (e != 1) $stop;
if (e != ONE) $stop;
e = enum_t'(ONE);
if (e != ONE) $stop;
e = enum_t'(16'h1);
if (e != ONE) $stop;
pdata_reg.data = 1;
e = enum_t'(pdata_reg);
if (e != ONE) $stop;
o = tocast_t'(4'b1);
if (o != 4'b1) $stop;