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

Fix assignment of queue from unpacked array (#6906). 

Fixes #6906.
This commit is contained in:
Wilson Snyder 2026-01-12 18:32:24 -05:00
parent a3d0f16185
commit 823c53fb15
3 changed files with 54 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changes
View File

@ -32,6 +32,7 @@ Verilator 5.045 devel
* Fix WIDTHEXTEND suppression on add/sub with single-bit signal. [Dan Katz]
* Fix segfault in V3Slice (#6899). [Pawel Kojma, Antmicro Ltd.]
* Fix signedness of packed array (#6901) (#6902). [Yutetsu TAKATSUKASA]
* Fix assignment of queue from unpacked array (#6906).
Verilator 5.044 2026-01-01

20
include/verilated_types.h
View File

@ -38,6 +38,10 @@
#include <string>
#include <utility>
class VlProcess;
template <typename T_Value, std::size_t N_Depth>
class VlUnpacked;
//=========================================================================
// Debug functions
@ -104,8 +108,6 @@ constexpr IData VL_CLOG2_CE_Q(QData lhs) VL_PURE {
}
// Metadata of processes
class VlProcess;
using VlProcessRef = std::shared_ptr<VlProcess>;
class VlProcess final {
@ -531,6 +533,10 @@ public:
m_deque.resize(size, atDefault());
}
}
// Unpacked array new[]() becomes a renew_copy()
template <typename T_UnpackedValue, std::size_t N_UnpackedDepth>
void renew_copy(size_t size, const VlUnpacked<T_UnpackedValue, N_UnpackedDepth>& rhs);
void resize(size_t size) { m_deque.resize(size, atDefault()); }
// function void q.push_front(value)
@ -1615,6 +1621,16 @@ std::string VL_TO_STRING(const VlUnpacked<T_Value, N_Depth>& obj) {
template <typename T_Value, std::size_t N_Depth>
struct VlContainsCustomStruct<VlUnpacked<T_Value, N_Depth>> : VlContainsCustomStruct<T_Value> {};
template <typename T_Value, size_t N_MaxSize>
template <typename T_UnpackedValue, std::size_t N_UnpackedDepth>
void VlQueue<T_Value, N_MaxSize>::renew_copy(
size_t size, const VlUnpacked<T_UnpackedValue, N_UnpackedDepth>& rhs) {
clear();
if (size == 0) return;
m_deque.resize(size, atDefault());
for (size_t i = 0; i < std::min(size, N_UnpackedDepth); ++i) { m_deque[i] = rhs.m_storage[i]; }
}
//===================================================================
// Helper to apply the given indices to a target expression

54
test_regress/t/t_queue_init.v
View File

@ -4,33 +4,49 @@
// any use, without warranty, 2020 by Wilson Snyder.
// SPDX-License-Identifier: CC0-1.0
// verilog_format: off
`define stop $stop
`define checkh(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0)
`define checkd(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got=%0d exp=%0d\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0);
// verilog_format: on
module t;
int a1[$] = '{12, 13};
int a2[$] = {14, 15};
int a3[$] = '{16};
int a4[$] = {17};
int a1[$] = '{12, 13};
int a2[$] = {14, 15};
int a3[$] = '{16};
int a4[$] = {17};
initial begin
`checkh(a1.size, 2);
`checkh(a1[0], 12);
`checkh(a1[1], 13);
int src[3], dest1[], dest2[];
`checkh(a2.size, 2);
`checkh(a2[0], 14);
`checkh(a2[1], 15);
initial begin
`checkd(a1.size, 2);
`checkd(a1[0], 12);
`checkd(a1[1], 13);
`checkh(a3.size, 1);
`checkh(a3[0], 16);
`checkd(a2.size, 2);
`checkd(a2[0], 14);
`checkd(a2[1], 15);
`checkh(a4.size, 1);
`checkh(a4[0], 17);
`checkd(a3.size, 1);
`checkd(a3[0], 16);
$write("*-* All Finished *-*\n");
$finish;
end
`checkd(a4.size, 1);
`checkd(a4[0], 17);
src = '{2, 3, 4};
dest1 = new[2] (src);
`checkd(dest1.size, 2); // {2, 3}
`checkd(dest1[0], 2);
`checkd(dest1[1], 3);
dest2 = new[4] (src);
`checkd(dest2.size, 4); // {2, 3, 4, 0}.
`checkd(dest2[0], 2);
`checkd(dest2[1], 3);
`checkd(dest2[2], 4);
`checkd(dest2[3], 0);
$write("*-* All Finished *-*\n");
$finish;
end
endmodule