diff --git a/lsu_clkdomain.fir b/lsu_clkdomain.fir
index ba7d91d3..448757c7 100644
--- a/lsu_clkdomain.fir
+++ b/lsu_clkdomain.fir
@@ -344,69 +344,69 @@ circuit lsu_clkdomain :
     reg _T_28 : UInt<1>, io.lsu_free_c2_clk with : (reset => (reset, UInt<1>("h00"))) @[lsu_clkdomain.scala 85:67]
     _T_28 <= lsu_c1_r_clken @[lsu_clkdomain.scala 85:67]
     lsu_c1_r_clken_q <= _T_28 @[lsu_clkdomain.scala 85:26]
-    node _T_29 = bits(lsu_c1_m_clken, 0, 0) @[lsu_clkdomain.scala 87:59]
-    inst rvclkhdr of rvclkhdr @[lib.scala 343:22]
+    node _T_29 = bits(lsu_c1_m_clken, 0, 0) @[lsu_clkdomain.scala 87:60]
+    inst rvclkhdr of rvclkhdr @[lib.scala 352:22]
     rvclkhdr.clock <= clock
     rvclkhdr.reset <= reset
-    rvclkhdr.io.clk <= clock @[lib.scala 344:17]
-    rvclkhdr.io.en <= _T_29 @[lib.scala 345:16]
-    rvclkhdr.io.scan_mode <= io.scan_mode @[lib.scala 346:23]
+    rvclkhdr.io.clk <= clock @[lib.scala 353:17]
+    rvclkhdr.io.en <= _T_29 @[lib.scala 354:16]
+    rvclkhdr.io.scan_mode <= UInt<1>("h00") @[lib.scala 355:23]
     io.lsu_c1_m_clk <= rvclkhdr.io.l1clk @[lsu_clkdomain.scala 87:26]
-    node _T_30 = bits(lsu_c1_r_clken, 0, 0) @[lsu_clkdomain.scala 88:59]
-    inst rvclkhdr_1 of rvclkhdr_1 @[lib.scala 343:22]
+    node _T_30 = bits(lsu_c1_r_clken, 0, 0) @[lsu_clkdomain.scala 88:60]
+    inst rvclkhdr_1 of rvclkhdr_1 @[lib.scala 352:22]
     rvclkhdr_1.clock <= clock
     rvclkhdr_1.reset <= reset
-    rvclkhdr_1.io.clk <= clock @[lib.scala 344:17]
-    rvclkhdr_1.io.en <= _T_30 @[lib.scala 345:16]
-    rvclkhdr_1.io.scan_mode <= io.scan_mode @[lib.scala 346:23]
+    rvclkhdr_1.io.clk <= clock @[lib.scala 353:17]
+    rvclkhdr_1.io.en <= _T_30 @[lib.scala 354:16]
+    rvclkhdr_1.io.scan_mode <= UInt<1>("h00") @[lib.scala 355:23]
     io.lsu_c1_r_clk <= rvclkhdr_1.io.l1clk @[lsu_clkdomain.scala 88:26]
-    node _T_31 = bits(lsu_c2_m_clken, 0, 0) @[lsu_clkdomain.scala 89:59]
-    inst rvclkhdr_2 of rvclkhdr_2 @[lib.scala 343:22]
+    node _T_31 = bits(lsu_c2_m_clken, 0, 0) @[lsu_clkdomain.scala 89:60]
+    inst rvclkhdr_2 of rvclkhdr_2 @[lib.scala 352:22]
     rvclkhdr_2.clock <= clock
     rvclkhdr_2.reset <= reset
-    rvclkhdr_2.io.clk <= clock @[lib.scala 344:17]
-    rvclkhdr_2.io.en <= _T_31 @[lib.scala 345:16]
-    rvclkhdr_2.io.scan_mode <= io.scan_mode @[lib.scala 346:23]
+    rvclkhdr_2.io.clk <= clock @[lib.scala 353:17]
+    rvclkhdr_2.io.en <= _T_31 @[lib.scala 354:16]
+    rvclkhdr_2.io.scan_mode <= UInt<1>("h00") @[lib.scala 355:23]
     io.lsu_c2_m_clk <= rvclkhdr_2.io.l1clk @[lsu_clkdomain.scala 89:26]
-    node _T_32 = bits(lsu_c2_r_clken, 0, 0) @[lsu_clkdomain.scala 90:59]
-    inst rvclkhdr_3 of rvclkhdr_3 @[lib.scala 343:22]
+    node _T_32 = bits(lsu_c2_r_clken, 0, 0) @[lsu_clkdomain.scala 90:60]
+    inst rvclkhdr_3 of rvclkhdr_3 @[lib.scala 352:22]
     rvclkhdr_3.clock <= clock
     rvclkhdr_3.reset <= reset
-    rvclkhdr_3.io.clk <= clock @[lib.scala 344:17]
-    rvclkhdr_3.io.en <= _T_32 @[lib.scala 345:16]
-    rvclkhdr_3.io.scan_mode <= io.scan_mode @[lib.scala 346:23]
+    rvclkhdr_3.io.clk <= clock @[lib.scala 353:17]
+    rvclkhdr_3.io.en <= _T_32 @[lib.scala 354:16]
+    rvclkhdr_3.io.scan_mode <= UInt<1>("h00") @[lib.scala 355:23]
     io.lsu_c2_r_clk <= rvclkhdr_3.io.l1clk @[lsu_clkdomain.scala 90:26]
-    node _T_33 = bits(lsu_store_c1_m_clken, 0, 0) @[lsu_clkdomain.scala 91:65]
-    inst rvclkhdr_4 of rvclkhdr_4 @[lib.scala 343:22]
+    node _T_33 = bits(lsu_store_c1_m_clken, 0, 0) @[lsu_clkdomain.scala 91:66]
+    inst rvclkhdr_4 of rvclkhdr_4 @[lib.scala 352:22]
     rvclkhdr_4.clock <= clock
     rvclkhdr_4.reset <= reset
-    rvclkhdr_4.io.clk <= clock @[lib.scala 344:17]
-    rvclkhdr_4.io.en <= _T_33 @[lib.scala 345:16]
-    rvclkhdr_4.io.scan_mode <= io.scan_mode @[lib.scala 346:23]
+    rvclkhdr_4.io.clk <= clock @[lib.scala 353:17]
+    rvclkhdr_4.io.en <= _T_33 @[lib.scala 354:16]
+    rvclkhdr_4.io.scan_mode <= UInt<1>("h00") @[lib.scala 355:23]
     io.lsu_store_c1_m_clk <= rvclkhdr_4.io.l1clk @[lsu_clkdomain.scala 91:26]
-    node _T_34 = bits(lsu_store_c1_r_clken, 0, 0) @[lsu_clkdomain.scala 92:65]
-    inst rvclkhdr_5 of rvclkhdr_5 @[lib.scala 343:22]
+    node _T_34 = bits(lsu_store_c1_r_clken, 0, 0) @[lsu_clkdomain.scala 92:66]
+    inst rvclkhdr_5 of rvclkhdr_5 @[lib.scala 352:22]
     rvclkhdr_5.clock <= clock
     rvclkhdr_5.reset <= reset
-    rvclkhdr_5.io.clk <= clock @[lib.scala 344:17]
-    rvclkhdr_5.io.en <= _T_34 @[lib.scala 345:16]
-    rvclkhdr_5.io.scan_mode <= io.scan_mode @[lib.scala 346:23]
+    rvclkhdr_5.io.clk <= clock @[lib.scala 353:17]
+    rvclkhdr_5.io.en <= _T_34 @[lib.scala 354:16]
+    rvclkhdr_5.io.scan_mode <= UInt<1>("h00") @[lib.scala 355:23]
     io.lsu_store_c1_r_clk <= rvclkhdr_5.io.l1clk @[lsu_clkdomain.scala 92:26]
-    node _T_35 = bits(lsu_stbuf_c1_clken, 0, 0) @[lsu_clkdomain.scala 93:63]
-    inst rvclkhdr_6 of rvclkhdr_6 @[lib.scala 343:22]
+    node _T_35 = bits(lsu_stbuf_c1_clken, 0, 0) @[lsu_clkdomain.scala 93:64]
+    inst rvclkhdr_6 of rvclkhdr_6 @[lib.scala 352:22]
     rvclkhdr_6.clock <= clock
     rvclkhdr_6.reset <= reset
-    rvclkhdr_6.io.clk <= clock @[lib.scala 344:17]
-    rvclkhdr_6.io.en <= _T_35 @[lib.scala 345:16]
-    rvclkhdr_6.io.scan_mode <= io.scan_mode @[lib.scala 346:23]
+    rvclkhdr_6.io.clk <= clock @[lib.scala 353:17]
+    rvclkhdr_6.io.en <= _T_35 @[lib.scala 354:16]
+    rvclkhdr_6.io.scan_mode <= UInt<1>("h00") @[lib.scala 355:23]
     io.lsu_stbuf_c1_clk <= rvclkhdr_6.io.l1clk @[lsu_clkdomain.scala 93:26]
-    node _T_36 = bits(lsu_bus_ibuf_c1_clken, 0, 0) @[lsu_clkdomain.scala 94:66]
-    inst rvclkhdr_7 of rvclkhdr_7 @[lib.scala 343:22]
+    node _T_36 = bits(lsu_bus_ibuf_c1_clken, 0, 0) @[lsu_clkdomain.scala 94:67]
+    inst rvclkhdr_7 of rvclkhdr_7 @[lib.scala 352:22]
     rvclkhdr_7.clock <= clock
     rvclkhdr_7.reset <= reset
-    rvclkhdr_7.io.clk <= clock @[lib.scala 344:17]
-    rvclkhdr_7.io.en <= _T_36 @[lib.scala 345:16]
-    rvclkhdr_7.io.scan_mode <= io.scan_mode @[lib.scala 346:23]
+    rvclkhdr_7.io.clk <= clock @[lib.scala 353:17]
+    rvclkhdr_7.io.en <= _T_36 @[lib.scala 354:16]
+    rvclkhdr_7.io.scan_mode <= UInt<1>("h00") @[lib.scala 355:23]
     io.lsu_bus_ibuf_c1_clk <= rvclkhdr_7.io.l1clk @[lsu_clkdomain.scala 94:26]
     node _T_37 = bits(io.lsu_bus_obuf_c1_clken, 0, 0) @[lsu_clkdomain.scala 95:69]
     inst rvclkhdr_8 of rvclkhdr_8 @[lib.scala 343:22]
@@ -416,13 +416,13 @@ circuit lsu_clkdomain :
     rvclkhdr_8.io.en <= _T_37 @[lib.scala 345:16]
     rvclkhdr_8.io.scan_mode <= io.scan_mode @[lib.scala 346:23]
     io.lsu_bus_obuf_c1_clk <= rvclkhdr_8.io.l1clk @[lsu_clkdomain.scala 95:26]
-    node _T_38 = bits(lsu_bus_buf_c1_clken, 0, 0) @[lsu_clkdomain.scala 96:65]
-    inst rvclkhdr_9 of rvclkhdr_9 @[lib.scala 343:22]
+    node _T_38 = bits(lsu_bus_buf_c1_clken, 0, 0) @[lsu_clkdomain.scala 96:66]
+    inst rvclkhdr_9 of rvclkhdr_9 @[lib.scala 352:22]
     rvclkhdr_9.clock <= clock
     rvclkhdr_9.reset <= reset
-    rvclkhdr_9.io.clk <= clock @[lib.scala 344:17]
-    rvclkhdr_9.io.en <= _T_38 @[lib.scala 345:16]
-    rvclkhdr_9.io.scan_mode <= io.scan_mode @[lib.scala 346:23]
+    rvclkhdr_9.io.clk <= clock @[lib.scala 353:17]
+    rvclkhdr_9.io.en <= _T_38 @[lib.scala 354:16]
+    rvclkhdr_9.io.scan_mode <= UInt<1>("h00") @[lib.scala 355:23]
     io.lsu_bus_buf_c1_clk <= rvclkhdr_9.io.l1clk @[lsu_clkdomain.scala 96:26]
     node _T_39 = bits(io.lsu_busm_clken, 0, 0) @[lsu_clkdomain.scala 97:62]
     inst rvclkhdr_10 of rvclkhdr_10 @[lib.scala 343:22]
@@ -432,12 +432,12 @@ circuit lsu_clkdomain :
     rvclkhdr_10.io.en <= _T_39 @[lib.scala 345:16]
     rvclkhdr_10.io.scan_mode <= io.scan_mode @[lib.scala 346:23]
     io.lsu_busm_clk <= rvclkhdr_10.io.l1clk @[lsu_clkdomain.scala 97:26]
-    node _T_40 = bits(lsu_free_c2_clken, 0, 0) @[lsu_clkdomain.scala 98:62]
-    inst rvclkhdr_11 of rvclkhdr_11 @[lib.scala 343:22]
+    node _T_40 = bits(lsu_free_c2_clken, 0, 0) @[lsu_clkdomain.scala 98:63]
+    inst rvclkhdr_11 of rvclkhdr_11 @[lib.scala 352:22]
     rvclkhdr_11.clock <= clock
     rvclkhdr_11.reset <= reset
-    rvclkhdr_11.io.clk <= clock @[lib.scala 344:17]
-    rvclkhdr_11.io.en <= _T_40 @[lib.scala 345:16]
-    rvclkhdr_11.io.scan_mode <= io.scan_mode @[lib.scala 346:23]
+    rvclkhdr_11.io.clk <= clock @[lib.scala 353:17]
+    rvclkhdr_11.io.en <= _T_40 @[lib.scala 354:16]
+    rvclkhdr_11.io.scan_mode <= UInt<1>("h00") @[lib.scala 355:23]
     io.lsu_free_c2_clk <= rvclkhdr_11.io.l1clk @[lsu_clkdomain.scala 98:26]
     
