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

Merge pull request #774 from larsclausen/darray-copy-empty 

vvp: Handle copying of empty dynamic array and queue
This commit is contained in:
Stephen Williams 2022-10-03 19:42:13 -07:00 committed by GitHub
parent 463f18a03f 72e59fc626
commit b83fc0ac59
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 135 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ivtest/ivltests/sv_darray_copy_empty1.v Normal file
View File

@ -0,0 +1,17 @@
// Check that it is possible to copy an empty dynamic array.
module test;
initial begin
int d1[];
int d2[];
d1 = '{1, 2, 3};
d1 = d2;
if (d1.size() == 0 && d2.size() == 0) begin
$display("PASSED");
end else begin
$display("FAILED");
end
end
endmodule

17
ivtest/ivltests/sv_darray_copy_empty2.v Normal file
View File

@ -0,0 +1,17 @@
// Check that it is possible to copy an empty queue to an dynamic array.
module test;
initial begin
int d[];
int q[$];
d = '{1, 2, 3};
d = q;
if (d.size() == 0 && q.size() == 0) begin
$display("PASSED");
end else begin
$display("FAILED");
end
end
endmodule

18
ivtest/ivltests/sv_darray_copy_empty3.v Normal file
View File

@ -0,0 +1,18 @@
// Check that it is possible to copy an empty dynamic array using a dynamic
// array new operation.
module test;
initial begin
int d1[];
int d2[];
d1 = '{1, 2, 3};
d1 = new [2](d2);
if (d1.size() == 2 && d2.size() == 0) begin
$display("PASSED");
end else begin
$display("FAILED");
end
end
endmodule

18
ivtest/ivltests/sv_darray_copy_empty4.v Normal file
View File

@ -0,0 +1,18 @@
// Check that it is possible to copy an empty queue to a dynamic array using a
// dynamic array new operation.
module test;
initial begin
int d[];
int q[$];
d = '{1, 2, 3};
d = new [2](q);
if (d.size() == 2 && q.size() == 0) begin
$display("PASSED");
end else begin
$display("FAILED");
end
end
endmodule

19
ivtest/ivltests/sv_queue_copy_empty1.v Normal file
View File

@ -0,0 +1,19 @@
// Check that it is possible to copy an empty queue.
module test;
typedef int T[$];
initial begin
T q1;
T q2;
q1 = '{1, 2, 3};
q1 = q2;
if (q1.size() == 0 && q2.size() == 0) begin
$display("PASSED");
end else begin
$display("FAILED");
end
end
endmodule

17
ivtest/ivltests/sv_queue_copy_empty2.v Normal file
View File

@ -0,0 +1,17 @@
// Check that it is possible to copy an empty dynamic array to a queue.
module test;
initial begin
int q[$];
int d[];
q = '{1, 2, 3};
q = d;
if (q.size() == 0 && d.size() == 0) begin
$display("PASSED");
end else begin
$display("FAILED");
end
end
endmodule

6
ivtest/regress-sv.list
View File

@ -553,6 +553,10 @@ sv_darray_args2 normal,-g2009 ivltests
sv_darray_args2b normal,-g2009 ivltests
sv_darray_args3 normal,-g2009 ivltests
sv_darray_args4 normal,-g2009 ivltests
sv_darray_copy_empty1 normal,-g2009 ivltests
sv_darray_copy_empty2 normal,-g2009 ivltests
sv_darray_copy_empty3 normal,-g2009 ivltests
sv_darray_copy_empty4 normal,-g2009 ivltests
sv_darray_decl_assign normal,-g2009 ivltests
sv_darray_function normal,-g2009 ivltests
sv_darray_oob_real normal,-g2009 ivltests
@ -614,6 +618,8 @@ sv_port_default14 CE,-g2009 ivltests
sv_queue1 normal,-g2009 ivltests
sv_queue2 normal,-g2009 ivltests
sv_queue3 normal,-g2009 ivltests
sv_queue_copy_empty1 normal,-g2009 ivltests
sv_queue_copy_empty2 normal,-g2009 ivltests
sv_queue_function1 normal,-g2009 ivltests
sv_queue_function2 normal,-g2009 ivltests
sv_queue_oob_real normal,-g2009 ivltests

6
ivtest/regress-vlog95.list
View File

@ -345,6 +345,10 @@ sv_darray_args2 CE,-g2009,-pallowsigned=1 ivltests
sv_darray_args2b CE,-g2009,-pallowsigned=1 ivltests
sv_darray_args3 CE,-g2009,-pallowsigned=1 ivltests
sv_darray_args4 CE,-g2009,-pallowsigned=1 ivltests # Also string
sv_darray_copy_empty1 CE,-g2009 ivltests
sv_darray_copy_empty2 CE,-g2009 ivltests
sv_darray_copy_empty3 CE,-g2009 ivltests
sv_darray_copy_empty4 CE,-g2009 ivltests
sv_darray_decl_assign CE,-g2009,-pallowsigned=1 ivltests
sv_darray_function CE,-g2009,-pallowsigned=1 ivltests
sv_darray_oob_real CE,-g2009 ivltests
@ -482,6 +486,8 @@ pr3390385b CE,-g2009 ivltests # ++
pr3390385c CE,-g2009 ivltests # ++
pr3390385d CE,-g2009 ivltests # ++
pr3462145 CE,-g2009 ivltests # ++
sv_queue_copy_empty1 CE,-g2009 ivltests # queue
sv_queue_copy_empty2 CE,-g2009 ivltests # queue
sv_queue_function1 CE,-g2009,-pallowsigned=1 ivltests # queue
sv_queue_function2 CE,-g2009,-pallowsigned=1 ivltests # queue
sv_queue_oob_real CE,-g2009 ivltests # queue

20
vvp/vthread.cc
View File

@ -3000,7 +3000,14 @@ bool of_DIV_WR(vthread_t thr, vvp_code_t)
*/
bool of_DUP_OBJ(vthread_t thr, vvp_code_t)
{
thr->push_object(thr->peek_object().duplicate());
vvp_object_t src = thr->peek_object();
// If it is null push a new null object
if (src.test_nil())
thr->push_object(vvp_object_t());
else
thr->push_object(src.duplicate());
return true;
}
@ -5542,7 +5549,9 @@ bool of_SCOPY(vthread_t thr, vvp_code_t)
thr->pop_object(tmp);
vvp_object_t&dest = thr->peek_object();
dest.shallow_copy(tmp);
// If it is null there is nothing to copy
if (!tmp.test_nil())
dest.shallow_copy(tmp);
return true;
}
@ -6099,7 +6108,12 @@ static bool store_qobj(vthread_t thr, vvp_code_t cp, unsigned wid=0)
vvp_object_t src;
thr->pop_object(src);
queue->copy_elems(src, max_size);
// If it is null just clear the queue
if (src.test_nil())
queue->erase_tail(0);
else
queue->copy_elems(src, max_size);
return true;
}