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, typedef'ed interface signal (#2884)

This commit is contained in:
Todd Strader 2021-04-16 15:25:47 -04:00 committed by GitHub
parent f5ad5cf034
commit 53a6830f71
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/V3Width.cpp
View File

@ -6026,8 +6026,15 @@ 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);
AstNodeDType* fromBaseDtp = fromDtp;
while (AstPackArrayDType* packp = VN_CAST(fromBaseDtp, PackArrayDType)) {
fromBaseDtp = packp->subDTypep();
while (AstRefDType* refp = VN_CAST(fromBaseDtp, RefDType)) {
fromBaseDtp = refp->refDTypep();
}
}
bool fromNumericable = VN_IS(fromBaseDtp, BasicDType) || VN_IS(fromBaseDtp, EnumDType)
|| VN_IS(fromBaseDtp, NodeUOrStructDType);
// UNSUP unpacked struct/unions (treated like BasicDType)
if (VN_IS(toDtp, BasicDType) || VN_IS(toDtp, NodeUOrStructDType)) {
if (fromNumericable) return COMPATIBLE;

21
test_regress/t/t_cast.v
View File

@ -4,6 +4,13 @@
// any use, without warranty, 2011 by Wilson Snyder.
// SPDX-License-Identifier: CC0-1.0
interface intf;
typedef logic [7:0] octet;
typedef octet [1:0] word;
octet [1:0] octets;
word [1:0] words;
endinterface
module t;
typedef logic [3:0] mc_t;
@ -12,6 +19,9 @@ module t;
typedef struct packed {
logic [15:0] data;
} packed_t;
typedef struct packed {
logic [31:0] data;
} packed2_t;
typedef enum [15:0] {
ONE = 1
@ -19,6 +29,7 @@ module t;
packed_t pdata;
packed_t pdata_reg;
packed2_t pdata2_reg;
assign pdata.data = 16'h1234;
logic [7:0] logic8bit;
assign logic8bit = $bits(logic8bit)'(pdata >> 8);
@ -26,6 +37,8 @@ module t;
mc_t o;
enum_t e;
intf the_intf();
logic [15:0] allones = 16'hffff;
parameter FOUR = 4;
@ -79,6 +92,14 @@ module t;
o = tocast_t'(4'b1);
if (o != 4'b1) $stop;
the_intf.octets = 16'd1;
pdata_reg = packed_t'(the_intf.octets);
if (pdata_reg.data != 16'd1) $stop;
the_intf.words = 32'd1;
pdata2_reg = packed2_t'(the_intf.words);
if (pdata2_reg.data != 32'd1) $stop;
if (15'h6cec != outa) $stop;
if (27'h7ffecec != mida) $stop;
if (27'h7ffecec != midb) $stop;