diff --git a/lsu_clkdomain.v b/lsu_clkdomain.v
index b7279eff..036fe5f4 100644
--- a/lsu_clkdomain.v
+++ b/lsu_clkdomain.v
@@ -107,54 +107,54 @@ module lsu_clkdomain(
   reg [31:0] _RAND_1;
   reg [31:0] _RAND_2;
 `endif // RANDOMIZE_REG_INIT
-  wire  rvclkhdr_io_l1clk; // @[lib.scala 343:22]
-  wire  rvclkhdr_io_clk; // @[lib.scala 343:22]
-  wire  rvclkhdr_io_en; // @[lib.scala 343:22]
-  wire  rvclkhdr_io_scan_mode; // @[lib.scala 343:22]
-  wire  rvclkhdr_1_io_l1clk; // @[lib.scala 343:22]
-  wire  rvclkhdr_1_io_clk; // @[lib.scala 343:22]
-  wire  rvclkhdr_1_io_en; // @[lib.scala 343:22]
-  wire  rvclkhdr_1_io_scan_mode; // @[lib.scala 343:22]
-  wire  rvclkhdr_2_io_l1clk; // @[lib.scala 343:22]
-  wire  rvclkhdr_2_io_clk; // @[lib.scala 343:22]
-  wire  rvclkhdr_2_io_en; // @[lib.scala 343:22]
-  wire  rvclkhdr_2_io_scan_mode; // @[lib.scala 343:22]
-  wire  rvclkhdr_3_io_l1clk; // @[lib.scala 343:22]
-  wire  rvclkhdr_3_io_clk; // @[lib.scala 343:22]
-  wire  rvclkhdr_3_io_en; // @[lib.scala 343:22]
-  wire  rvclkhdr_3_io_scan_mode; // @[lib.scala 343:22]
-  wire  rvclkhdr_4_io_l1clk; // @[lib.scala 343:22]
-  wire  rvclkhdr_4_io_clk; // @[lib.scala 343:22]
-  wire  rvclkhdr_4_io_en; // @[lib.scala 343:22]
-  wire  rvclkhdr_4_io_scan_mode; // @[lib.scala 343:22]
-  wire  rvclkhdr_5_io_l1clk; // @[lib.scala 343:22]
-  wire  rvclkhdr_5_io_clk; // @[lib.scala 343:22]
-  wire  rvclkhdr_5_io_en; // @[lib.scala 343:22]
-  wire  rvclkhdr_5_io_scan_mode; // @[lib.scala 343:22]
-  wire  rvclkhdr_6_io_l1clk; // @[lib.scala 343:22]
-  wire  rvclkhdr_6_io_clk; // @[lib.scala 343:22]
-  wire  rvclkhdr_6_io_en; // @[lib.scala 343:22]
-  wire  rvclkhdr_6_io_scan_mode; // @[lib.scala 343:22]
-  wire  rvclkhdr_7_io_l1clk; // @[lib.scala 343:22]
-  wire  rvclkhdr_7_io_clk; // @[lib.scala 343:22]
-  wire  rvclkhdr_7_io_en; // @[lib.scala 343:22]
-  wire  rvclkhdr_7_io_scan_mode; // @[lib.scala 343:22]
+  wire  rvclkhdr_io_l1clk; // @[lib.scala 352:22]
+  wire  rvclkhdr_io_clk; // @[lib.scala 352:22]
+  wire  rvclkhdr_io_en; // @[lib.scala 352:22]
+  wire  rvclkhdr_io_scan_mode; // @[lib.scala 352:22]
+  wire  rvclkhdr_1_io_l1clk; // @[lib.scala 352:22]
+  wire  rvclkhdr_1_io_clk; // @[lib.scala 352:22]
+  wire  rvclkhdr_1_io_en; // @[lib.scala 352:22]
+  wire  rvclkhdr_1_io_scan_mode; // @[lib.scala 352:22]
+  wire  rvclkhdr_2_io_l1clk; // @[lib.scala 352:22]
+  wire  rvclkhdr_2_io_clk; // @[lib.scala 352:22]
+  wire  rvclkhdr_2_io_en; // @[lib.scala 352:22]
+  wire  rvclkhdr_2_io_scan_mode; // @[lib.scala 352:22]
+  wire  rvclkhdr_3_io_l1clk; // @[lib.scala 352:22]
+  wire  rvclkhdr_3_io_clk; // @[lib.scala 352:22]
+  wire  rvclkhdr_3_io_en; // @[lib.scala 352:22]
+  wire  rvclkhdr_3_io_scan_mode; // @[lib.scala 352:22]
+  wire  rvclkhdr_4_io_l1clk; // @[lib.scala 352:22]
+  wire  rvclkhdr_4_io_clk; // @[lib.scala 352:22]
+  wire  rvclkhdr_4_io_en; // @[lib.scala 352:22]
+  wire  rvclkhdr_4_io_scan_mode; // @[lib.scala 352:22]
+  wire  rvclkhdr_5_io_l1clk; // @[lib.scala 352:22]
+  wire  rvclkhdr_5_io_clk; // @[lib.scala 352:22]
+  wire  rvclkhdr_5_io_en; // @[lib.scala 352:22]
+  wire  rvclkhdr_5_io_scan_mode; // @[lib.scala 352:22]
+  wire  rvclkhdr_6_io_l1clk; // @[lib.scala 352:22]
+  wire  rvclkhdr_6_io_clk; // @[lib.scala 352:22]
+  wire  rvclkhdr_6_io_en; // @[lib.scala 352:22]
+  wire  rvclkhdr_6_io_scan_mode; // @[lib.scala 352:22]
+  wire  rvclkhdr_7_io_l1clk; // @[lib.scala 352:22]
+  wire  rvclkhdr_7_io_clk; // @[lib.scala 352:22]
+  wire  rvclkhdr_7_io_en; // @[lib.scala 352:22]
+  wire  rvclkhdr_7_io_scan_mode; // @[lib.scala 352:22]
   wire  rvclkhdr_8_io_l1clk; // @[lib.scala 343:22]
   wire  rvclkhdr_8_io_clk; // @[lib.scala 343:22]
   wire  rvclkhdr_8_io_en; // @[lib.scala 343:22]
   wire  rvclkhdr_8_io_scan_mode; // @[lib.scala 343:22]
-  wire  rvclkhdr_9_io_l1clk; // @[lib.scala 343:22]
-  wire  rvclkhdr_9_io_clk; // @[lib.scala 343:22]
-  wire  rvclkhdr_9_io_en; // @[lib.scala 343:22]
-  wire  rvclkhdr_9_io_scan_mode; // @[lib.scala 343:22]
+  wire  rvclkhdr_9_io_l1clk; // @[lib.scala 352:22]
+  wire  rvclkhdr_9_io_clk; // @[lib.scala 352:22]
+  wire  rvclkhdr_9_io_en; // @[lib.scala 352:22]
+  wire  rvclkhdr_9_io_scan_mode; // @[lib.scala 352:22]
   wire  rvclkhdr_10_io_l1clk; // @[lib.scala 343:22]
   wire  rvclkhdr_10_io_clk; // @[lib.scala 343:22]
   wire  rvclkhdr_10_io_en; // @[lib.scala 343:22]
   wire  rvclkhdr_10_io_scan_mode; // @[lib.scala 343:22]
-  wire  rvclkhdr_11_io_l1clk; // @[lib.scala 343:22]
-  wire  rvclkhdr_11_io_clk; // @[lib.scala 343:22]
-  wire  rvclkhdr_11_io_en; // @[lib.scala 343:22]
-  wire  rvclkhdr_11_io_scan_mode; // @[lib.scala 343:22]
+  wire  rvclkhdr_11_io_l1clk; // @[lib.scala 352:22]
+  wire  rvclkhdr_11_io_clk; // @[lib.scala 352:22]
+  wire  rvclkhdr_11_io_en; // @[lib.scala 352:22]
+  wire  rvclkhdr_11_io_scan_mode; // @[lib.scala 352:22]
   wire  _T = io_lsu_p_valid | io_dma_dccm_req; // @[lsu_clkdomain.scala 64:47]
   wire  lsu_c1_m_clken = _T | io_clk_override; // @[lsu_clkdomain.scala 64:65]
   reg  lsu_c1_m_clken_q; // @[lsu_clkdomain.scala 84:67]
@@ -182,49 +182,49 @@ module lsu_clkdomain(
   reg  lsu_free_c1_clken_q; // @[lsu_clkdomain.scala 82:62]
   wire  _T_21 = lsu_free_c1_clken | lsu_free_c1_clken_q; // @[lsu_clkdomain.scala 78:50]
   wire  _T_24 = _T_12 | io_clk_override; // @[lsu_clkdomain.scala 79:72]
-  rvclkhdr rvclkhdr ( // @[lib.scala 343:22]
+  rvclkhdr rvclkhdr ( // @[lib.scala 352:22]
     .io_l1clk(rvclkhdr_io_l1clk),
     .io_clk(rvclkhdr_io_clk),
     .io_en(rvclkhdr_io_en),
     .io_scan_mode(rvclkhdr_io_scan_mode)
   );
-  rvclkhdr rvclkhdr_1 ( // @[lib.scala 343:22]
+  rvclkhdr rvclkhdr_1 ( // @[lib.scala 352:22]
     .io_l1clk(rvclkhdr_1_io_l1clk),
     .io_clk(rvclkhdr_1_io_clk),
     .io_en(rvclkhdr_1_io_en),
     .io_scan_mode(rvclkhdr_1_io_scan_mode)
   );
-  rvclkhdr rvclkhdr_2 ( // @[lib.scala 343:22]
+  rvclkhdr rvclkhdr_2 ( // @[lib.scala 352:22]
     .io_l1clk(rvclkhdr_2_io_l1clk),
     .io_clk(rvclkhdr_2_io_clk),
     .io_en(rvclkhdr_2_io_en),
     .io_scan_mode(rvclkhdr_2_io_scan_mode)
   );
-  rvclkhdr rvclkhdr_3 ( // @[lib.scala 343:22]
+  rvclkhdr rvclkhdr_3 ( // @[lib.scala 352:22]
     .io_l1clk(rvclkhdr_3_io_l1clk),
     .io_clk(rvclkhdr_3_io_clk),
     .io_en(rvclkhdr_3_io_en),
     .io_scan_mode(rvclkhdr_3_io_scan_mode)
   );
-  rvclkhdr rvclkhdr_4 ( // @[lib.scala 343:22]
+  rvclkhdr rvclkhdr_4 ( // @[lib.scala 352:22]
     .io_l1clk(rvclkhdr_4_io_l1clk),
     .io_clk(rvclkhdr_4_io_clk),
     .io_en(rvclkhdr_4_io_en),
     .io_scan_mode(rvclkhdr_4_io_scan_mode)
   );
-  rvclkhdr rvclkhdr_5 ( // @[lib.scala 343:22]
+  rvclkhdr rvclkhdr_5 ( // @[lib.scala 352:22]
     .io_l1clk(rvclkhdr_5_io_l1clk),
     .io_clk(rvclkhdr_5_io_clk),
     .io_en(rvclkhdr_5_io_en),
     .io_scan_mode(rvclkhdr_5_io_scan_mode)
   );
-  rvclkhdr rvclkhdr_6 ( // @[lib.scala 343:22]
+  rvclkhdr rvclkhdr_6 ( // @[lib.scala 352:22]
     .io_l1clk(rvclkhdr_6_io_l1clk),
     .io_clk(rvclkhdr_6_io_clk),
     .io_en(rvclkhdr_6_io_en),
     .io_scan_mode(rvclkhdr_6_io_scan_mode)
   );
-  rvclkhdr rvclkhdr_7 ( // @[lib.scala 343:22]
+  rvclkhdr rvclkhdr_7 ( // @[lib.scala 352:22]
     .io_l1clk(rvclkhdr_7_io_l1clk),
     .io_clk(rvclkhdr_7_io_clk),
     .io_en(rvclkhdr_7_io_en),
@@ -236,7 +236,7 @@ module lsu_clkdomain(
     .io_en(rvclkhdr_8_io_en),
     .io_scan_mode(rvclkhdr_8_io_scan_mode)
   );
-  rvclkhdr rvclkhdr_9 ( // @[lib.scala 343:22]
+  rvclkhdr rvclkhdr_9 ( // @[lib.scala 352:22]
     .io_l1clk(rvclkhdr_9_io_l1clk),
     .io_clk(rvclkhdr_9_io_clk),
     .io_en(rvclkhdr_9_io_en),
@@ -248,7 +248,7 @@ module lsu_clkdomain(
     .io_en(rvclkhdr_10_io_en),
     .io_scan_mode(rvclkhdr_10_io_scan_mode)
   );
-  rvclkhdr rvclkhdr_11 ( // @[lib.scala 343:22]
+  rvclkhdr rvclkhdr_11 ( // @[lib.scala 352:22]
     .io_l1clk(rvclkhdr_11_io_l1clk),
     .io_clk(rvclkhdr_11_io_clk),
     .io_en(rvclkhdr_11_io_en),
@@ -268,42 +268,42 @@ module lsu_clkdomain(
   assign io_lsu_bus_buf_c1_clk = rvclkhdr_9_io_l1clk; // @[lsu_clkdomain.scala 96:26]
   assign io_lsu_busm_clk = rvclkhdr_10_io_l1clk; // @[lsu_clkdomain.scala 97:26]
   assign io_lsu_free_c2_clk = rvclkhdr_11_io_l1clk; // @[lsu_clkdomain.scala 98:26]
-  assign rvclkhdr_io_clk = clock; // @[lib.scala 344:17]
-  assign rvclkhdr_io_en = _T | io_clk_override; // @[lib.scala 345:16]
-  assign rvclkhdr_io_scan_mode = io_scan_mode; // @[lib.scala 346:23]
-  assign rvclkhdr_1_io_clk = clock; // @[lib.scala 344:17]
-  assign rvclkhdr_1_io_en = _T_1 | io_clk_override; // @[lib.scala 345:16]
-  assign rvclkhdr_1_io_scan_mode = io_scan_mode; // @[lib.scala 346:23]
-  assign rvclkhdr_2_io_clk = clock; // @[lib.scala 344:17]
-  assign rvclkhdr_2_io_en = _T_2 | io_clk_override; // @[lib.scala 345:16]
-  assign rvclkhdr_2_io_scan_mode = io_scan_mode; // @[lib.scala 346:23]
-  assign rvclkhdr_3_io_clk = clock; // @[lib.scala 344:17]
-  assign rvclkhdr_3_io_en = _T_3 | io_clk_override; // @[lib.scala 345:16]
-  assign rvclkhdr_3_io_scan_mode = io_scan_mode; // @[lib.scala 346:23]
-  assign rvclkhdr_4_io_clk = clock; // @[lib.scala 344:17]
-  assign rvclkhdr_4_io_en = _T_4 | io_clk_override; // @[lib.scala 345:16]
-  assign rvclkhdr_4_io_scan_mode = io_scan_mode; // @[lib.scala 346:23]
-  assign rvclkhdr_5_io_clk = clock; // @[lib.scala 344:17]
-  assign rvclkhdr_5_io_en = _T_5 | io_clk_override; // @[lib.scala 345:16]
-  assign rvclkhdr_5_io_scan_mode = io_scan_mode; // @[lib.scala 346:23]
-  assign rvclkhdr_6_io_clk = clock; // @[lib.scala 344:17]
-  assign rvclkhdr_6_io_en = _T_7 | io_clk_override; // @[lib.scala 345:16]
-  assign rvclkhdr_6_io_scan_mode = io_scan_mode; // @[lib.scala 346:23]
-  assign rvclkhdr_7_io_clk = clock; // @[lib.scala 344:17]
-  assign rvclkhdr_7_io_en = io_lsu_busreq_r | io_clk_override; // @[lib.scala 345:16]
-  assign rvclkhdr_7_io_scan_mode = io_scan_mode; // @[lib.scala 346:23]
+  assign rvclkhdr_io_clk = clock; // @[lib.scala 353:17]
+  assign rvclkhdr_io_en = _T | io_clk_override; // @[lib.scala 354:16]
+  assign rvclkhdr_io_scan_mode = 1'h0; // @[lib.scala 355:23]
+  assign rvclkhdr_1_io_clk = clock; // @[lib.scala 353:17]
+  assign rvclkhdr_1_io_en = _T_1 | io_clk_override; // @[lib.scala 354:16]
+  assign rvclkhdr_1_io_scan_mode = 1'h0; // @[lib.scala 355:23]
+  assign rvclkhdr_2_io_clk = clock; // @[lib.scala 353:17]
+  assign rvclkhdr_2_io_en = _T_2 | io_clk_override; // @[lib.scala 354:16]
+  assign rvclkhdr_2_io_scan_mode = 1'h0; // @[lib.scala 355:23]
+  assign rvclkhdr_3_io_clk = clock; // @[lib.scala 353:17]
+  assign rvclkhdr_3_io_en = _T_3 | io_clk_override; // @[lib.scala 354:16]
+  assign rvclkhdr_3_io_scan_mode = 1'h0; // @[lib.scala 355:23]
+  assign rvclkhdr_4_io_clk = clock; // @[lib.scala 353:17]
+  assign rvclkhdr_4_io_en = _T_4 | io_clk_override; // @[lib.scala 354:16]
+  assign rvclkhdr_4_io_scan_mode = 1'h0; // @[lib.scala 355:23]
+  assign rvclkhdr_5_io_clk = clock; // @[lib.scala 353:17]
+  assign rvclkhdr_5_io_en = _T_5 | io_clk_override; // @[lib.scala 354:16]
+  assign rvclkhdr_5_io_scan_mode = 1'h0; // @[lib.scala 355:23]
+  assign rvclkhdr_6_io_clk = clock; // @[lib.scala 353:17]
+  assign rvclkhdr_6_io_en = _T_7 | io_clk_override; // @[lib.scala 354:16]
+  assign rvclkhdr_6_io_scan_mode = 1'h0; // @[lib.scala 355:23]
+  assign rvclkhdr_7_io_clk = clock; // @[lib.scala 353:17]
+  assign rvclkhdr_7_io_en = io_lsu_busreq_r | io_clk_override; // @[lib.scala 354:16]
+  assign rvclkhdr_7_io_scan_mode = 1'h0; // @[lib.scala 355:23]
   assign rvclkhdr_8_io_clk = clock; // @[lib.scala 344:17]
   assign rvclkhdr_8_io_en = io_lsu_bus_obuf_c1_clken; // @[lib.scala 345:16]
   assign rvclkhdr_8_io_scan_mode = io_scan_mode; // @[lib.scala 346:23]
-  assign rvclkhdr_9_io_clk = clock; // @[lib.scala 344:17]
-  assign rvclkhdr_9_io_en = _T_13 | io_clk_override; // @[lib.scala 345:16]
-  assign rvclkhdr_9_io_scan_mode = io_scan_mode; // @[lib.scala 346:23]
+  assign rvclkhdr_9_io_clk = clock; // @[lib.scala 353:17]
+  assign rvclkhdr_9_io_en = _T_13 | io_clk_override; // @[lib.scala 354:16]
+  assign rvclkhdr_9_io_scan_mode = 1'h0; // @[lib.scala 355:23]
   assign rvclkhdr_10_io_clk = clock; // @[lib.scala 344:17]
   assign rvclkhdr_10_io_en = io_lsu_busm_clken; // @[lib.scala 345:16]
   assign rvclkhdr_10_io_scan_mode = io_scan_mode; // @[lib.scala 346:23]
-  assign rvclkhdr_11_io_clk = clock; // @[lib.scala 344:17]
-  assign rvclkhdr_11_io_en = _T_21 | io_clk_override; // @[lib.scala 345:16]
-  assign rvclkhdr_11_io_scan_mode = io_scan_mode; // @[lib.scala 346:23]
+  assign rvclkhdr_11_io_clk = clock; // @[lib.scala 353:17]
+  assign rvclkhdr_11_io_en = _T_21 | io_clk_override; // @[lib.scala 354:16]
+  assign rvclkhdr_11_io_scan_mode = 1'h0; // @[lib.scala 355:23]
 `ifdef RANDOMIZE_GARBAGE_ASSIGN
 `define RANDOMIZE
 `endif
diff --git a/src/main/scala/lib/lib.scala b/src/main/scala/lib/lib.scala
index 7d902d31..798f5927 100644
--- a/src/main/scala/lib/lib.scala
+++ b/src/main/scala/lib/lib.scala
@@ -347,6 +347,15 @@ trait lib extends param{
       cg.io.l1clk
     }
   }
