Change to partial imports to avoid enum conflicts

riscv_opcodes_pkg's enum define has conflict with one used in isa.sv, we can fix that by only import specific define we'd like to use.
fennecJ · Oct 24, 2024 · ae78ce0 · ae78ce0
1 parent e81ee5c
commit ae78ce0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/property/fv_regfile.sv b/property/fv_regfile.sv
@@ -6,7 +6,8 @@
 */
 
 module fv_regfile
-    import riscv_opcodes_pkg::*;
+    import riscv_opcodes_pkg::rsd_t;
+    import riscv_opcodes_pkg::zero;
 (
     // Common input
     input clk,

diff --git a/property/isa.sv b/property/isa.sv
@@ -636,7 +636,7 @@ module isa (
 
 `ifdef RegFileStable
     // Import necessary package
-    import riscv_opcodes_pkg::*;
+    import riscv_opcodes_pkg::rsd_t;
 
     // DUV's regfile signal
     logic [31:0] rf          [32];