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

fix conversion of multi-packed arrays in packages

This commit is contained in:
Zachary Snow 2020-05-04 19:22:36 -04:00
parent 2ac236dd03
commit 3e85885def
3 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Convert/MultiplePacked.hs
View File

@ -40,8 +40,10 @@ convert :: [AST] -> [AST]
convert = map $ traverseDescriptions convertDescription convert = map $ traverseDescriptions convertDescription
convertDescription :: Description -> Description convertDescription :: Description -> Description
convertDescription = convertDescription part @ Part{} =
scopedConversion traverseDeclM traverseModuleItemM traverseStmtM Map.empty scopedConversion traverseDeclM traverseModuleItemM traverseStmtM
Map.empty part
convertDescription other = other
-- collects and converts declarations with multiple packed dimensions -- collects and converts declarations with multiple packed dimensions
traverseDeclM :: Decl -> State Info Decl traverseDeclM :: Decl -> State Info Decl

15
test/basic/array_in_package.sv Normal file
View File

@ -0,0 +1,15 @@
package pkg;
localparam ARR [3:0][2:0] = 12'h3EA;
endpackage
module top;
import pkg::*;
initial begin
for (integer i = 0; i < 4; ++i)
for (integer j = 0; j < 3; ++j)
$display("ARR[%0d][%0d] = %0d", i, j, ARR[i][j]);
for (integer i = 0; i < 4; ++i)
for (integer j = 0; j < 3; ++j)
$display("ARR[%0d][%0d] = %0d", i, j, pkg::ARR[i][j]);
end
endmodule

12
test/basic/array_in_package.v Normal file
View File

@ -0,0 +1,12 @@
module top;
localparam [11:0] ARR = 12'h3EA;
initial begin : foo
integer i, j;
for (i = 0; i < 4; ++i)
for (j = 0; j < 3; ++j)
$display("ARR[%0d][%0d] = %0d", i, j, ARR[i * 3 + j]);
for (i = 0; i < 4; ++i)
for (j = 0; j < 3; ++j)
$display("ARR[%0d][%0d] = %0d", i, j, ARR[i * 3 + j]);
end
endmodule