From ae78ce0c488d8343c8879625b29cd29add4ea777 Mon Sep 17 00:00:00 2001
From: fennecJ <hwahwa649@gmail.com>
Date: Thu, 24 Oct 2024 09:57:56 +0800
Subject: [PATCH] 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.
---
 property/fv_regfile.sv | 3 ++-
 property/isa.sv        | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/property/fv_regfile.sv b/property/fv_regfile.sv
index f913238..5a1c337 100644
--- 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
index 8f0c181..c496ffe 100644
--- 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];