Split RAM and ROM to 8 banks.

demo/soc.lpf

@@ -26,7 +26,8 @@ LOCATE COMP "jtag_trst_n" SITE "M3";
 IOBUF PORT "jtag_trst_n" IO_TYPE=LVCMOS33;
 FREQUENCY PORT "jtag_trst_n" 25 MHZ;
 
-
-
 LOCATE COMP "jtag_tdo" SITE "M4";
 IOBUF PORT "jtag_tdo" IO_TYPE=LVCMOS33;
+
+LOCATE COMP "clk_o" SITE "A3";
+IOBUF PORT "clk_o" IO_TYPE=LVCMOS33;

soc/ahb_sif.sv

@@ -67,18 +67,38 @@ module axi_slv #(
 
 bit [63:0] memdata;
 
-  wire [MEM_DEPTH-1:0] saraddr = araddr[MEM_DEPTH - 1:0];
+wire [MEM_DEPTH-4:0] saraddr0 = araddr[MEM_DEPTH - 1:3] + (araddr[2:0] > 3'h0 ? 1 : 0);
-  wire [MEM_DEPTH-1:0] sawaddr = awaddr[MEM_DEPTH - 1:0];
+wire [MEM_DEPTH-4:0] saraddr1 = araddr[MEM_DEPTH - 1:3] + (araddr[2:0] > 3'h1 ? 1 : 0);
+wire [MEM_DEPTH-4:0] saraddr2 = araddr[MEM_DEPTH - 1:3] + (araddr[2:0] > 3'h2 ? 1 : 0);
+wire [MEM_DEPTH-4:0] saraddr3 = araddr[MEM_DEPTH - 1:3] + (araddr[2:0] > 3'h3 ? 1 : 0);
+wire [MEM_DEPTH-4:0] saraddr4 = araddr[MEM_DEPTH - 1:3] + (araddr[2:0] > 3'h4 ? 1 : 0);
+wire [MEM_DEPTH-4:0] saraddr5 = araddr[MEM_DEPTH - 1:3] + (araddr[2:0] > 3'h5 ? 1 : 0);
+wire [MEM_DEPTH-4:0] saraddr6 = araddr[MEM_DEPTH - 1:3] + (araddr[2:0] > 3'h6 ? 1 : 0);
+wire [MEM_DEPTH-4:0] saraddr7 = araddr[MEM_DEPTH - 1:3];
+
+wire [7:0] rm0 = mem0[saraddr0];
+wire [7:0] rm1 = mem1[saraddr1];
+wire [7:0] rm2 = mem2[saraddr2];
+wire [7:0] rm3 = mem3[saraddr3];
+wire [7:0] rm4 = mem4[saraddr4];
+wire [7:0] rm5 = mem5[saraddr5];
+wire [7:0] rm6 = mem6[saraddr6];
+wire [7:0] rm7 = mem7[saraddr7];
+
+wire [MEM_DEPTH-4:0] sawaddr0 = awaddr[MEM_DEPTH - 1:3] + (awaddr[2:0] > 0 ? 1 : 0);
+wire [MEM_DEPTH-4:0] sawaddr1 = awaddr[MEM_DEPTH - 1:3] + (awaddr[2:0] > 1 ? 1 : 0);
+wire [MEM_DEPTH-4:0] sawaddr2 = awaddr[MEM_DEPTH - 1:3] + (awaddr[2:0] > 2 ? 1 : 0);
+wire [MEM_DEPTH-4:0] sawaddr3 = awaddr[MEM_DEPTH - 1:3] + (awaddr[2:0] > 3 ? 1 : 0);
+wire [MEM_DEPTH-4:0] sawaddr4 = awaddr[MEM_DEPTH - 1:3] + (awaddr[2:0] > 4 ? 1 : 0);
+wire [MEM_DEPTH-4:0] sawaddr5 = awaddr[MEM_DEPTH - 1:3] + (awaddr[2:0] > 5 ? 1 : 0);
+wire [MEM_DEPTH-4:0] sawaddr6 = awaddr[MEM_DEPTH - 1:3] + (awaddr[2:0] > 6 ? 1 : 0);
+wire [MEM_DEPTH-4:0] sawaddr7 = awaddr[MEM_DEPTH - 1:3];
 
 initial begin
-    mem0[0]= 8'h0;
+  mem0[0] = 8'h63;
-    mem0[1]= 8'h0;
+  mem1[0] = 8'h0;
-    mem0[2]= 8'h0;
+  mem2[0] = 8'h0;
-    mem0[3]= 8'h63;
+  mem3[0] = 8'h0;
-    mem0[5]= 8'h0;
-    mem0[6]= 8'h0;
-    mem0[7]= 8'h0;
-    mem0[8]= 8'h0;
 end
 always @(posedge aclk or negedge rst_l) begin
   if (!rst_l) begin
@@ -95,28 +115,118 @@ module axi_slv #(
 
 always @(negedge aclk) begin
   if (arvalid)
-      memdata <= {
+    case (araddr[2:0])
-        mem7[saraddr + 7],
+      3'h0: begin
-        mem6[saraddr + 6],
+        memdata <= {rm7, rm6, rm5, rm4, rm3, rm2, rm1, rm0};
-        mem5[saraddr + 5],
-        mem4[saraddr + 4],
-        mem3[saraddr + 3],
-        mem2[saraddr + 2],
-        mem1[saraddr + 1],
-        mem0[saraddr]
-      };
-    if (awvalid) begin
-      if (wstrb[7]) mem7[sawaddr + 7] = wdata[63:56];
-      if (wstrb[6]) mem6[sawaddr + 6] = wdata[55:48];
-      if (wstrb[5]) mem5[sawaddr + 5] = wdata[47:40];
-      if (wstrb[4]) mem4[sawaddr + 4] = wdata[39:32];
-      if (wstrb[3]) mem3[sawaddr + 3] = wdata[31:24];
-      if (wstrb[2]) mem2[sawaddr + 2] = wdata[23:16];
-      if (wstrb[1]) mem1[sawaddr + 1] = wdata[15:08];
-      if (wstrb[0]) mem0[sawaddr + 0] = wdata[07:00];
       end
+      3'h1: begin
+        memdata <= {rm0, rm7, rm6, rm5, rm4, rm3, rm2, rm1};
       end
+      3'h2: begin
+        memdata <= {rm1, rm0, rm7, rm6, rm5, rm4, rm3, rm2};
+      end
+      3'h3: begin
+        memdata <= {rm2, rm1, rm0, rm7, rm6, rm5, rm4, rm3};
+      end
+      3'h4: begin
+        memdata <= {rm3, rm2, rm1, rm0, rm7, rm6, rm5, rm4};
+      end
+      3'h5: begin
+        memdata <= {rm4, rm3, rm2, rm1, rm0, rm7, rm6, rm5};
+      end
+      3'h6: begin
+        memdata <= {rm5, rm4, rm3, rm2, rm1, rm0, rm7, rm6};
+      end
+      3'h7: begin
+        memdata <= {rm7, rm6, rm5, rm4, rm3, rm2, rm1, rm0};
+      end
+    endcase
 
+  if (awvalid) begin
+    case (awaddr[2:0])
+      3'h0: begin
+        if (wstrb[7]) mem7[sawaddr7] = wdata[63:56];
+        if (wstrb[6]) mem6[sawaddr6] = wdata[55:48];
+        if (wstrb[5]) mem5[sawaddr5] = wdata[47:40];
+        if (wstrb[4]) mem4[sawaddr4] = wdata[39:32];
+        if (wstrb[3]) mem3[sawaddr3] = wdata[31:24];
+        if (wstrb[2]) mem2[sawaddr2] = wdata[23:16];
+        if (wstrb[1]) mem1[sawaddr1] = wdata[15:08];
+        if (wstrb[0]) mem0[sawaddr0] = wdata[07:00];
+      end
+      3'h1: begin
+        if (wstrb[7]) mem0[sawaddr0] = wdata[63:56];
+        if (wstrb[6]) mem7[sawaddr7] = wdata[55:48];
+        if (wstrb[5]) mem6[sawaddr6] = wdata[47:40];
+        if (wstrb[4]) mem5[sawaddr5] = wdata[39:32];
+        if (wstrb[3]) mem4[sawaddr4] = wdata[31:24];
+        if (wstrb[2]) mem3[sawaddr3] = wdata[23:16];
+        if (wstrb[1]) mem2[sawaddr2] = wdata[15:08];
+        if (wstrb[0]) mem1[sawaddr1] = wdata[07:00];
+      end
+      3'h2: begin
+        if (wstrb[7]) mem1[sawaddr1] = wdata[63:56];
+        if (wstrb[6]) mem0[sawaddr0] = wdata[55:48];
+        if (wstrb[5]) mem7[sawaddr7] = wdata[47:40];
+        if (wstrb[4]) mem6[sawaddr6] = wdata[39:32];
+        if (wstrb[3]) mem5[sawaddr5] = wdata[31:24];
+        if (wstrb[2]) mem4[sawaddr4] = wdata[23:16];
+        if (wstrb[1]) mem3[sawaddr3] = wdata[15:08];
+        if (wstrb[0]) mem2[sawaddr2] = wdata[07:00];
+      end
+      3'h3: begin
+        if (wstrb[7]) mem2[sawaddr2] = wdata[63:56];
+        if (wstrb[6]) mem1[sawaddr1] = wdata[55:48];
+        if (wstrb[5]) mem0[sawaddr0] = wdata[47:40];
+        if (wstrb[4]) mem7[sawaddr7] = wdata[39:32];
+        if (wstrb[3]) mem6[sawaddr6] = wdata[31:24];
+        if (wstrb[2]) mem5[sawaddr5] = wdata[23:16];
+        if (wstrb[1]) mem4[sawaddr4] = wdata[15:08];
+        if (wstrb[0]) mem3[sawaddr3] = wdata[07:00];
+      end
+      3'h4: begin
+        if (wstrb[7]) mem3[sawaddr3] = wdata[63:56];
+        if (wstrb[6]) mem2[sawaddr2] = wdata[55:48];
+        if (wstrb[5]) mem1[sawaddr1] = wdata[47:40];
+        if (wstrb[4]) mem0[sawaddr0] = wdata[39:32];
+        if (wstrb[3]) mem7[sawaddr7] = wdata[31:24];
+        if (wstrb[2]) mem6[sawaddr6] = wdata[23:16];
+        if (wstrb[1]) mem5[sawaddr5] = wdata[15:08];
+        if (wstrb[0]) mem4[sawaddr4] = wdata[07:00];
+      end
+      3'h5: begin
+        if (wstrb[7]) mem4[sawaddr4] = wdata[63:56];
+        if (wstrb[6]) mem3[sawaddr3] = wdata[55:48];
+        if (wstrb[5]) mem2[sawaddr2] = wdata[47:40];
+        if (wstrb[4]) mem1[sawaddr1] = wdata[39:32];
+        if (wstrb[3]) mem0[sawaddr0] = wdata[31:24];
+        if (wstrb[2]) mem7[sawaddr7] = wdata[23:16];
+        if (wstrb[1]) mem6[sawaddr6] = wdata[15:08];
+        if (wstrb[0]) mem5[sawaddr5] = wdata[07:00];
+      end
+      3'h6: begin
+        if (wstrb[7]) mem5[sawaddr5] = wdata[63:56];
+        if (wstrb[6]) mem4[sawaddr4] = wdata[55:48];
+        if (wstrb[5]) mem3[sawaddr3] = wdata[47:40];
+        if (wstrb[4]) mem2[sawaddr2] = wdata[39:32];
+        if (wstrb[3]) mem1[sawaddr1] = wdata[31:24];
+        if (wstrb[2]) mem0[sawaddr0] = wdata[23:16];
+        if (wstrb[1]) mem7[sawaddr7] = wdata[15:08];
+        if (wstrb[0]) mem6[sawaddr6] = wdata[07:00];
+      end
+      3'h7: begin
+        if (wstrb[7]) mem6[sawaddr6] = wdata[63:56];
+        if (wstrb[6]) mem5[sawaddr5] = wdata[55:48];
+        if (wstrb[5]) mem4[sawaddr4] = wdata[47:40];
+        if (wstrb[4]) mem3[sawaddr3] = wdata[39:32];
+        if (wstrb[3]) mem2[sawaddr2] = wdata[31:24];
+        if (wstrb[2]) mem1[sawaddr1] = wdata[23:16];
+        if (wstrb[1]) mem0[sawaddr0] = wdata[15:08];
+        if (wstrb[0]) mem7[sawaddr7] = wdata[07:00];
+      end
+    endcase
+  end
+end
 
 assign arready = 1'b1;
 assign awready = 1'b1;

soc/soc_sim.sv

@@ -61,8 +61,7 @@ module soc_sim (
     $display("\nFinished : minstret = %0d, mcycle = %0d",
              rvsoc.rvtop.core.dec.tlu.csr.minstretl[31:0],
              rvsoc.rvtop.core.dec.tlu.csr.mcyclel[31:0]);
-      $display(
+    $display("See \"exec.log\" for execution trace with register updates..\n");
-          "See \"exec.log\" for execution trace with register updates..\n");
     $display("TEST_PASSED");
     $finish;
   end else if (mailbox_write && WriteData[7:0] == 8'h1) begin
@@ -77,22 +76,19 @@ module soc_sim (
   wb_dest  <= rvsoc.rvtop.core.dec.decode_io_dec_i0_waddr_r;
   wb_data  <= rvsoc.rvtop.core.dec.decode_io_dec_i0_wdata_r;
   if (rvsoc.trace_rv_i_valid_ip) begin
-      $fwrite(tp, "%b,%h,%h,%0h,%0h,3,%b,%h,%h,%b\n", rvsoc.trace_rv_i_valid_ip,
+    $fwrite(tp, "%b,%h,%h,%0h,%0h,3,%b,%h,%h,%b\n", rvsoc.trace_rv_i_valid_ip, 0,
-              0, rvsoc.trace_rv_i_address_ip, 0, rvsoc.trace_rv_i_insn_ip,
+            rvsoc.trace_rv_i_address_ip, 0, rvsoc.trace_rv_i_insn_ip,
-              rvsoc.trace_rv_i_exception_ip, rvsoc.trace_rv_i_ecause_ip,
+            rvsoc.trace_rv_i_exception_ip, rvsoc.trace_rv_i_ecause_ip, rvsoc.trace_rv_i_tval_ip,
-              rvsoc.trace_rv_i_tval_ip, rvsoc.trace_rv_i_interrupt_ip);
+            rvsoc.trace_rv_i_interrupt_ip);
     // Basic trace - no exception register updates
     // #1 0 ee000000 b0201073 c 0b02       00000000
     commit_count++;
-      $fwrite(el, "%10d : %8s 0 %h %h%13s ; %s\n", cycleCnt, $sformatf(
+    $fwrite(
-              "#%0d", commit_count), rvsoc.trace_rv_i_address_ip,
+        el, "%10d : %8s 0 %h %h%13s ; %s\n", cycleCnt, $sformatf("#%0d", commit_count),
-              rvsoc.trace_rv_i_insn_ip, (wb_dest != 0 && wb_valid) ? $sformatf(
+        rvsoc.trace_rv_i_address_ip, rvsoc.trace_rv_i_insn_ip,
-              "%s=%h", abi_reg[wb_dest], wb_data) : "             ", dasm(
+        (wb_dest != 0 && wb_valid) ? $sformatf("%s=%h", abi_reg[wb_dest], wb_data
-              rvsoc.trace_rv_i_insn_ip,
+        ) : "             ", dasm(
-              rvsoc.trace_rv_i_address_ip,
+        rvsoc.trace_rv_i_insn_ip, rvsoc.trace_rv_i_address_ip, wb_dest & {5{wb_valid}}, wb_data));
-              wb_dest & {5{wb_valid}},
-              wb_data
-              ));
   end
   if (rvsoc.rvtop.core.dec.decode_io_dec_nonblock_load_wen)
     $fwrite(el, "%10d : %32s=%h ; nbL\n", cycleCnt,
@@ -109,8 +105,7 @@ module soc_sim (
 always @(posedge core_clk) begin
 
   if (rvsoc.rvtop.core.pic_ctrl_inst.io_lsu_pic_picm_wren == 1) begin
-      $fwrite(pic, "%0d,%0d,%h\t",
+    $fwrite(pic, "%0d,%0d,%h\t", rvsoc.rvtop.core.pic_ctrl_inst.io_lsu_pic_picm_wren,
-              rvsoc.rvtop.core.pic_ctrl_inst.io_lsu_pic_picm_wren,
             rvsoc.rvtop.core.pic_ctrl_inst.io_lsu_pic_picm_wraddr,
             rvsoc.rvtop.core.pic_ctrl_inst.io_lsu_pic_picm_wr_data);
 
@@ -118,8 +113,7 @@ module soc_sim (
     $fwrite(pic, "x\tx\tx\t");
 
   if (rvsoc.rvtop.core.pic_ctrl_inst.io_lsu_pic_picm_rden == 1) begin
-      $fwrite(pic, "%0d,%0d,%h\n",
+    $fwrite(pic, "%0d,%0d,%h\n", rvsoc.rvtop.core.pic_ctrl_inst.io_lsu_pic_picm_rden,
-              rvsoc.rvtop.core.pic_ctrl_inst.io_lsu_pic_picm_rden,
             rvsoc.rvtop.core.pic_ctrl_inst.io_lsu_pic_picm_rdaddr,
             rvsoc.rvtop.core.pic_ctrl_inst.io_lsu_pic_picm_rd_data);
 
@@ -132,10 +126,8 @@ module soc_sim (
 
   if (rvsoc.rvtop.core.lsu.io_dccm_wren == 1) begin
     $fwrite(lsu, "%0h,%0h,%0h,%0h,%0h\t", rvsoc.rvtop.core.lsu.io_dccm_wren,
-              rvsoc.rvtop.core.lsu.io_dccm_wr_addr_hi,
+            rvsoc.rvtop.core.lsu.io_dccm_wr_addr_hi, rvsoc.rvtop.core.lsu.io_dccm_wr_addr_lo,
-              rvsoc.rvtop.core.lsu.io_dccm_wr_addr_lo,
+            rvsoc.rvtop.core.lsu.io_dccm_wr_data_hi, rvsoc.rvtop.core.lsu.io_dccm_wr_data_lo);
-              rvsoc.rvtop.core.lsu.io_dccm_wr_data_hi,
-              rvsoc.rvtop.core.lsu.io_dccm_wr_data_lo);
 
   end
 else if(rvsoc.rvtop.core.lsu.io_dccm_rden == 1 || rvsoc.rvtop.core.lsu.io_lsu_dma_dma_dccm_ctl_dccm_dma_rvalid)
@@ -143,21 +135,17 @@ module soc_sim (
 
   if (rvsoc.rvtop.core.lsu.io_dccm_rden == 1) begin
     $fwrite(lsu, "%0h,%0h,%0h,%0h,%0h\t", rvsoc.rvtop.core.lsu.io_dccm_rden,
-              rvsoc.rvtop.core.lsu.io_dccm_rd_addr_hi,
+            rvsoc.rvtop.core.lsu.io_dccm_rd_addr_hi, rvsoc.rvtop.core.lsu.io_dccm_rd_addr_lo,
-              rvsoc.rvtop.core.lsu.io_dccm_rd_addr_lo,
+            rvsoc.rvtop.core.lsu.io_dccm_rd_data_hi, rvsoc.rvtop.core.lsu.io_dccm_rd_data_lo);
-              rvsoc.rvtop.core.lsu.io_dccm_rd_data_hi,
-              rvsoc.rvtop.core.lsu.io_dccm_rd_data_lo);
 
   end
 else if(rvsoc.rvtop.core.lsu.io_dccm_wren == 1 || rvsoc.rvtop.core.lsu.io_lsu_dma_dma_dccm_ctl_dccm_dma_rvalid)
     $fwrite(lsu, "x\tx\tx\tx\tx\t");
 
   if (rvsoc.rvtop.core.lsu.io_lsu_dma_dma_dccm_ctl_dccm_dma_rvalid == 1) begin
-      $fwrite(lsu, "%0h,%0h\n",
+    $fwrite(lsu, "%0h,%0h\n", rvsoc.rvtop.core.lsu.io_lsu_dma_dma_dccm_ctl_dccm_dma_rvalid,
-              rvsoc.rvtop.core.lsu.io_lsu_dma_dma_dccm_ctl_dccm_dma_rvalid,
             rvsoc.rvtop.core.lsu.io_lsu_dma_dma_dccm_ctl_dccm_dma_rdata);
-    end
+  end else if (rvsoc.rvtop.core.lsu.io_dccm_wren == 1 || rvsoc.rvtop.core.lsu.io_dccm_rden == 1)
-		else if (rvsoc.rvtop.core.lsu.io_dccm_wren == 1 || rvsoc.rvtop.core.lsu.io_dccm_rden== 1)
     $fwrite(lsu, "x\tx\n");
 end
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -176,8 +164,7 @@ module soc_sim (
 
   if (rvsoc.rvtop.core.ifu.io_iccm_wren == 1 && cycleCnt != 0) begin
     $fwrite(ifu, "%0h,%0h,%0h\t", rvsoc.rvtop.core.ifu.io_iccm_wren,
-              rvsoc.rvtop.core.ifu.io_iccm_rw_addr,
+            rvsoc.rvtop.core.ifu.io_iccm_rw_addr, rvsoc.rvtop.core.ifu.io_iccm_wr_data);
-              rvsoc.rvtop.core.ifu.io_iccm_wr_data);
   end
 
 else if((rvsoc.rvtop.core.ifu.aln_ctl_io_dec_aln_aln_ib_ifu_i0_valid == 1 || rvsoc.rvtop.core.ifu.io_iccm_rden==1 || rvsoc.rvtop.core.ifu.io_ic_wr_en !==0 || rvsoc.rvtop.core.ifu.io_ic_rd_en ==1 || rvsoc.rvtop.core.ifu.io_iccm_dma_rvalid == 1) && cycleCnt != 0)
@@ -185,8 +172,7 @@ module soc_sim (
 
   if (rvsoc.rvtop.core.ifu.io_iccm_rden == 1 && cycleCnt != 0) begin
     $fwrite(ifu, "%0h,%0h,%0h\t", rvsoc.rvtop.core.ifu.io_iccm_rden,
-              rvsoc.rvtop.core.ifu.io_iccm_rw_addr,
+            rvsoc.rvtop.core.ifu.io_iccm_rw_addr, rvsoc.rvtop.core.ifu.io_iccm_rd_data_ecc);
-              rvsoc.rvtop.core.ifu.io_iccm_rd_data_ecc);
   end
 
 else if((rvsoc.rvtop.core.ifu.aln_ctl_io_dec_aln_aln_ib_ifu_i0_valid == 1 || rvsoc.rvtop.core.ifu.io_iccm_wren==1 || rvsoc.rvtop.core.ifu.io_ic_wr_en !==0 || rvsoc.rvtop.core.ifu.io_ic_rd_en ==1 || rvsoc.rvtop.core.ifu.io_iccm_dma_rvalid == 1)&& cycleCnt != 0)
@@ -194,8 +180,7 @@ module soc_sim (
 
   if (rvsoc.rvtop.core.ifu.io_ic_wr_en !== 0 && cycleCnt != 0) begin
     $fwrite(ifu, "%0h,%0h,%0h\t", rvsoc.rvtop.core.ifu.io_ic_wr_en,
-              rvsoc.rvtop.core.ifu.io_ic_rw_addr,
+            rvsoc.rvtop.core.ifu.io_ic_rw_addr, rvsoc.rvtop.core.ifu.io_ic_wr_data_0,
-              rvsoc.rvtop.core.ifu.io_ic_wr_data_0,
             rvsoc.rvtop.core.ifu.io_ic_wr_data_1);
   end
 
@@ -204,8 +189,7 @@ module soc_sim (
 
   if (rvsoc.rvtop.core.ifu.io_ic_rd_en == 1 && cycleCnt != 0) begin
     $fwrite(ifu, "%0h,%0h,%0h\t", rvsoc.rvtop.core.ifu.io_ic_rd_en,
-              rvsoc.rvtop.core.ifu.io_ic_rw_addr,
+            rvsoc.rvtop.core.ifu.io_ic_rw_addr, rvsoc.rvtop.core.ifu.io_ic_rd_data);
-              rvsoc.rvtop.core.ifu.io_ic_rd_data);
   end
 
 else if((rvsoc.rvtop.core.ifu.aln_ctl_io_dec_aln_aln_ib_ifu_i0_valid == 1 || rvsoc.rvtop.core.ifu.io_iccm_wren==1 || rvsoc.rvtop.core.ifu.io_iccm_rden ==1 || rvsoc.rvtop.core.ifu.io_ic_wr_en !== 0 ||rvsoc.rvtop.core.ifu.io_iccm_dma_rvalid == 1)&& cycleCnt != 0)
@@ -224,8 +208,7 @@ module soc_sim (
 always @(posedge core_clk) begin
 
   if (rvsoc.rvtop.core.dma_ctrl.io_dma_dbg_cmd_done == 1) begin
-      $fwrite(dec, "%5d,\t%0h,%0h\t", cycleCnt,
+    $fwrite(dec, "%5d,\t%0h,%0h\t", cycleCnt, rvsoc.rvtop.core.dma_ctrl.io_dma_dbg_cmd_done,
-              rvsoc.rvtop.core.dma_ctrl.io_dma_dbg_cmd_done,
             rvsoc.rvtop.core.dec.io_dec_dbg_rddata);
   end
 
@@ -233,12 +216,11 @@ module soc_sim (
     $fwrite(dec, "%5d,\tx\tx\t", cycleCnt);
 
   if (rvsoc.rvtop.core.dec.io_dec_exu_dec_alu_dec_i0_alu_decode_d == 1) begin
-      $fwrite(dec, "%0h,%0h,%0h,%0h,%0h,%0h\t",
+    $fwrite(
+        dec, "%0h,%0h,%0h,%0h,%0h,%0h\t",
         rvsoc.rvtop.core.dec.io_dec_exu_dec_alu_dec_i0_alu_decode_d,
-              rvsoc.rvtop.core.dec.decode_io_decode_exu_dec_i0_rs1_en_d,
+        rvsoc.rvtop.core.dec.decode_io_decode_exu_dec_i0_rs1_en_d, rvsoc.rvtop.core.exu.i0_rs1_d,
-              rvsoc.rvtop.core.exu.i0_rs1_d,
+        rvsoc.rvtop.core.dec.decode_io_decode_exu_dec_i0_rs2_en_d, rvsoc.rvtop.core.exu.i0_rs2_d,
-              rvsoc.rvtop.core.dec.decode_io_decode_exu_dec_i0_rs2_en_d,
-              rvsoc.rvtop.core.exu.i0_rs2_d,
         rvsoc.rvtop.core.exu.io_dec_exu_decode_exu_exu_i0_result_x);
   end
 
@@ -246,8 +228,7 @@ module soc_sim (
     $fwrite(dec, "x\t,x\t,x\t,x\tx\tx\t");
 
   if (rvsoc.rvtop.core.dec.decode_io_dec_csr_wen_r == 1) begin
-      $fwrite(dec, "%0h,%0h,%0h,%0h,%0h\n",
+    $fwrite(dec, "%0h,%0h,%0h,%0h,%0h\n", rvsoc.rvtop.core.dec.decode_io_dec_csr_wen_r,
-              rvsoc.rvtop.core.dec.decode_io_dec_csr_wen_r,
             rvsoc.rvtop.core.dec.decode_io_dec_csr_wraddr_r,
             rvsoc.rvtop.core.dec.decode_io_dec_csr_wrdata_r,
             rvsoc.rvtop.core.dec.decode_io_dec_csr_rdaddr_d,
@@ -263,12 +244,9 @@ module soc_sim (
 always @(posedge core_clk) begin
 
   if (rvsoc.rvtop.core.exu.io_exu_div_wren == 1) begin
-      $fwrite(exu, "%5d,\t%0h,%0h,%0h,%0h,%0h\t", cycleCnt,
+    $fwrite(exu, "%5d,\t%0h,%0h,%0h,%0h,%0h\t", cycleCnt, rvsoc.rvtop.core.exu.io_exu_div_wren,
-              rvsoc.rvtop.core.exu.io_exu_div_wren,
+            rvsoc.rvtop.core.exu.io_exu_div_result, rvsoc.rvtop.core.exu.i_div.io_dividend,
-              rvsoc.rvtop.core.exu.io_exu_div_result,
+            rvsoc.rvtop.core.exu.i_div.io_divisor, rvsoc.rvtop.core.exu.i_div.io_exu_div_result);
-              rvsoc.rvtop.core.exu.i_div.io_dividend,
-              rvsoc.rvtop.core.exu.i_div.io_divisor,
-              rvsoc.rvtop.core.exu.i_div.io_exu_div_result);
   end
 
 else if(rvsoc.rvtop.core.exu.i0_rs1_bypass_en_d == 1 || rvsoc.rvtop.core.exu.i0_rs2_bypass_en_d == 1)
@@ -292,6 +270,7 @@ module soc_sim (
 end
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
+reg [7:0] hex[(1<<rvsoc.imem.MEM_DEPTH)-1:0];
 
 initial begin
   abi_reg[0]  = "zero";
@@ -327,15 +306,38 @@ module soc_sim (
   abi_reg[30] = "t5";
   abi_reg[31] = "t6";
 
-    $readmemh("program.hex", rvsoc.lmem.mem);
+
-    $readmemh("program.hex", rvsoc.imem.mem);
+  $readmemh("program.hex", hex);
+  for (
+      reg [rvsoc.imem.MEM_DEPTH-1:0] i = 0; i < (1 << (rvsoc.imem.MEM_DEPTH - 3)); i++
+  ) begin
+    rvsoc.imem.mem0[i] = hex[(i<<3)+0];
+    rvsoc.imem.mem1[i] = hex[(i<<3)+1];
+    rvsoc.imem.mem2[i] = hex[(i<<3)+2];
+    rvsoc.imem.mem3[i] = hex[(i<<3)+3];
+    rvsoc.imem.mem4[i] = hex[(i<<3)+4];
+    rvsoc.imem.mem5[i] = hex[(i<<3)+5];
+    rvsoc.imem.mem6[i] = hex[(i<<3)+6];
+    rvsoc.imem.mem7[i] = hex[(i<<3)+7];
+  end
+  for (
+      reg [rvsoc.lmem.MEM_DEPTH-1:0] i = 0; i < (1 << (rvsoc.lmem.MEM_DEPTH - 3)); i++
+  ) begin
+    rvsoc.lmem.mem0[i] = hex[(i<<3)+0];
+    rvsoc.lmem.mem1[i] = hex[(i<<3)+1];
+    rvsoc.lmem.mem2[i] = hex[(i<<3)+2];
+    rvsoc.lmem.mem3[i] = hex[(i<<3)+3];
+    rvsoc.lmem.mem4[i] = hex[(i<<3)+4];
+    rvsoc.lmem.mem5[i] = hex[(i<<3)+5];
+    rvsoc.lmem.mem6[i] = hex[(i<<3)+6];
+    rvsoc.lmem.mem7[i] = hex[(i<<3)+7];
+  end
 
   tp  = $fopen("trace_port.csv", "w");
   el  = $fopen("exec.log", "w");
   //////////////////////////////////////////////////////////////////
   pic = $fopen("pic.log", "w");
-    $fwrite(pic,
+  $fwrite(pic, " write enable, write addr , write data ,read enable, read address, read data \n");
-            " write enable, write addr , write data ,read enable, read address, read data \n");
   ///////////////////////////////////////////////////////////////////
   lsu = $fopen("lsu.log", "w");
   $fwrite(lsu,