commit d266c68b1cd8c51e10b19a4d54cc0872f7c295c7
author Srikrishna Iyer <sriyer@google.com> Fri Jul 24 10:27:44 2020 -0700
committer sriyerg <46467186+sriyerg@users.noreply.github.com> Fri Jul 24 11:35:08 2020 -0700
tree 6f97406c355a13467e9ab4094dbaefaf678f1f88
parent b28e00f5a1036a007d6ec66a242dcb6127d988ab

[dv] Update dv_utils sources to use bus_params_pkg

Replaces parameters from top_pkg with parameters from bus_params_pkg.

Signed-off-by: Srikrishna Iyer <sriyer@google.com>

hw/dv/sv/dv_utils/dv_utils.core

diff --git a/hw/dv/sv/dv_utils/dv_utils.core b/hw/dv/sv/dv_utils/dv_utils.core
index 0dba023..494c05a 100644
--- a/hw/dv/sv/dv_utils/dv_utils.core
+++ b/hw/dv/sv/dv_utils/dv_utils.core
@@ -10,7 +10,7 @@
     depend:
       - lowrisc:dv:common_ifs
       - lowrisc:prim:assert:0.1
-      - lowrisc:constants:top_pkg
+      - lowrisc:opentitan:bus_params_pkg
     files:
       - dv_utils_pkg.sv
       - dv_macros.svh: {is_include_file: true}

hw/dv/sv/dv_utils/dv_utils_pkg.sv

diff --git a/hw/dv/sv/dv_utils/dv_utils_pkg.sv b/hw/dv/sv/dv_utils/dv_utils_pkg.sv
index 95d92c1..3b47bfe 100644
--- a/hw/dv/sv/dv_utils/dv_utils_pkg.sv
+++ b/hw/dv/sv/dv_utils/dv_utils_pkg.sv
@@ -5,7 +5,7 @@
 package dv_utils_pkg;
   // dep packages
   import uvm_pkg::*;
-  import top_pkg::*;
+  import bus_params_pkg::*;
 
   // macro includes
   `include "dv_macros.svh"
@@ -109,14 +109,16 @@
 
   // get masked data based on provided byte mask; if csr reg handle is provided (optional) then
   // masked bytes from csr's mirrored value are returned, else masked bytes are 0's
-  function automatic bit [TL_DW-1:0] get_masked_data(bit [TL_DW-1:0]  data,
-                                                     bit [TL_DBW-1:0] mask,
-                                                     uvm_reg          csr = null);
-    bit [TL_DW-1:0] csr_data;
+  function automatic bit [bus_params_pkg::BUS_DW-1:0]
+      get_masked_data(bit [bus_params_pkg::BUS_DW-1:0] data,
+                      bit [bus_params_pkg::BUS_DBW-1:0] mask,
+                      uvm_reg csr = null);
+    bit [bus_params_pkg::BUS_DW-1:0] csr_data;
     csr_data = (csr != null) ? csr.get_mirrored_value() : '0;
     get_masked_data = data;
-    foreach (mask[i])
+    foreach (mask[i]) begin
       if (~mask[i]) get_masked_data[i * 8 +: 8] = csr_data[i * 8 +: 8];
+    end
   endfunction
 
   // get absolute value of the input. Usage: absolute(val) or absolute(a - b)