+  object rvoclkhdr {
+    def apply(clk: Clock, en: Bool, scan_mode: Bool): Clock = {
+      val cg = Module(new rvclkhdr)
+      cg.io.clk := clk
+      cg.io.en := en
+      cg.io.scan_mode := 0.U
+      cg.io.l1clk
+    }
+  }
 
   def rvrangecheck_ch(addr:UInt,CCM_SADR:UInt, CCM_SIZE:Int=128) = {
     val REGION_BITS = 4
diff --git a/src/main/scala/lsu/lsu_clkdomain.scala b/src/main/scala/lsu/lsu_clkdomain.scala
index 44a22a5a..40cdcd23 100644
--- a/src/main/scala/lsu/lsu_clkdomain.scala
+++ b/src/main/scala/lsu/lsu_clkdomain.scala
@@ -84,19 +84,21 @@ class lsu_clkdomain extends Module  with RequireAsyncReset with lib{
   lsu_c1_m_clken_q       := withClock(io.lsu_free_c2_clk) {RegNext(lsu_c1_m_clken, 0.U)}
   lsu_c1_r_clken_q       := withClock(io.lsu_free_c2_clk) {RegNext(lsu_c1_r_clken, 0.U)}
 
-  io.lsu_c1_m_clk        := rvclkhdr(clock,lsu_c1_m_clken.asBool,io.scan_mode)
-  io.lsu_c1_r_clk        := rvclkhdr(clock,lsu_c1_r_clken.asBool,io.scan_mode)
-  io.lsu_c2_m_clk        := rvclkhdr(clock,lsu_c2_m_clken.asBool,io.scan_mode)
-  io.lsu_c2_r_clk        := rvclkhdr(clock,lsu_c2_r_clken.asBool,io.scan_mode)
-  io.lsu_store_c1_m_clk  := rvclkhdr(clock,lsu_store_c1_m_clken.asBool,io.scan_mode)
-  io.lsu_store_c1_r_clk  := rvclkhdr(clock,lsu_store_c1_r_clken.asBool,io.scan_mode)
-  io.lsu_stbuf_c1_clk    := rvclkhdr(clock,lsu_stbuf_c1_clken.asBool,io.scan_mode)
-  io.lsu_bus_ibuf_c1_clk := rvclkhdr(clock,lsu_bus_ibuf_c1_clken.asBool,io.scan_mode)
+  io.lsu_c1_m_clk        := rvoclkhdr(clock,lsu_c1_m_clken.asBool,io.scan_mode)
+  io.lsu_c1_r_clk        := rvoclkhdr(clock,lsu_c1_r_clken.asBool,io.scan_mode)
+  io.lsu_c2_m_clk        := rvoclkhdr(clock,lsu_c2_m_clken.asBool,io.scan_mode)
+  io.lsu_c2_r_clk        := rvoclkhdr(clock,lsu_c2_r_clken.asBool,io.scan_mode)
+  io.lsu_store_c1_m_clk  := rvoclkhdr(clock,lsu_store_c1_m_clken.asBool,io.scan_mode)
+  io.lsu_store_c1_r_clk  := rvoclkhdr(clock,lsu_store_c1_r_clken.asBool,io.scan_mode)
+  io.lsu_stbuf_c1_clk    := rvoclkhdr(clock,lsu_stbuf_c1_clken.asBool,io.scan_mode)
+  io.lsu_bus_ibuf_c1_clk := rvoclkhdr(clock,lsu_bus_ibuf_c1_clken.asBool,io.scan_mode)
   io.lsu_bus_obuf_c1_clk := rvclkhdr(clock,io.lsu_bus_obuf_c1_clken.asBool,io.scan_mode)
-  io.lsu_bus_buf_c1_clk  := rvclkhdr(clock,lsu_bus_buf_c1_clken.asBool,io.scan_mode)
+  io.lsu_bus_buf_c1_clk  := rvoclkhdr(clock,lsu_bus_buf_c1_clken.asBool,io.scan_mode)
   io.lsu_busm_clk        := rvclkhdr(clock,io.lsu_busm_clken.asBool,io.scan_mode)
-  io.lsu_free_c2_clk     := rvclkhdr(clock,lsu_free_c2_clken.asBool,io.scan_mode)
+  io.lsu_free_c2_clk     := rvoclkhdr(clock,lsu_free_c2_clken.asBool,io.scan_mode)
+}
+object clkdomain extends App {
+  println((new chisel3.stage.ChiselStage).emitVerilog(new lsu_clkdomain()))
 }
 
 
-
diff --git a/src/main/scala/quasar.scala b/src/main/scala/quasar.scala
index 76c05288..be02b80f 100644
--- a/src/main/scala/quasar.scala
+++ b/src/main/scala/quasar.scala
@@ -1,290 +1,290 @@
-import chisel3._
-import chisel3.util._
-import ifu._
-import dec._
-import exu._
-import lsu._
-import lib._
-import include._
-import dbg._
-import mem.mem_lsu
-class quasar_bundle extends Bundle with  lib{
-  val lsu_axi = new axi_channels(LSU_BUS_TAG)
-  val ifu_axi = new axi_channels(IFU_BUS_TAG)
-  val sb_axi  = new axi_channels(SB_BUS_TAG)
-  val dma_axi = Flipped(new axi_channels(DMA_BUS_TAG))
-
-  val lsu_ahb = new ahb_channel
-  val ifu_ahb = new ahb_channel
-  val sb_ahb = new ahb_channel
-  val dma_ahb = new Bundle{
-    val sig = Flipped(new ahb_channel())
-    val hsel = Input(Bool())
-    val hreadyin = Input(Bool())}
-
-  val dbg_rst_l = Input(AsyncReset())
-  val rst_vec = Input(UInt(31.W))
-  val nmi_int = Input(Bool())
-  val nmi_vec = Input(UInt(31.W))
-  val core_rst_l = Output(AsyncReset())
-  val rv_trace_pkt = new trace_pkt_t()
-  val dccm_clk_override = Output(Bool())
-  val icm_clk_override = Output(Bool())
-  val dec_tlu_core_ecc_disable = Output(Bool())
-  val i_cpu_halt_req = Input(Bool())
-  val i_cpu_run_req = Input(Bool())
-  val o_cpu_halt_ack = Output(Bool())
-  val o_cpu_halt_status = Output(Bool())
-  val o_cpu_run_ack = Output(Bool())
-  val o_debug_mode_status = Output(Bool())
-  val core_id = Input(UInt(28.W))
-  val mpc_debug_halt_req = Input(Bool())
-  val mpc_debug_run_req = Input(Bool())
-  val mpc_reset_run_req = Input(Bool())
-  val mpc_debug_halt_ack = Output(Bool())
-  val mpc_debug_run_ack = Output(Bool())
-  val debug_brkpt_status = Output(Bool())
-  val dec_tlu_perfcnt0 = Output(Bool())
-  val dec_tlu_perfcnt1 = Output(Bool())
-  val dec_tlu_perfcnt2 = Output(Bool())
-  val dec_tlu_perfcnt3 = Output(Bool())
-  val dccm = Flipped(new mem_lsu)
-  val ic = new ic_mem()
-  val iccm = new iccm_mem()
-
-  val lsu_bus_clk_en = Input(Bool())
-  val ifu_bus_clk_en = Input(Bool())
-  val dbg_bus_clk_en = Input(Bool())
-  val dma_bus_clk_en = Input(Bool())
-  val dmi_reg_en = Input(Bool())
-  val dmi_reg_addr = Input(UInt(7.W))
-  val dmi_reg_wr_en = Input(Bool())
-  val dmi_reg_wdata = Input(UInt(32.W))
-  val dmi_reg_rdata = Output(UInt(32.W))
-  val dmi_hard_reset = Input(Bool())
-  val extintsrc_req = Input(UInt(PIC_TOTAL_INT.W))
-  val timer_int = Input(Bool())
-  val soft_int = Input(Bool())
-  val scan_mode = Input(Bool())
-}
-
-class quasar extends Module with RequireAsyncReset with lib {
-  val io = IO (new quasar_bundle)
-
-  val ifu = Module(new ifu)
-  val dec = Module(new dec)
-  val dbg = Module(new dbg)
-  val exu = Module(new exu)
-  val lsu = Module(new lsu)
-  val pic_ctrl_inst = Module(new pic_ctrl)
-  val dma_ctrl = Module(new dma_ctrl)
-
-  io.core_rst_l := (reset.asBool() & (dbg.io.dbg_core_rst_l.asBool() | io.scan_mode)).asAsyncReset()
-  val active_state = (!dec.io.dec_pause_state_cg | dec.io.dec_exu.tlu_exu.dec_tlu_flush_lower_r) | dec.io.dec_tlu_misc_clk_override
-  val free_clk = rvclkhdr(clock, true.B, io.scan_mode)
-  val active_clk = rvclkhdr(clock, active_state.asBool, io.scan_mode)
-
-  // Lets start with IFU
-  ifu.io.ifu_dec <> dec.io.ifu_dec
-
-  ifu.reset := io.core_rst_l
-  ifu.io.scan_mode := io.scan_mode
-  ifu.io.free_clk := free_clk
-  ifu.io.active_clk := active_clk
-
-  ifu.io.exu_flush_final := dec.io.exu_flush_final
-  ifu.io.exu_flush_path_final := exu.io.exu_flush_path_final
-
-  ifu.io.ifu_bus_clk_en := io.ifu_bus_clk_en
-  ifu.io.ifu_dma <> dma_ctrl.io.ifu_dma
-  ifu.io.ic <> io.ic
-  ifu.io.iccm <> io.iccm
-  ifu.io.exu_ifu.exu_bp <> exu.io.exu_bp
-  ifu.io.exu_ifu.exu_bp.exu_i0_br_fghr_r := exu.io.exu_bp.exu_i0_br_fghr_r
-  ifu.io.exu_ifu.exu_bp.exu_i0_br_index_r := exu.io.dec_exu.tlu_exu.exu_i0_br_index_r
-  ifu.io.dec_tlu_flush_lower_wb := dec.io.dec_exu.tlu_exu.dec_tlu_flush_lower_r
-  ifu.io.ifu_dec.dec_mem_ctrl.dec_tlu_ic_diag_pkt <> dec.io.ifu_dec.dec_mem_ctrl.dec_tlu_ic_diag_pkt
-
-  // Lets start with Dec
-  dec.reset := io.core_rst_l
-  dec.io.free_clk := free_clk
-  dec.io.active_clk := active_clk
-  dec.io.lsu_fastint_stall_any := lsu.io.lsu_fastint_stall_any
-  dec.io.rst_vec := io.rst_vec
-  dec.io.nmi_int := io.nmi_int
-  dec.io.nmi_vec := io.nmi_vec
-  dec.io.i_cpu_halt_req := io.i_cpu_halt_req
-  dec.io.i_cpu_run_req := io.i_cpu_run_req
-  dec.io.core_id := io.core_id
-  dec.io.mpc_debug_halt_req := io.mpc_debug_halt_req
-  dec.io.mpc_debug_run_req := io.mpc_debug_run_req
-  dec.io.mpc_reset_run_req := io.mpc_reset_run_req
-  dec.io.lsu_dec <> lsu.io.lsu_dec
-  dec.io.lsu_tlu <> lsu.io.lsu_tlu
-  dec.io.lsu_pmu_misaligned_m := lsu.io.lsu_pmu_misaligned_m
-  dec.io.dec_dma <> dma_ctrl.io.dec_dma
-
-  dec.io.lsu_fir_addr := lsu.io.lsu_fir_addr
-  dec.io.lsu_fir_error := lsu.io.lsu_fir_error
-  dec.io.lsu_trigger_match_m := lsu.io.lsu_trigger_match_m
-  dec.io.dec_dbg <> dbg.io.dbg_dec
-  dec.io.lsu_idle_any := lsu.io.lsu_idle_any
-  dec.io.lsu_error_pkt_r <> lsu.io.lsu_error_pkt_r
-  dec.io.lsu_single_ecc_error_incr := lsu.io.lsu_single_ecc_error_incr
-  dec.io.exu_div_result := exu.io.exu_div_result
-  dec.io.exu_div_wren := exu.io.exu_div_wren
-  dec.io.lsu_result_m := lsu.io.lsu_result_m
-  dec.io.lsu_result_corr_r := lsu.io.lsu_result_corr_r
-  dec.io.lsu_load_stall_any := lsu.io.lsu_load_stall_any
-  dec.io.lsu_store_stall_any := lsu.io.lsu_store_stall_any
-  dec.io.iccm_dma_sb_error := ifu.io.iccm_dma_sb_error
-  dec.io.exu_flush_final := exu.io.exu_flush_final
-
-  dec.io.soft_int := io.soft_int
-  dec.io.dbg_halt_req := dbg.io.dbg_halt_req
-  dec.io.dbg_resume_req := dbg.io.dbg_resume_req
-  dec.io.exu_i0_br_way_r := exu.io.exu_bp.exu_i0_br_way_r
-  dec.io.timer_int := io.timer_int
-  dec.io.scan_mode := io.scan_mode
-
-  // EXU lets go
-  dec.io.dec_exu <> exu.io.dec_exu
-  exu.reset := io.core_rst_l
-  exu.io.scan_mode := io.scan_mode
-  exu.io.dbg_cmd_wrdata := dbg.io.dbg_dec.dbg_dctl.dbg_cmd_wrdata
-
-  // LSU Lets go
-  lsu.reset := io.core_rst_l
-  lsu.io.clk_override := dec.io.dec_tlu_lsu_clk_override
-  lsu.io.dec_tlu_flush_lower_r := dec.io.dec_exu.tlu_exu.dec_tlu_flush_lower_r
-  lsu.io.dec_tlu_i0_kill_writeb_r := dec.io.dec_tlu_i0_kill_writeb_r
-  lsu.io.dec_tlu_force_halt := dec.io.ifu_dec.dec_mem_ctrl.dec_tlu_force_halt
-  lsu.io.dec_tlu_core_ecc_disable := dec.io.ifu_dec.dec_mem_ctrl.dec_tlu_core_ecc_disable
-  lsu.io.lsu_exu <> exu.io.lsu_exu
-  lsu.io.dec_lsu_offset_d := dec.io.dec_lsu_offset_d
-  lsu.io.lsu_p <> dec.io.lsu_p
-  lsu.io.dec_lsu_valid_raw_d := dec.io.dec_lsu_valid_raw_d
-  lsu.io.dec_tlu_mrac_ff := dec.io.ifu_dec.dec_ifc.dec_tlu_mrac_ff
-  lsu.io.trigger_pkt_any <> dec.io.trigger_pkt_any
-
-  lsu.io.lsu_bus_clk_en := io.lsu_bus_clk_en
-  lsu.io.lsu_dma <> dma_ctrl.io.lsu_dma
-  lsu.io.scan_mode := io.scan_mode
-  lsu.io.free_clk := free_clk
-
-  // Debug lets go
-  dbg.io.core_dbg_rddata := Mux(dma_ctrl.io.dma_dbg_cmd_done, dma_ctrl.io.dma_dbg_rddata, dec.io.dec_dbg_rddata)
-  dbg.io.core_dbg_cmd_done := dma_ctrl.io.dma_dbg_cmd_done | dec.io.dec_dbg_cmd_done
-  dbg.io.core_dbg_cmd_fail := dma_ctrl.io.dma_dbg_cmd_fail | dec.io.dec_dbg_cmd_fail
-  dbg.io.dec_tlu_debug_mode := dec.io.dec_tlu_debug_mode
-  dbg.io.dec_tlu_dbg_halted := dec.io.dec_tlu_dbg_halted
-  dbg.io.dec_tlu_mpc_halted_only := dec.io.dec_tlu_mpc_halted_only
-  dbg.io.dec_tlu_resume_ack := dec.io.dec_tlu_resume_ack
-  dbg.io.dmi_reg_en := io.dmi_reg_en
-  dbg.io.dmi_reg_addr := io.dmi_reg_addr
-  dbg.io.dmi_reg_wr_en := io.dmi_reg_wr_en
-  dbg.io.dmi_reg_wdata := io.dmi_reg_wdata
-  dbg.io.dbg_bus_clk_en := io.dbg_bus_clk_en
-  dbg.io.dbg_rst_l := io.dbg_rst_l.asBool()
-  dbg.io.clk_override := dec.io.dec_tlu_misc_clk_override
-  dbg.io.scan_mode := io.scan_mode
-
-
-  // DMA Lets go
-  dma_ctrl.reset := io.core_rst_l
-  dma_ctrl.io.free_clk := free_clk
-  dma_ctrl.io.dma_bus_clk_en := io.dma_bus_clk_en
-  dma_ctrl.io.clk_override := dec.io.dec_tlu_misc_clk_override
-  dma_ctrl.io.scan_mode := io.scan_mode
-  dma_ctrl.io.dbg_dma <> dbg.io.dbg_dma
-  dma_ctrl.io.dbg_dma_io <> dbg.io.dbg_dma_io
-  dma_ctrl.io.dbg_cmd_size := dbg.io.dbg_cmd_size
-  dma_ctrl.io.iccm_dma_rvalid := ifu.io.iccm_dma_rvalid
-  dma_ctrl.io.iccm_dma_rtag := ifu.io.iccm_dma_rtag
-  dma_ctrl.io.iccm_dma_rdata := ifu.io.iccm_dma_rdata
-  dma_ctrl.io.iccm_ready := ifu.io.iccm_ready
-  dma_ctrl.io.iccm_dma_ecc_error := ifu.io.iccm_dma_ecc_error
-
-  // PIC lets go
-  pic_ctrl_inst.io.scan_mode := io.scan_mode
-  pic_ctrl_inst.reset := io.core_rst_l
-  pic_ctrl_inst.io.free_clk := free_clk
-  pic_ctrl_inst.io.active_clk := active_clk
-  pic_ctrl_inst.io.clk_override := dec.io.dec_tlu_pic_clk_override
-  pic_ctrl_inst.io.extintsrc_req := Cat(io.extintsrc_req,0.U)
-  pic_ctrl_inst.io.lsu_pic <> lsu.io.lsu_pic
-  pic_ctrl_inst.io.dec_pic <> dec.io.dec_pic
-  // Trace Packet
-  io.rv_trace_pkt := dec.io.rv_trace_pkt
-
-  // Outputs
-  io.dccm_clk_override := dec.io.dec_tlu_dccm_clk_override
-  io.icm_clk_override := dec.io.dec_tlu_icm_clk_override
-  io.dec_tlu_core_ecc_disable := dec.io.ifu_dec.dec_mem_ctrl.dec_tlu_core_ecc_disable
-  io.o_cpu_halt_ack := dec.io.o_cpu_halt_ack
-  io.o_cpu_halt_status := dec.io.o_cpu_halt_status
-  io.o_cpu_run_ack := dec.io.o_cpu_run_ack
-  io.o_debug_mode_status := dec.io.o_debug_mode_status
-  io.mpc_debug_halt_ack := dec.io.mpc_debug_halt_ack
-  io.mpc_debug_run_ack := dec.io.mpc_debug_run_ack
-  io.debug_brkpt_status := dec.io.debug_brkpt_status
-  io.dec_tlu_perfcnt0 := dec.io.dec_tlu_perfcnt0
-  io.dec_tlu_perfcnt1 := dec.io.dec_tlu_perfcnt1
-  io.dec_tlu_perfcnt2 := dec.io.dec_tlu_perfcnt2
-  io.dec_tlu_perfcnt3 := dec.io.dec_tlu_perfcnt3
-  io.dmi_reg_rdata := dbg.io.dmi_reg_rdata
-
-  // LSU Outputs
-  io.dccm <> lsu.io.dccm
-
-  if(BUILD_AHB_LITE) {
-    val sb_axi4_to_ahb = Module(new axi4_to_ahb(SB_BUS_TAG))
-    val ifu_axi4_to_ahb = Module(new axi4_to_ahb(IFU_BUS_TAG))
-    val lsu_axi4_to_ahb = Module(new axi4_to_ahb(LSU_BUS_TAG))
-    val dma_ahb_to_axi4 = Module(new ahb_to_axi4(DMA_BUS_TAG))
-
-    lsu_axi4_to_ahb.io.scan_mode := io.scan_mode
-    lsu_axi4_to_ahb.io.bus_clk_en := io.lsu_bus_clk_en
-    lsu_axi4_to_ahb.io.clk_override := dec.io.dec_tlu_bus_clk_override
-    lsu_axi4_to_ahb.io.axi <> lsu.io.axi
-    lsu_axi4_to_ahb.io.ahb <> io.lsu_ahb
-
-    ifu_axi4_to_ahb.io.scan_mode := io.scan_mode
-    ifu_axi4_to_ahb.io.bus_clk_en := io.ifu_bus_clk_en
-    ifu_axi4_to_ahb.io.clk_override := dec.io.dec_tlu_bus_clk_override
-    ifu_axi4_to_ahb.io.axi <> ifu.io.ifu
-    ifu_axi4_to_ahb.io.ahb <> io.ifu_ahb
-    ifu_axi4_to_ahb.io.axi.b.ready := true.B
-
-    sb_axi4_to_ahb.io.scan_mode := io.scan_mode
-    sb_axi4_to_ahb.io.bus_clk_en := io.dbg_bus_clk_en
-    sb_axi4_to_ahb.io.clk_override := dec.io.dec_tlu_bus_clk_override
-    sb_axi4_to_ahb.io.axi <> dbg.io.sb_axi
-    sb_axi4_to_ahb.io.ahb <> io.sb_ahb
-
-    dma_ahb_to_axi4.io.scan_mode := io.scan_mode
-    dma_ahb_to_axi4.io.bus_clk_en := io.dma_bus_clk_en
-    dma_ahb_to_axi4.io.clk_override := dec.io.dec_tlu_bus_clk_override
-    dma_ahb_to_axi4.io.axi <> dma_ctrl.io.dma_axi
-    dma_ahb_to_axi4.io.ahb <> io.dma_ahb
-
-    io.dma_axi      <> 0.U.asTypeOf(io.dma_axi)
-    io.sb_axi       <> 0.U.asTypeOf(io.sb_axi)
-    io.ifu_axi      <> 0.U.asTypeOf(io.ifu_axi)
-    io.lsu_axi      <> 0.U.asTypeOf(io.lsu_axi)
-  }
-    else{
-      io.lsu_ahb          <> 0.U.asTypeOf(io.lsu_ahb)
-      io.ifu_ahb          <> 0.U.asTypeOf(io.ifu_ahb)
-      io.sb_ahb           <> 0.U.asTypeOf(io.sb_ahb)
-      io.dma_ahb          <> 0.U.asTypeOf(io.dma_ahb)
-      dma_ctrl.io.dma_axi <> io.dma_axi
-      dbg.io.sb_axi       <> io.sb_axi
-      ifu.io.ifu          <> io.ifu_axi
-      lsu.io.axi          <> io.lsu_axi
-    }
-
-}
-//object QUASAR extends App {
- // println((new chisel3.stage.ChiselStage).emitVerilog(new quasar()))
-//}
\ No newline at end of file
+//import chisel3._
+//import chisel3.util._
+//import ifu._
+//import dec._
+//import exu._
+//import lsu._
+//import lib._
+//import include._
+//import dbg._
+//import mem.mem_lsu
+//class quasar_bundle extends Bundle with  lib{
+//  val lsu_axi = new axi_channels(LSU_BUS_TAG)
+//  val ifu_axi = new axi_channels(IFU_BUS_TAG)
+//  val sb_axi  = new axi_channels(SB_BUS_TAG)
+//  val dma_axi = Flipped(new axi_channels(DMA_BUS_TAG))
+//
+//  val lsu_ahb = new ahb_channel
+//  val ifu_ahb = new ahb_channel
+//  val sb_ahb = new ahb_channel
+//  val dma_ahb = new Bundle{
+//    val sig = Flipped(new ahb_channel())
+//    val hsel = Input(Bool())
+//    val hreadyin = Input(Bool())}
+//
+//  val dbg_rst_l = Input(AsyncReset())
+//  val rst_vec = Input(UInt(31.W))
+//  val nmi_int = Input(Bool())
+//  val nmi_vec = Input(UInt(31.W))
+//  val core_rst_l = Output(AsyncReset())
+//  val rv_trace_pkt = new trace_pkt_t()
+//  val dccm_clk_override = Output(Bool())
+//  val icm_clk_override = Output(Bool())
+//  val dec_tlu_core_ecc_disable = Output(Bool())
+//  val i_cpu_halt_req = Input(Bool())
+//  val i_cpu_run_req = Input(Bool())
+//  val o_cpu_halt_ack = Output(Bool())
+//  val o_cpu_halt_status = Output(Bool())
+//  val o_cpu_run_ack = Output(Bool())
+//  val o_debug_mode_status = Output(Bool())
+//  val core_id = Input(UInt(28.W))
+//  val mpc_debug_halt_req = Input(Bool())
+//  val mpc_debug_run_req = Input(Bool())
+//  val mpc_reset_run_req = Input(Bool())
+//  val mpc_debug_halt_ack = Output(Bool())
+//  val mpc_debug_run_ack = Output(Bool())
+//  val debug_brkpt_status = Output(Bool())
+//  val dec_tlu_perfcnt0 = Output(Bool())
+//  val dec_tlu_perfcnt1 = Output(Bool())
+//  val dec_tlu_perfcnt2 = Output(Bool())
+//  val dec_tlu_perfcnt3 = Output(Bool())
+//  val dccm = Flipped(new mem_lsu)
+//  val ic = new ic_mem()
+//  val iccm = new iccm_mem()
+//
+//  val lsu_bus_clk_en = Input(Bool())
+//  val ifu_bus_clk_en = Input(Bool())
+//  val dbg_bus_clk_en = Input(Bool())
+//  val dma_bus_clk_en = Input(Bool())
+//  val dmi_reg_en = Input(Bool())
+//  val dmi_reg_addr = Input(UInt(7.W))
+//  val dmi_reg_wr_en = Input(Bool())
+//  val dmi_reg_wdata = Input(UInt(32.W))
+//  val dmi_reg_rdata = Output(UInt(32.W))
+//  val dmi_hard_reset = Input(Bool())
+//  val extintsrc_req = Input(UInt(PIC_TOTAL_INT.W))
+//  val timer_int = Input(Bool())
+//  val soft_int = Input(Bool())
+//  val scan_mode = Input(Bool())
+//}
+//
+//class quasar extends Module with RequireAsyncReset with lib {
+//  val io = IO (new quasar_bundle)
+//
+//  val ifu = Module(new ifu)
+//  val dec = Module(new dec)
+//  val dbg = Module(new dbg)
+//  val exu = Module(new exu)
+//  val lsu = Module(new lsu)
+//  val pic_ctrl_inst = Module(new pic_ctrl)
+//  val dma_ctrl = Module(new dma_ctrl)
+//
+//  io.core_rst_l := (reset.asBool() & (dbg.io.dbg_core_rst_l.asBool() | io.scan_mode)).asAsyncReset()
+//  val active_state = (!dec.io.dec_pause_state_cg | dec.io.dec_exu.tlu_exu.dec_tlu_flush_lower_r) | dec.io.dec_tlu_misc_clk_override
+//  val free_clk = rvclkhdr(clock, true.B, io.scan_mode)
+//  val active_clk = rvclkhdr(clock, active_state.asBool, io.scan_mode)
+//
+//  // Lets start with IFU
+//  ifu.io.ifu_dec <> dec.io.ifu_dec
+//
+//  ifu.reset := io.core_rst_l
+//  ifu.io.scan_mode := io.scan_mode
+//  ifu.io.free_clk := free_clk
+//  ifu.io.active_clk := active_clk
+//
+//  ifu.io.exu_flush_final := dec.io.exu_flush_final
+//  ifu.io.exu_flush_path_final := exu.io.exu_flush_path_final
+//
+//  ifu.io.ifu_bus_clk_en := io.ifu_bus_clk_en
+//  ifu.io.ifu_dma <> dma_ctrl.io.ifu_dma
+//  ifu.io.ic <> io.ic
+//  ifu.io.iccm <> io.iccm
+//  ifu.io.exu_ifu.exu_bp <> exu.io.exu_bp
+//  ifu.io.exu_ifu.exu_bp.exu_i0_br_fghr_r := exu.io.exu_bp.exu_i0_br_fghr_r
+//  ifu.io.exu_ifu.exu_bp.exu_i0_br_index_r := exu.io.dec_exu.tlu_exu.exu_i0_br_index_r
+//  ifu.io.dec_tlu_flush_lower_wb := dec.io.dec_exu.tlu_exu.dec_tlu_flush_lower_r
+//  ifu.io.ifu_dec.dec_mem_ctrl.dec_tlu_ic_diag_pkt <> dec.io.ifu_dec.dec_mem_ctrl.dec_tlu_ic_diag_pkt
+//
+//  // Lets start with Dec
+//  dec.reset := io.core_rst_l
+//  dec.io.free_clk := free_clk
+//  dec.io.active_clk := active_clk
+//  dec.io.lsu_fastint_stall_any := lsu.io.lsu_fastint_stall_any
+//  dec.io.rst_vec := io.rst_vec
+//  dec.io.nmi_int := io.nmi_int
+//  dec.io.nmi_vec := io.nmi_vec
+//  dec.io.i_cpu_halt_req := io.i_cpu_halt_req
+//  dec.io.i_cpu_run_req := io.i_cpu_run_req
+//  dec.io.core_id := io.core_id
+//  dec.io.mpc_debug_halt_req := io.mpc_debug_halt_req
+//  dec.io.mpc_debug_run_req := io.mpc_debug_run_req
+//  dec.io.mpc_reset_run_req := io.mpc_reset_run_req
+//  dec.io.lsu_dec <> lsu.io.lsu_dec
+//  dec.io.lsu_tlu <> lsu.io.lsu_tlu
+//  dec.io.lsu_pmu_misaligned_m := lsu.io.lsu_pmu_misaligned_m
+//  dec.io.dec_dma <> dma_ctrl.io.dec_dma
+//
+//  dec.io.lsu_fir_addr := lsu.io.lsu_fir_addr
+//  dec.io.lsu_fir_error := lsu.io.lsu_fir_error
+//  dec.io.lsu_trigger_match_m := lsu.io.lsu_trigger_match_m
+//  dec.io.dec_dbg <> dbg.io.dbg_dec
+//  dec.io.lsu_idle_any := lsu.io.lsu_idle_any
+//  dec.io.lsu_error_pkt_r <> lsu.io.lsu_error_pkt_r
+//  dec.io.lsu_single_ecc_error_incr := lsu.io.lsu_single_ecc_error_incr
+//  dec.io.exu_div_result := exu.io.exu_div_result
+//  dec.io.exu_div_wren := exu.io.exu_div_wren
+//  dec.io.lsu_result_m := lsu.io.lsu_result_m
+//  dec.io.lsu_result_corr_r := lsu.io.lsu_result_corr_r
+//  dec.io.lsu_load_stall_any := lsu.io.lsu_load_stall_any
+//  dec.io.lsu_store_stall_any := lsu.io.lsu_store_stall_any
+//  dec.io.iccm_dma_sb_error := ifu.io.iccm_dma_sb_error
+//  dec.io.exu_flush_final := exu.io.exu_flush_final
+//
+//  dec.io.soft_int := io.soft_int
+//  dec.io.dbg_halt_req := dbg.io.dbg_halt_req
+//  dec.io.dbg_resume_req := dbg.io.dbg_resume_req
+//  dec.io.exu_i0_br_way_r := exu.io.exu_bp.exu_i0_br_way_r
+//  dec.io.timer_int := io.timer_int
+//  dec.io.scan_mode := io.scan_mode
+//
+//  // EXU lets go
+//  dec.io.dec_exu <> exu.io.dec_exu
+//  exu.reset := io.core_rst_l
+//  exu.io.scan_mode := io.scan_mode
+//  exu.io.dbg_cmd_wrdata := dbg.io.dbg_dec.dbg_dctl.dbg_cmd_wrdata
+//
+//  // LSU Lets go
+//  lsu.reset := io.core_rst_l
+//  lsu.io.clk_override := dec.io.dec_tlu_lsu_clk_override
+//  lsu.io.dec_tlu_flush_lower_r := dec.io.dec_exu.tlu_exu.dec_tlu_flush_lower_r
+//  lsu.io.dec_tlu_i0_kill_writeb_r := dec.io.dec_tlu_i0_kill_writeb_r
+//  lsu.io.dec_tlu_force_halt := dec.io.ifu_dec.dec_mem_ctrl.dec_tlu_force_halt
+//  lsu.io.dec_tlu_core_ecc_disable := dec.io.ifu_dec.dec_mem_ctrl.dec_tlu_core_ecc_disable
+//  lsu.io.lsu_exu <> exu.io.lsu_exu
+//  lsu.io.dec_lsu_offset_d := dec.io.dec_lsu_offset_d
+//  lsu.io.lsu_p <> dec.io.lsu_p
+//  lsu.io.dec_lsu_valid_raw_d := dec.io.dec_lsu_valid_raw_d
+//  lsu.io.dec_tlu_mrac_ff := dec.io.ifu_dec.dec_ifc.dec_tlu_mrac_ff
+//  lsu.io.trigger_pkt_any <> dec.io.trigger_pkt_any
+//
+//  lsu.io.lsu_bus_clk_en := io.lsu_bus_clk_en
+//  lsu.io.lsu_dma <> dma_ctrl.io.lsu_dma
+//  lsu.io.scan_mode := io.scan_mode
+//  lsu.io.free_clk := free_clk
+//
+//  // Debug lets go
+//  dbg.io.core_dbg_rddata := Mux(dma_ctrl.io.dma_dbg_cmd_done, dma_ctrl.io.dma_dbg_rddata, dec.io.dec_dbg_rddata)
+//  dbg.io.core_dbg_cmd_done := dma_ctrl.io.dma_dbg_cmd_done | dec.io.dec_dbg_cmd_done
+//  dbg.io.core_dbg_cmd_fail := dma_ctrl.io.dma_dbg_cmd_fail | dec.io.dec_dbg_cmd_fail
+//  dbg.io.dec_tlu_debug_mode := dec.io.dec_tlu_debug_mode
+//  dbg.io.dec_tlu_dbg_halted := dec.io.dec_tlu_dbg_halted
+//  dbg.io.dec_tlu_mpc_halted_only := dec.io.dec_tlu_mpc_halted_only
+//  dbg.io.dec_tlu_resume_ack := dec.io.dec_tlu_resume_ack
+//  dbg.io.dmi_reg_en := io.dmi_reg_en
+//  dbg.io.dmi_reg_addr := io.dmi_reg_addr
+//  dbg.io.dmi_reg_wr_en := io.dmi_reg_wr_en
+//  dbg.io.dmi_reg_wdata := io.dmi_reg_wdata
+//  dbg.io.dbg_bus_clk_en := io.dbg_bus_clk_en
+//  dbg.io.dbg_rst_l := io.dbg_rst_l.asBool()
+//  dbg.io.clk_override := dec.io.dec_tlu_misc_clk_override
+//  dbg.io.scan_mode := io.scan_mode
+//
+//
+//  // DMA Lets go
+//  dma_ctrl.reset := io.core_rst_l
+//  dma_ctrl.io.free_clk := free_clk
+//  dma_ctrl.io.dma_bus_clk_en := io.dma_bus_clk_en
+//  dma_ctrl.io.clk_override := dec.io.dec_tlu_misc_clk_override
+//  dma_ctrl.io.scan_mode := io.scan_mode
+//  dma_ctrl.io.dbg_dma <> dbg.io.dbg_dma
+//  dma_ctrl.io.dbg_dma_io <> dbg.io.dbg_dma_io
+//  dma_ctrl.io.dbg_cmd_size := dbg.io.dbg_cmd_size
+//  dma_ctrl.io.iccm_dma_rvalid := ifu.io.iccm_dma_rvalid
+//  dma_ctrl.io.iccm_dma_rtag := ifu.io.iccm_dma_rtag
+//  dma_ctrl.io.iccm_dma_rdata := ifu.io.iccm_dma_rdata
+//  dma_ctrl.io.iccm_ready := ifu.io.iccm_ready
+//  dma_ctrl.io.iccm_dma_ecc_error := ifu.io.iccm_dma_ecc_error
+//
+//  // PIC lets go
+//  pic_ctrl_inst.io.scan_mode := io.scan_mode
+//  pic_ctrl_inst.reset := io.core_rst_l
+//  pic_ctrl_inst.io.free_clk := free_clk
+//  pic_ctrl_inst.io.active_clk := active_clk
+//  pic_ctrl_inst.io.clk_override := dec.io.dec_tlu_pic_clk_override
+//  pic_ctrl_inst.io.extintsrc_req := Cat(io.extintsrc_req,0.U)
+//  pic_ctrl_inst.io.lsu_pic <> lsu.io.lsu_pic
+//  pic_ctrl_inst.io.dec_pic <> dec.io.dec_pic
+//  // Trace Packet
+//  io.rv_trace_pkt := dec.io.rv_trace_pkt
+//
+//  // Outputs
+//  io.dccm_clk_override := dec.io.dec_tlu_dccm_clk_override
+//  io.icm_clk_override := dec.io.dec_tlu_icm_clk_override
+//  io.dec_tlu_core_ecc_disable := dec.io.ifu_dec.dec_mem_ctrl.dec_tlu_core_ecc_disable
+//  io.o_cpu_halt_ack := dec.io.o_cpu_halt_ack
+//  io.o_cpu_halt_status := dec.io.o_cpu_halt_status
+//  io.o_cpu_run_ack := dec.io.o_cpu_run_ack
+//  io.o_debug_mode_status := dec.io.o_debug_mode_status
+//  io.mpc_debug_halt_ack := dec.io.mpc_debug_halt_ack
+//  io.mpc_debug_run_ack := dec.io.mpc_debug_run_ack
+//  io.debug_brkpt_status := dec.io.debug_brkpt_status
+//  io.dec_tlu_perfcnt0 := dec.io.dec_tlu_perfcnt0
+//  io.dec_tlu_perfcnt1 := dec.io.dec_tlu_perfcnt1
+//  io.dec_tlu_perfcnt2 := dec.io.dec_tlu_perfcnt2
+//  io.dec_tlu_perfcnt3 := dec.io.dec_tlu_perfcnt3
+//  io.dmi_reg_rdata := dbg.io.dmi_reg_rdata
+//
+//  // LSU Outputs
+//  io.dccm <> lsu.io.dccm
+//
+//  if(BUILD_AHB_LITE) {
+//    val sb_axi4_to_ahb = Module(new axi4_to_ahb(SB_BUS_TAG))
+//    val ifu_axi4_to_ahb = Module(new axi4_to_ahb(IFU_BUS_TAG))
+//    val lsu_axi4_to_ahb = Module(new axi4_to_ahb(LSU_BUS_TAG))
+//    val dma_ahb_to_axi4 = Module(new ahb_to_axi4(DMA_BUS_TAG))
+//
+//    lsu_axi4_to_ahb.io.scan_mode := io.scan_mode
+//    lsu_axi4_to_ahb.io.bus_clk_en := io.lsu_bus_clk_en
+//    lsu_axi4_to_ahb.io.clk_override := dec.io.dec_tlu_bus_clk_override
+//    lsu_axi4_to_ahb.io.axi <> lsu.io.axi
+//    lsu_axi4_to_ahb.io.ahb <> io.lsu_ahb
+//
+//    ifu_axi4_to_ahb.io.scan_mode := io.scan_mode
+//    ifu_axi4_to_ahb.io.bus_clk_en := io.ifu_bus_clk_en
+//    ifu_axi4_to_ahb.io.clk_override := dec.io.dec_tlu_bus_clk_override
+//    ifu_axi4_to_ahb.io.axi <> ifu.io.ifu
+//    ifu_axi4_to_ahb.io.ahb <> io.ifu_ahb
+//    ifu_axi4_to_ahb.io.axi.b.ready := true.B
+//
+//    sb_axi4_to_ahb.io.scan_mode := io.scan_mode
+//    sb_axi4_to_ahb.io.bus_clk_en := io.dbg_bus_clk_en
+//    sb_axi4_to_ahb.io.clk_override := dec.io.dec_tlu_bus_clk_override
+//    sb_axi4_to_ahb.io.axi <> dbg.io.sb_axi
+//    sb_axi4_to_ahb.io.ahb <> io.sb_ahb
+//
+//    dma_ahb_to_axi4.io.scan_mode := io.scan_mode
+//    dma_ahb_to_axi4.io.bus_clk_en := io.dma_bus_clk_en
+//    dma_ahb_to_axi4.io.clk_override := dec.io.dec_tlu_bus_clk_override
+//    dma_ahb_to_axi4.io.axi <> dma_ctrl.io.dma_axi
+//    dma_ahb_to_axi4.io.ahb <> io.dma_ahb
+//
+//    io.dma_axi      <> 0.U.asTypeOf(io.dma_axi)
+//    io.sb_axi       <> 0.U.asTypeOf(io.sb_axi)
+//    io.ifu_axi      <> 0.U.asTypeOf(io.ifu_axi)
+//    io.lsu_axi      <> 0.U.asTypeOf(io.lsu_axi)
+//  }
+//    else{
+//      io.lsu_ahb          <> 0.U.asTypeOf(io.lsu_ahb)
+//      io.ifu_ahb          <> 0.U.asTypeOf(io.ifu_ahb)
+//      io.sb_ahb           <> 0.U.asTypeOf(io.sb_ahb)
+//      io.dma_ahb          <> 0.U.asTypeOf(io.dma_ahb)
+//      dma_ctrl.io.dma_axi <> io.dma_axi
+//      dbg.io.sb_axi       <> io.sb_axi
+//      ifu.io.ifu          <> io.ifu_axi
+//      lsu.io.axi          <> io.lsu_axi
+//    }
+//
+//}
+////object QUASAR extends App {
+// // println((new chisel3.stage.ChiselStage).emitVerilog(new quasar()))
+////}
\ No newline at end of file
diff --git a/src/main/scala/quasar_wrapper.scala b/src/main/scala/quasar_wrapper.scala
index d23325c4..1951facb 100644
--- a/src/main/scala/quasar_wrapper.scala
+++ b/src/main/scala/quasar_wrapper.scala
@@ -1,165 +1,165 @@
-import chisel3._
-import mem._
-import chisel3.util._
-import dmi._
-import include._
-import lib._
-class quasar_wrapper extends Module with lib with RequireAsyncReset {
-  val io = IO(new Bundle{
-    val dbg_rst_l = Input(AsyncReset())
-    val rst_vec = Input(UInt(31.W))
-    val nmi_int = Input(Bool())
-    val nmi_vec = Input(UInt(31.W))
-    val jtag_id = Input(UInt(31.W))
-
-    // AXI Signals
-    val lsu_brg = bridge_gen(LSU_BUS_TAG, false)
-    val ifu_brg = bridge_gen(IFU_BUS_TAG, false)
-    val sb_brg  = bridge_gen(SB_BUS_TAG , false)
-    val dma_brg = bridge_gen(DMA_BUS_TAG, true)
-
-    val lsu_bus_clk_en = Input(Bool())
-    val ifu_bus_clk_en = Input(Bool())
-    val dbg_bus_clk_en = Input(Bool())
-    val dma_bus_clk_en = Input(Bool())
-
-    val timer_int = Input(Bool())
-    val soft_int = Input(Bool())
-
-    val extintsrc_req = Input(UInt(PIC_TOTAL_INT.W))
-
-    val dec_tlu_perfcnt0 = Output(Bool())
-    val dec_tlu_perfcnt1 = Output(Bool())
-    val dec_tlu_perfcnt2 = Output(Bool())
-    val dec_tlu_perfcnt3 = Output(Bool())
-
-    val jtag_tck = Input(Clock())
-    val jtag_tms = Input(Bool())
-    val jtag_tdi = Input(Bool())
-    val jtag_trst_n = Input(Bool())
-    val jtag_tdo = Output(Bool())
-
-    val core_id = Input(UInt(28.W))
-
-    val mpc_debug_halt_req = Input(Bool())
-    val mpc_debug_run_req = Input(Bool())
-    val mpc_reset_run_req = Input(Bool())
-    val mpc_debug_halt_ack = Output(Bool())
-    val mpc_debug_run_ack = Output(Bool())
-    val debug_brkpt_status = Output(Bool())
-
-    val i_cpu_halt_req = Input(Bool())
-    val i_cpu_run_req = Input(Bool())
-    val o_cpu_halt_ack = Output(Bool())
-    val o_cpu_halt_status = Output(Bool())
-    val o_debug_mode_status = Output(Bool())
-    val o_cpu_run_ack = Output(Bool())
-    val mbist_mode = Input(Bool())
-
-    val rv_trace_pkt = new trace_pkt_t()
-    val scan_mode = Input(Bool())
-
-  })
-  val mem = Module(new quasar.mem())
-  val dmi_wrapper = Module(new dmi_wrapper())
-  val core = Module(new quasar())
-  core.io.scan_mode := io.scan_mode
-  dmi_wrapper.io.trst_n := io.jtag_trst_n
-  dmi_wrapper.io.tck := io.jtag_tck
-  dmi_wrapper.io.tms := io.jtag_tms
-  dmi_wrapper.io.tdi := io.jtag_tdi
-  dmi_wrapper.io.core_clk := clock
-  dmi_wrapper.io.jtag_id := io.jtag_id
-  dmi_wrapper.io.rd_data := core.io.dmi_reg_rdata
-  dmi_wrapper.io.core_rst_n := io.dbg_rst_l
-  core.io.dmi_reg_wdata := dmi_wrapper.io.reg_wr_data
-  core.io.dmi_reg_addr := dmi_wrapper.io.reg_wr_addr
-  core.io.dmi_reg_en := dmi_wrapper.io.reg_en
-  core.io.dmi_reg_wr_en := dmi_wrapper.io.reg_wr_en
-  core.io.dmi_hard_reset := dmi_wrapper.io.dmi_hard_reset
-  io.jtag_tdo := dmi_wrapper.io.tdo
-
-  // Memory signals
-  mem.io.dccm_clk_override := core.io.dccm_clk_override
-  mem.io.icm_clk_override := core.io.icm_clk_override
-  mem.io.dec_tlu_core_ecc_disable := core.io.dec_tlu_core_ecc_disable
-  mem.io.dccm <> core.io.dccm
-  mem.io.rst_l := reset
-  mem.io.clk := clock
-  mem.io.scan_mode := io.scan_mode
-  // Memory outputs
-  core.io.dbg_rst_l := io.dbg_rst_l
-  core.io.ic <> mem.io.ic
-  core.io.iccm <> mem.io.iccm
-
-
-  if(BUILD_AXI4) {
-    core.io.ifu_ahb <> 0.U.asTypeOf(core.io.ifu_ahb)
-    core.io.lsu_ahb <> 0.U.asTypeOf(core.io.lsu_ahb)
-    core.io.sb_ahb  <> 0.U.asTypeOf(core.io.sb_ahb)
-    core.io.dma_ahb <> 0.U.asTypeOf(core.io.dma_ahb)
-
-    core.io.lsu_axi <> io.lsu_brg
-    core.io.ifu_axi <> io.ifu_brg
-    core.io.sb_axi  <> io.sb_brg
-    core.io.dma_axi <> io.dma_brg
-  }
-  else {
-    core.io.ifu_ahb <> io.ifu_brg
-    core.io.lsu_ahb <> io.lsu_brg
-    core.io.sb_ahb <> io.sb_brg
-    core.io.dma_ahb <> io.dma_brg
-
-    core.io.lsu_axi <> 0.U.asTypeOf(core.io.lsu_axi)
-    core.io.ifu_axi <> 0.U.asTypeOf(core.io.ifu_axi)
-    core.io.sb_axi  <> 0.U.asTypeOf(core.io.sb_axi)
-    core.io.dma_axi <> 0.U.asTypeOf(core.io.lsu_axi)
-  }
-  // core Inputs
-  core.io.dbg_rst_l := io.dbg_rst_l
-  core.io.rst_vec := io.rst_vec
-  core.io.nmi_int := io.nmi_int
-  core.io.nmi_vec := io.nmi_vec
-
-  // external halt/run interface
-  core.io.i_cpu_halt_req := io.i_cpu_halt_req
-  core.io.i_cpu_run_req := io.i_cpu_run_req
-  core.io.core_id := io.core_id
-
-  // external MPC halt/run interface
-  core.io.mpc_debug_halt_req := io.mpc_debug_halt_req
-  core.io.mpc_debug_run_req := io.mpc_debug_run_req
-  core.io.mpc_reset_run_req := io.mpc_reset_run_req
-
-  core.io.lsu_bus_clk_en := io.lsu_bus_clk_en
-  core.io.ifu_bus_clk_en := io.ifu_bus_clk_en
-  core.io.dbg_bus_clk_en := io.dbg_bus_clk_en
-  core.io.dma_bus_clk_en := io.dma_bus_clk_en
-
-  core.io.timer_int := io.timer_int
-  core.io.soft_int := io.soft_int
-  core.io.extintsrc_req := io.extintsrc_req
-
-  // Outputs
-  val core_rst_l = core.io.core_rst_l
-  io.rv_trace_pkt <> core.io.rv_trace_pkt
-
-  // external halt/run interface
-  io.o_cpu_halt_ack := core.io.o_cpu_halt_ack
-  io.o_cpu_halt_status := core.io.o_cpu_halt_status
-  io.o_cpu_run_ack := core.io.o_cpu_run_ack
-  io.o_debug_mode_status := core.io.o_debug_mode_status
-
-  io.mpc_debug_halt_ack := core.io.mpc_debug_halt_ack
-  io.mpc_debug_run_ack := core.io.mpc_debug_run_ack
-  io.debug_brkpt_status := core.io.debug_brkpt_status
-
-  io.dec_tlu_perfcnt0 := core.io.dec_tlu_perfcnt0
-  io.dec_tlu_perfcnt1 := core.io.dec_tlu_perfcnt1
-  io.dec_tlu_perfcnt2 := core.io.dec_tlu_perfcnt2
-  io.dec_tlu_perfcnt3 := core.io.dec_tlu_perfcnt3
-
-}
-object QUASAR_Wrp extends App {
-  println((new chisel3.stage.ChiselStage).emitVerilog(new quasar_wrapper()))
-}
\ No newline at end of file
+//import chisel3._
+//import mem._
+//import chisel3.util._
+//import dmi._
+//import include._
+//import lib._
+//class quasar_wrapper extends Module with lib with RequireAsyncReset {
+//  val io = IO(new Bundle{
+//    val dbg_rst_l = Input(AsyncReset())
+//    val rst_vec = Input(UInt(31.W))
+//    val nmi_int = Input(Bool())
+//    val nmi_vec = Input(UInt(31.W))
+//    val jtag_id = Input(UInt(31.W))
+//
+//    // AXI Signals
+//    val lsu_brg = bridge_gen(LSU_BUS_TAG, false)
+//    val ifu_brg = bridge_gen(IFU_BUS_TAG, false)
+//    val sb_brg  = bridge_gen(SB_BUS_TAG , false)
+//    val dma_brg = bridge_gen(DMA_BUS_TAG, true)
+//
+//    val lsu_bus_clk_en = Input(Bool())
+//    val ifu_bus_clk_en = Input(Bool())
+//    val dbg_bus_clk_en = Input(Bool())
+//    val dma_bus_clk_en = Input(Bool())
+//
+//    val timer_int = Input(Bool())
+//    val soft_int = Input(Bool())
+//
+//    val extintsrc_req = Input(UInt(PIC_TOTAL_INT.W))
+//
+//    val dec_tlu_perfcnt0 = Output(Bool())
+//    val dec_tlu_perfcnt1 = Output(Bool())
+//    val dec_tlu_perfcnt2 = Output(Bool())
+//    val dec_tlu_perfcnt3 = Output(Bool())
+//
+//    val jtag_tck = Input(Clock())
+//    val jtag_tms = Input(Bool())
+//    val jtag_tdi = Input(Bool())
+//    val jtag_trst_n = Input(Bool())
+//    val jtag_tdo = Output(Bool())
+//
+//    val core_id = Input(UInt(28.W))
+//
+//    val mpc_debug_halt_req = Input(Bool())
+//    val mpc_debug_run_req = Input(Bool())
+//    val mpc_reset_run_req = Input(Bool())
+//    val mpc_debug_halt_ack = Output(Bool())
+//    val mpc_debug_run_ack = Output(Bool())
+//    val debug_brkpt_status = Output(Bool())
+//
+//    val i_cpu_halt_req = Input(Bool())
+//    val i_cpu_run_req = Input(Bool())
+//    val o_cpu_halt_ack = Output(Bool())
+//    val o_cpu_halt_status = Output(Bool())
+//    val o_debug_mode_status = Output(Bool())
+//    val o_cpu_run_ack = Output(Bool())
+//    val mbist_mode = Input(Bool())
+//
+//    val rv_trace_pkt = new trace_pkt_t()
+//    val scan_mode = Input(Bool())
+//
+//  })
+//  val mem = Module(new quasar.mem())
+//  val dmi_wrapper = Module(new dmi_wrapper())
+//  val core = Module(new quasar())
+//  core.io.scan_mode := io.scan_mode
+//  dmi_wrapper.io.trst_n := io.jtag_trst_n
+//  dmi_wrapper.io.tck := io.jtag_tck
+//  dmi_wrapper.io.tms := io.jtag_tms
+//  dmi_wrapper.io.tdi := io.jtag_tdi
+//  dmi_wrapper.io.core_clk := clock
+//  dmi_wrapper.io.jtag_id := io.jtag_id
+//  dmi_wrapper.io.rd_data := core.io.dmi_reg_rdata
+//  dmi_wrapper.io.core_rst_n := io.dbg_rst_l
+//  core.io.dmi_reg_wdata := dmi_wrapper.io.reg_wr_data
+//  core.io.dmi_reg_addr := dmi_wrapper.io.reg_wr_addr
+//  core.io.dmi_reg_en := dmi_wrapper.io.reg_en
+//  core.io.dmi_reg_wr_en := dmi_wrapper.io.reg_wr_en
+//  core.io.dmi_hard_reset := dmi_wrapper.io.dmi_hard_reset
+//  io.jtag_tdo := dmi_wrapper.io.tdo
+//
+//  // Memory signals
+//  mem.io.dccm_clk_override := core.io.dccm_clk_override
+//  mem.io.icm_clk_override := core.io.icm_clk_override
+//  mem.io.dec_tlu_core_ecc_disable := core.io.dec_tlu_core_ecc_disable
+//  mem.io.dccm <> core.io.dccm
+//  mem.io.rst_l := reset
+//  mem.io.clk := clock
+//  mem.io.scan_mode := io.scan_mode
+//  // Memory outputs
+//  core.io.dbg_rst_l := io.dbg_rst_l
+//  core.io.ic <> mem.io.ic
+//  core.io.iccm <> mem.io.iccm
+//
+//
+//  if(BUILD_AXI4) {
+//    core.io.ifu_ahb <> 0.U.asTypeOf(core.io.ifu_ahb)
+//    core.io.lsu_ahb <> 0.U.asTypeOf(core.io.lsu_ahb)
+//    core.io.sb_ahb  <> 0.U.asTypeOf(core.io.sb_ahb)
+//    core.io.dma_ahb <> 0.U.asTypeOf(core.io.dma_ahb)
+//
+//    core.io.lsu_axi <> io.lsu_brg
+//    core.io.ifu_axi <> io.ifu_brg
+//    core.io.sb_axi  <> io.sb_brg
+//    core.io.dma_axi <> io.dma_brg
+//  }
+//  else {
+//    core.io.ifu_ahb <> io.ifu_brg
+//    core.io.lsu_ahb <> io.lsu_brg
+//    core.io.sb_ahb <> io.sb_brg
+//    core.io.dma_ahb <> io.dma_brg
+//
+//    core.io.lsu_axi <> 0.U.asTypeOf(core.io.lsu_axi)
+//    core.io.ifu_axi <> 0.U.asTypeOf(core.io.ifu_axi)
+//    core.io.sb_axi  <> 0.U.asTypeOf(core.io.sb_axi)
+//    core.io.dma_axi <> 0.U.asTypeOf(core.io.lsu_axi)
+//  }
+//  // core Inputs
+//  core.io.dbg_rst_l := io.dbg_rst_l
+//  core.io.rst_vec := io.rst_vec
+//  core.io.nmi_int := io.nmi_int
+//  core.io.nmi_vec := io.nmi_vec
+//
+//  // external halt/run interface
+//  core.io.i_cpu_halt_req := io.i_cpu_halt_req
+//  core.io.i_cpu_run_req := io.i_cpu_run_req
+//  core.io.core_id := io.core_id
+//
+//  // external MPC halt/run interface
+//  core.io.mpc_debug_halt_req := io.mpc_debug_halt_req
+//  core.io.mpc_debug_run_req := io.mpc_debug_run_req
+//  core.io.mpc_reset_run_req := io.mpc_reset_run_req
+//
+//  core.io.lsu_bus_clk_en := io.lsu_bus_clk_en
+//  core.io.ifu_bus_clk_en := io.ifu_bus_clk_en
+//  core.io.dbg_bus_clk_en := io.dbg_bus_clk_en
+//  core.io.dma_bus_clk_en := io.dma_bus_clk_en
+//
+//  core.io.timer_int := io.timer_int
+//  core.io.soft_int := io.soft_int
+//  core.io.extintsrc_req := io.extintsrc_req
+//
+//  // Outputs
+//  val core_rst_l = core.io.core_rst_l
+//  io.rv_trace_pkt <> core.io.rv_trace_pkt
+//
+//  // external halt/run interface
+//  io.o_cpu_halt_ack := core.io.o_cpu_halt_ack
+//  io.o_cpu_halt_status := core.io.o_cpu_halt_status
+//  io.o_cpu_run_ack := core.io.o_cpu_run_ack
+//  io.o_debug_mode_status := core.io.o_debug_mode_status
+//
+//  io.mpc_debug_halt_ack := core.io.mpc_debug_halt_ack
+//  io.mpc_debug_run_ack := core.io.mpc_debug_run_ack
+//  io.debug_brkpt_status := core.io.debug_brkpt_status
+//
+//  io.dec_tlu_perfcnt0 := core.io.dec_tlu_perfcnt0
+//  io.dec_tlu_perfcnt1 := core.io.dec_tlu_perfcnt1
+//  io.dec_tlu_perfcnt2 := core.io.dec_tlu_perfcnt2
+//  io.dec_tlu_perfcnt3 := core.io.dec_tlu_perfcnt3
+//
+//}
+//object QUASAR_Wrp extends App {
+//  println((new chisel3.stage.ChiselStage).emitVerilog(new quasar_wrapper()))
+//}
\ No newline at end of file
diff --git a/target/scala-2.12/classes/QUASAR_Wrp$delayedInit$body.class b/target/scala-2.12/classes/QUASAR_Wrp$delayedInit$body.class
deleted file mode 100644
index 7e440b8b..00000000
Binary files a/target/scala-2.12/classes/QUASAR_Wrp$delayedInit$body.class and /dev/null differ
diff --git a/target/scala-2.12/classes/QUASAR_Wrp.class b/target/scala-2.12/classes/QUASAR_Wrp.class
deleted file mode 100644
index 994e76a2..00000000
Binary files a/target/scala-2.12/classes/QUASAR_Wrp.class and /dev/null differ
diff --git a/target/scala-2.12/classes/dbg/dbg.class b/target/scala-2.12/classes/dbg/dbg.class
index 81cf2219..9990cacb 100644
Binary files a/target/scala-2.12/classes/dbg/dbg.class and b/target/scala-2.12/classes/dbg/dbg.class differ
diff --git a/target/scala-2.12/classes/dec/CSR_IO.class b/target/scala-2.12/classes/dec/CSR_IO.class
index ee18fa7a..d3ed9c7c 100644
Binary files a/target/scala-2.12/classes/dec/CSR_IO.class and b/target/scala-2.12/classes/dec/CSR_IO.class differ
diff --git a/target/scala-2.12/classes/dec/csr_tlu.class b/target/scala-2.12/classes/dec/csr_tlu.class
index ffbf665f..200c27c2 100644
Binary files a/target/scala-2.12/classes/dec/csr_tlu.class and b/target/scala-2.12/classes/dec/csr_tlu.class differ
diff --git a/target/scala-2.12/classes/dec/dec_IO.class b/target/scala-2.12/classes/dec/dec_IO.class
index 4f2f0ce2..2ee02913 100644
Binary files a/target/scala-2.12/classes/dec/dec_IO.class and b/target/scala-2.12/classes/dec/dec_IO.class differ
diff --git a/target/scala-2.12/classes/dec/dec_dec_ctl.class b/target/scala-2.12/classes/dec/dec_dec_ctl.class
index 356d80d0..18a7e7cc 100644
Binary files a/target/scala-2.12/classes/dec/dec_dec_ctl.class and b/target/scala-2.12/classes/dec/dec_dec_ctl.class differ
diff --git a/target/scala-2.12/classes/dec/dec_decode_ctl.class b/target/scala-2.12/classes/dec/dec_decode_ctl.class
index e354f818..a5236db6 100644
Binary files a/target/scala-2.12/classes/dec/dec_decode_ctl.class and b/target/scala-2.12/classes/dec/dec_decode_ctl.class differ
diff --git a/target/scala-2.12/classes/dec/dec_gpr_ctl.class b/target/scala-2.12/classes/dec/dec_gpr_ctl.class
index ef653f36..3b40082b 100644
Binary files a/target/scala-2.12/classes/dec/dec_gpr_ctl.class and b/target/scala-2.12/classes/dec/dec_gpr_ctl.class differ
diff --git a/target/scala-2.12/classes/dec/dec_timer_ctl.class b/target/scala-2.12/classes/dec/dec_timer_ctl.class
index 15916c2f..17a14a02 100644
Binary files a/target/scala-2.12/classes/dec/dec_timer_ctl.class and b/target/scala-2.12/classes/dec/dec_timer_ctl.class differ
diff --git a/target/scala-2.12/classes/dec/dec_tlu_ctl.class b/target/scala-2.12/classes/dec/dec_tlu_ctl.class
index 6277ae75..f1e280ee 100644
Binary files a/target/scala-2.12/classes/dec/dec_tlu_ctl.class and b/target/scala-2.12/classes/dec/dec_tlu_ctl.class differ
diff --git a/target/scala-2.12/classes/dec/dec_tlu_ctl_IO.class b/target/scala-2.12/classes/dec/dec_tlu_ctl_IO.class
index a08af594..3f0323b4 100644
Binary files a/target/scala-2.12/classes/dec/dec_tlu_ctl_IO.class and b/target/scala-2.12/classes/dec/dec_tlu_ctl_IO.class differ
diff --git a/target/scala-2.12/classes/dec/dec_trigger.class b/target/scala-2.12/classes/dec/dec_trigger.class
index ea41259b..355fe02a 100644
Binary files a/target/scala-2.12/classes/dec/dec_trigger.class and b/target/scala-2.12/classes/dec/dec_trigger.class differ
diff --git a/target/scala-2.12/classes/dma_ctrl.class b/target/scala-2.12/classes/dma_ctrl.class
index b60983e0..19a97c34 100644
Binary files a/target/scala-2.12/classes/dma_ctrl.class and b/target/scala-2.12/classes/dma_ctrl.class differ
diff --git a/target/scala-2.12/classes/exu/exu.class b/target/scala-2.12/classes/exu/exu.class
index 9d627eac..bcff0eda 100644
Binary files a/target/scala-2.12/classes/exu/exu.class and b/target/scala-2.12/classes/exu/exu.class differ
diff --git a/target/scala-2.12/classes/exu/exu_alu_ctl.class b/target/scala-2.12/classes/exu/exu_alu_ctl.class
index 0d73dac6..2c9ec356 100644
Binary files a/target/scala-2.12/classes/exu/exu_alu_ctl.class and b/target/scala-2.12/classes/exu/exu_alu_ctl.class differ
diff --git a/target/scala-2.12/classes/exu/exu_div_ctl.class b/target/scala-2.12/classes/exu/exu_div_ctl.class
index a1dac98a..fa8990c0 100644
Binary files a/target/scala-2.12/classes/exu/exu_div_ctl.class and b/target/scala-2.12/classes/exu/exu_div_ctl.class differ
diff --git a/target/scala-2.12/classes/exu/exu_mul_ctl.class b/target/scala-2.12/classes/exu/exu_mul_ctl.class
index 665936b4..6bc745bc 100644
Binary files a/target/scala-2.12/classes/exu/exu_mul_ctl.class and b/target/scala-2.12/classes/exu/exu_mul_ctl.class differ
diff --git a/target/scala-2.12/classes/ifu/ifu.class b/target/scala-2.12/classes/ifu/ifu.class
index 926bf9b1..08824a67 100644
Binary files a/target/scala-2.12/classes/ifu/ifu.class and b/target/scala-2.12/classes/ifu/ifu.class differ
diff --git a/target/scala-2.12/classes/ifu/ifu_aln_ctl.class b/target/scala-2.12/classes/ifu/ifu_aln_ctl.class
index 4763d183..c908e52b 100644
Binary files a/target/scala-2.12/classes/ifu/ifu_aln_ctl.class and b/target/scala-2.12/classes/ifu/ifu_aln_ctl.class differ
diff --git a/target/scala-2.12/classes/ifu/ifu_bp_ctl.class b/target/scala-2.12/classes/ifu/ifu_bp_ctl.class
index b84c91e6..7566eb75 100644
Binary files a/target/scala-2.12/classes/ifu/ifu_bp_ctl.class and b/target/scala-2.12/classes/ifu/ifu_bp_ctl.class differ
diff --git a/target/scala-2.12/classes/ifu/ifu_compress_ctl.class b/target/scala-2.12/classes/ifu/ifu_compress_ctl.class
index 1d0b1d7c..92b51218 100644
Binary files a/target/scala-2.12/classes/ifu/ifu_compress_ctl.class and b/target/scala-2.12/classes/ifu/ifu_compress_ctl.class differ
diff --git a/target/scala-2.12/classes/ifu/ifu_ifc_ctl.class b/target/scala-2.12/classes/ifu/ifu_ifc_ctl.class
index 0b96d39e..85c1fb1c 100644
Binary files a/target/scala-2.12/classes/ifu/ifu_ifc_ctl.class and b/target/scala-2.12/classes/ifu/ifu_ifc_ctl.class differ
diff --git a/target/scala-2.12/classes/ifu/ifu_mem_ctl.class b/target/scala-2.12/classes/ifu/ifu_mem_ctl.class
index 69675195..c1f2652e 100644
Binary files a/target/scala-2.12/classes/ifu/ifu_mem_ctl.class and b/target/scala-2.12/classes/ifu/ifu_mem_ctl.class differ
diff --git a/target/scala-2.12/classes/ifu/mem_ctl_io.class b/target/scala-2.12/classes/ifu/mem_ctl_io.class
index e944052e..ca523bff 100644
Binary files a/target/scala-2.12/classes/ifu/mem_ctl_io.class and b/target/scala-2.12/classes/ifu/mem_ctl_io.class differ
diff --git a/target/scala-2.12/classes/include/aln_ib.class b/target/scala-2.12/classes/include/aln_ib.class
index 2176c40f..a19d2c77 100644
Binary files a/target/scala-2.12/classes/include/aln_ib.class and b/target/scala-2.12/classes/include/aln_ib.class differ
diff --git a/target/scala-2.12/classes/include/axi_channels.class b/target/scala-2.12/classes/include/axi_channels.class
index 22cbcdde..a904e423 100644
Binary files a/target/scala-2.12/classes/include/axi_channels.class and b/target/scala-2.12/classes/include/axi_channels.class differ
diff --git a/target/scala-2.12/classes/include/dctl_busbuff.class b/target/scala-2.12/classes/include/dctl_busbuff.class
index 6227e042..6a0430d3 100644
Binary files a/target/scala-2.12/classes/include/dctl_busbuff.class and b/target/scala-2.12/classes/include/dctl_busbuff.class differ
diff --git a/target/scala-2.12/classes/include/dec_aln.class b/target/scala-2.12/classes/include/dec_aln.class
index 06c24759..06c9cd7a 100644
Binary files a/target/scala-2.12/classes/include/dec_aln.class and b/target/scala-2.12/classes/include/dec_aln.class differ
diff --git a/target/scala-2.12/classes/include/dec_exu.class b/target/scala-2.12/classes/include/dec_exu.class
index 489431c0..08988ccc 100644
Binary files a/target/scala-2.12/classes/include/dec_exu.class and b/target/scala-2.12/classes/include/dec_exu.class differ
diff --git a/target/scala-2.12/classes/include/dec_mem_ctrl.class b/target/scala-2.12/classes/include/dec_mem_ctrl.class
index 2c5148b0..7d82b37b 100644
Binary files a/target/scala-2.12/classes/include/dec_mem_ctrl.class and b/target/scala-2.12/classes/include/dec_mem_ctrl.class differ
diff --git a/target/scala-2.12/classes/include/decode_exu.class b/target/scala-2.12/classes/include/decode_exu.class
index 8972404a..80b07215 100644
Binary files a/target/scala-2.12/classes/include/decode_exu.class and b/target/scala-2.12/classes/include/decode_exu.class differ
diff --git a/target/scala-2.12/classes/include/exu_bp.class b/target/scala-2.12/classes/include/exu_bp.class
index 36cf5789..7d1bbf78 100644
Binary files a/target/scala-2.12/classes/include/exu_bp.class and b/target/scala-2.12/classes/include/exu_bp.class differ
diff --git a/target/scala-2.12/classes/include/ic_mem.class b/target/scala-2.12/classes/include/ic_mem.class
index be3458ff..f1a97709 100644
Binary files a/target/scala-2.12/classes/include/ic_mem.class and b/target/scala-2.12/classes/include/ic_mem.class differ
diff --git a/target/scala-2.12/classes/include/iccm_mem.class b/target/scala-2.12/classes/include/iccm_mem.class
index 38d8a783..a20ddfcc 100644
Binary files a/target/scala-2.12/classes/include/iccm_mem.class and b/target/scala-2.12/classes/include/iccm_mem.class differ
diff --git a/target/scala-2.12/classes/include/read_addr.class b/target/scala-2.12/classes/include/read_addr.class
index d26a0e9e..5f3a8aff 100644
Binary files a/target/scala-2.12/classes/include/read_addr.class and b/target/scala-2.12/classes/include/read_addr.class differ
diff --git a/target/scala-2.12/classes/include/read_data.class b/target/scala-2.12/classes/include/read_data.class
index 44b20ca1..b8b5137b 100644
Binary files a/target/scala-2.12/classes/include/read_data.class and b/target/scala-2.12/classes/include/read_data.class differ
diff --git a/target/scala-2.12/classes/include/tlu_exu.class b/target/scala-2.12/classes/include/tlu_exu.class
index 1001d7ea..12f97dd8 100644
Binary files a/target/scala-2.12/classes/include/tlu_exu.class and b/target/scala-2.12/classes/include/tlu_exu.class differ
diff --git a/target/scala-2.12/classes/include/write_addr.class b/target/scala-2.12/classes/include/write_addr.class
index 06f6f781..82c8fadb 100644
Binary files a/target/scala-2.12/classes/include/write_addr.class and b/target/scala-2.12/classes/include/write_addr.class differ
diff --git a/target/scala-2.12/classes/include/write_data.class b/target/scala-2.12/classes/include/write_data.class
index b2b6efa9..bbebea33 100644
Binary files a/target/scala-2.12/classes/include/write_data.class and b/target/scala-2.12/classes/include/write_data.class differ
diff --git a/target/scala-2.12/classes/include/write_resp.class b/target/scala-2.12/classes/include/write_resp.class
index 0f6590b5..1e66788e 100644
Binary files a/target/scala-2.12/classes/include/write_resp.class and b/target/scala-2.12/classes/include/write_resp.class differ
diff --git a/target/scala-2.12/classes/lib/ahb_to_axi4.class b/target/scala-2.12/classes/lib/ahb_to_axi4.class
index 6a4e86ac..cf402f80 100644
Binary files a/target/scala-2.12/classes/lib/ahb_to_axi4.class and b/target/scala-2.12/classes/lib/ahb_to_axi4.class differ
diff --git a/target/scala-2.12/classes/lib/axi4_to_ahb.class b/target/scala-2.12/classes/lib/axi4_to_ahb.class
index ead2b4ef..aa866354 100644
Binary files a/target/scala-2.12/classes/lib/axi4_to_ahb.class and b/target/scala-2.12/classes/lib/axi4_to_ahb.class differ
diff --git a/target/scala-2.12/classes/lib/lib$rvclkhdr$.class b/target/scala-2.12/classes/lib/lib$rvclkhdr$.class
index d37ac700..0d0e9b9d 100644
Binary files a/target/scala-2.12/classes/lib/lib$rvclkhdr$.class and b/target/scala-2.12/classes/lib/lib$rvclkhdr$.class differ
diff --git a/target/scala-2.12/classes/lib/lib$rvdffe$.class b/target/scala-2.12/classes/lib/lib$rvdffe$.class
index d8bb588b..52d01199 100644
Binary files a/target/scala-2.12/classes/lib/lib$rvdffe$.class and b/target/scala-2.12/classes/lib/lib$rvdffe$.class differ
diff --git a/target/scala-2.12/classes/lib/lib$rvoclkhdr$.class b/target/scala-2.12/classes/lib/lib$rvoclkhdr$.class
new file mode 100644
index 00000000..07057180
Binary files /dev/null and b/target/scala-2.12/classes/lib/lib$rvoclkhdr$.class differ
diff --git a/target/scala-2.12/classes/lib/lib.class b/target/scala-2.12/classes/lib/lib.class
index a3a88b82..39db3b0a 100644
Binary files a/target/scala-2.12/classes/lib/lib.class and b/target/scala-2.12/classes/lib/lib.class differ
diff --git a/target/scala-2.12/classes/QUASAR_Wrp$.class b/target/scala-2.12/classes/lsu/clkdomain$.class
similarity index 62%
rename from target/scala-2.12/classes/QUASAR_Wrp$.class
rename to target/scala-2.12/classes/lsu/clkdomain$.class
index 301d2c4b..9aa06030 100644
Binary files a/target/scala-2.12/classes/QUASAR_Wrp$.class and b/target/scala-2.12/classes/lsu/clkdomain$.class differ
diff --git a/target/scala-2.12/classes/lsu/clkdomain$delayedInit$body.class b/target/scala-2.12/classes/lsu/clkdomain$delayedInit$body.class
new file mode 100644
index 00000000..050342d8
Binary files /dev/null and b/target/scala-2.12/classes/lsu/clkdomain$delayedInit$body.class differ
diff --git a/target/scala-2.12/classes/lsu/clkdomain.class b/target/scala-2.12/classes/lsu/clkdomain.class
new file mode 100644
index 00000000..78b08045
Binary files /dev/null and b/target/scala-2.12/classes/lsu/clkdomain.class differ
diff --git a/target/scala-2.12/classes/lsu/lsu.class b/target/scala-2.12/classes/lsu/lsu.class
index 2a16cdb0..5bc4acdd 100644
Binary files a/target/scala-2.12/classes/lsu/lsu.class and b/target/scala-2.12/classes/lsu/lsu.class differ
diff --git a/target/scala-2.12/classes/lsu/lsu_addrcheck.class b/target/scala-2.12/classes/lsu/lsu_addrcheck.class
index 098f186f..ffb87996 100644
Binary files a/target/scala-2.12/classes/lsu/lsu_addrcheck.class and b/target/scala-2.12/classes/lsu/lsu_addrcheck.class differ
diff --git a/target/scala-2.12/classes/lsu/lsu_bus_buffer.class b/target/scala-2.12/classes/lsu/lsu_bus_buffer.class
index 7a8a0d3d..43a22d93 100644
Binary files a/target/scala-2.12/classes/lsu/lsu_bus_buffer.class and b/target/scala-2.12/classes/lsu/lsu_bus_buffer.class differ
diff --git a/target/scala-2.12/classes/lsu/lsu_bus_intf.class b/target/scala-2.12/classes/lsu/lsu_bus_intf.class
index 0c169e32..831ca434 100644
Binary files a/target/scala-2.12/classes/lsu/lsu_bus_intf.class and b/target/scala-2.12/classes/lsu/lsu_bus_intf.class differ
diff --git a/target/scala-2.12/classes/lsu/lsu_clkdomain.class b/target/scala-2.12/classes/lsu/lsu_clkdomain.class
index 49063cb4..8759376e 100644
Binary files a/target/scala-2.12/classes/lsu/lsu_clkdomain.class and b/target/scala-2.12/classes/lsu/lsu_clkdomain.class differ
diff --git a/target/scala-2.12/classes/lsu/lsu_dccm_ctl.class b/target/scala-2.12/classes/lsu/lsu_dccm_ctl.class
index e05fbb8c..ba1ebb68 100644
Binary files a/target/scala-2.12/classes/lsu/lsu_dccm_ctl.class and b/target/scala-2.12/classes/lsu/lsu_dccm_ctl.class differ
diff --git a/target/scala-2.12/classes/lsu/lsu_ecc.class b/target/scala-2.12/classes/lsu/lsu_ecc.class
index 76920206..24847d97 100644
Binary files a/target/scala-2.12/classes/lsu/lsu_ecc.class and b/target/scala-2.12/classes/lsu/lsu_ecc.class differ
diff --git a/target/scala-2.12/classes/lsu/lsu_lsc_ctl.class b/target/scala-2.12/classes/lsu/lsu_lsc_ctl.class
index a62f50d8..6fe90eda 100644
Binary files a/target/scala-2.12/classes/lsu/lsu_lsc_ctl.class and b/target/scala-2.12/classes/lsu/lsu_lsc_ctl.class differ
diff --git a/target/scala-2.12/classes/lsu/lsu_stbuf.class b/target/scala-2.12/classes/lsu/lsu_stbuf.class
index 27c5efa0..dd971a24 100644
Binary files a/target/scala-2.12/classes/lsu/lsu_stbuf.class and b/target/scala-2.12/classes/lsu/lsu_stbuf.class differ
diff --git a/target/scala-2.12/classes/lsu/lsu_trigger.class b/target/scala-2.12/classes/lsu/lsu_trigger.class
index add328b2..137c895b 100644
Binary files a/target/scala-2.12/classes/lsu/lsu_trigger.class and b/target/scala-2.12/classes/lsu/lsu_trigger.class differ
diff --git a/target/scala-2.12/classes/mem/Mem_bundle.class b/target/scala-2.12/classes/mem/Mem_bundle.class
index d7748709..e9a8eeb4 100644
Binary files a/target/scala-2.12/classes/mem/Mem_bundle.class and b/target/scala-2.12/classes/mem/Mem_bundle.class differ
diff --git a/target/scala-2.12/classes/mem/blackbox_mem.class b/target/scala-2.12/classes/mem/blackbox_mem.class
index 0565203e..e573d3f5 100644
Binary files a/target/scala-2.12/classes/mem/blackbox_mem.class and b/target/scala-2.12/classes/mem/blackbox_mem.class differ
diff --git a/target/scala-2.12/classes/mem/mem_lsu.class b/target/scala-2.12/classes/mem/mem_lsu.class
index aa67aeb8..b0a51fd6 100644
Binary files a/target/scala-2.12/classes/mem/mem_lsu.class and b/target/scala-2.12/classes/mem/mem_lsu.class differ
diff --git a/target/scala-2.12/classes/mem/quasar$.class b/target/scala-2.12/classes/mem/quasar$.class
index 761c43fc..04617355 100644
Binary files a/target/scala-2.12/classes/mem/quasar$.class and b/target/scala-2.12/classes/mem/quasar$.class differ
diff --git a/target/scala-2.12/classes/mem/quasar.class b/target/scala-2.12/classes/mem/quasar.class
index 55e37210..d41790ef 100644
Binary files a/target/scala-2.12/classes/mem/quasar.class and b/target/scala-2.12/classes/mem/quasar.class differ
diff --git a/target/scala-2.12/classes/pic_ctrl.class b/target/scala-2.12/classes/pic_ctrl.class
index 8f5d4f12..50aedca0 100644
Binary files a/target/scala-2.12/classes/pic_ctrl.class and b/target/scala-2.12/classes/pic_ctrl.class differ
diff --git a/target/scala-2.12/classes/quasar.class b/target/scala-2.12/classes/quasar.class
deleted file mode 100644
index a182e4ac..00000000
Binary files a/target/scala-2.12/classes/quasar.class and /dev/null differ
diff --git a/target/scala-2.12/classes/quasar_bundle$$anon$1.class b/target/scala-2.12/classes/quasar_bundle$$anon$1.class
deleted file mode 100644
index 4003a7ec..00000000
Binary files a/target/scala-2.12/classes/quasar_bundle$$anon$1.class and /dev/null differ
diff --git a/target/scala-2.12/classes/quasar_bundle.class b/target/scala-2.12/classes/quasar_bundle.class
deleted file mode 100644
index 9269e0a3..00000000
Binary files a/target/scala-2.12/classes/quasar_bundle.class and /dev/null differ
diff --git a/target/scala-2.12/classes/quasar_wrapper$$anon$1.class b/target/scala-2.12/classes/quasar_wrapper$$anon$1.class
deleted file mode 100644
index d4b10087..00000000
Binary files a/target/scala-2.12/classes/quasar_wrapper$$anon$1.class and /dev/null differ
diff --git a/target/scala-2.12/classes/quasar_wrapper.class b/target/scala-2.12/classes/quasar_wrapper.class
deleted file mode 100644
index f79edf05..00000000
Binary files a/target/scala-2.12/classes/quasar_wrapper.class and /dev/null differ