From bc3ec25107314be3cd816c0b669d82338e892806 Mon Sep 17 00:00:00 2001 From: Richard Qin Date: Sat, 7 Nov 2026 02:59:33 +0800 Subject: checkpoint: preserve current RV64 CPU development state --- rv64cpu/rtl/core/id_ex_reg.sv | 137 ++++++++++++++++++++++++++++++++---------- 1 file changed, 104 insertions(+), 33 deletions(-) (limited to 'rv64cpu/rtl/core/id_ex_reg.sv') diff --git a/rv64cpu/rtl/core/id_ex_reg.sv b/rv64cpu/rtl/core/id_ex_reg.sv index 9375bb4..777cc46 100644 --- a/rv64cpu/rtl/core/id_ex_reg.sv +++ b/rv64cpu/rtl/core/id_ex_reg.sv @@ -34,13 +34,18 @@ module id_ex_reg // Instruction payload input logic [INST_WIDTH-1:0] id_instr, + input logic [2:0] id_instr_len, // Data/Operands input logic [XLEN-1:0] id_pc, input logic [XLEN-1:0] id_rs1_rdata, input logic [XLEN-1:0] id_rs2_rdata, + input logic [XLEN-1:0] id_fs1_rdata, + input logic [XLEN-1:0] id_fs2_rdata, + input logic [XLEN-1:0] id_fs3_rdata, input logic [4:0] id_rs1_addr, input logic [4:0] id_rs2_addr, + input logic [4:0] id_fs3_addr, input logic [XLEN-1:0] id_imm, // Execution Control @@ -56,6 +61,14 @@ module id_ex_reg input logic id_is_load, input logic id_is_store, input logic [2:0] id_mem_size, + input logic id_is_amo, + input amo_op_t id_amo_op, + input logic id_is_fp, + input logic id_fp_reg_write_en, + input logic id_fp_store_data_sel, + input fp_op_t id_fp_op, + input fp_fmt_t id_fp_fmt, + input logic [2:0] id_fp_rm, input logic id_reg_write_en, input logic [4:0] id_rd_addr, input logic [1:0] id_wb_sel, @@ -64,6 +77,8 @@ module id_ex_reg input logic id_is_csr, input logic [2:0] id_csr_op, input logic id_illegal_instr, + input logic id_instr_access_fault, + input logic id_instr_page_fault, input logic id_is_ecall, input logic id_is_ebreak, input logic id_is_mret, @@ -78,13 +93,18 @@ module id_ex_reg // Instruction payload output logic [INST_WIDTH-1:0] ex_instr, + output logic [2:0] ex_instr_len, // Data/Operands output logic [XLEN-1:0] ex_pc, output logic [XLEN-1:0] ex_rs1_rdata, output logic [XLEN-1:0] ex_rs2_rdata, + output logic [XLEN-1:0] ex_fs1_rdata, + output logic [XLEN-1:0] ex_fs2_rdata, + output logic [XLEN-1:0] ex_fs3_rdata, output logic [4:0] ex_rs1_addr, output logic [4:0] ex_rs2_addr, + output logic [4:0] ex_fs3_addr, output logic [XLEN-1:0] ex_imm, // Execution Control @@ -100,6 +120,14 @@ module id_ex_reg output logic ex_is_load, output logic ex_is_store, output logic [2:0] ex_mem_size, + output logic ex_is_amo, + output amo_op_t ex_amo_op, + output logic ex_is_fp, + output logic ex_fp_reg_write_en, + output logic ex_fp_store_data_sel, + output fp_op_t ex_fp_op, + output fp_fmt_t ex_fp_fmt, + output logic [2:0] ex_fp_rm, output logic ex_reg_write_en, output logic [4:0] ex_rd_addr, output logic [1:0] ex_wb_sel, @@ -108,6 +136,8 @@ module id_ex_reg output logic ex_is_csr, output logic [2:0] ex_csr_op, output logic ex_illegal_instr, + output logic ex_instr_access_fault, + output logic ex_instr_page_fault, output logic ex_is_ecall, output logic ex_is_ebreak, output logic ex_is_mret, @@ -121,11 +151,16 @@ module id_ex_reg always_ff @(posedge clk) begin if (rst) begin ex_instr <= '0; + ex_instr_len <= 3'd4; ex_pc <= '0; ex_rs1_rdata <= '0; ex_rs2_rdata <= '0; + ex_fs1_rdata <= '0; + ex_fs2_rdata <= '0; + ex_fs3_rdata <= '0; ex_rs1_addr <= '0; ex_rs2_addr <= '0; + ex_fs3_addr <= '0; ex_imm <= '0; ex_alu_op <= ALU_ADD; // NOP is effectively ADD x0, x0, 0 ex_alu_src1_sel <= '0; @@ -137,22 +172,33 @@ module id_ex_reg ex_is_load <= '0; ex_is_store <= '0; ex_mem_size <= '0; + ex_is_amo <= '0; + ex_amo_op <= AMO_NONE; + ex_is_fp <= '0; + ex_fp_reg_write_en <= '0; + ex_fp_store_data_sel <= '0; + ex_fp_op <= FP_OP_NONE; + ex_fp_fmt <= FP_FMT_S; + ex_fp_rm <= '0; ex_reg_write_en <= '0; // VERY IMPORTANT: Do not write to regfile on NOP ex_rd_addr <= '0; ex_wb_sel <= '0; - ex_is_csr <= '0; - ex_csr_op <= '0; - ex_illegal_instr <= '0; - ex_is_ecall <= '0; - ex_is_ebreak <= '0; - ex_is_mret <= '0; - ex_is_sret <= '0; - ex_is_wfi <= '0; - ex_is_sfence_vma <= '0; - ex_is_fence <= '0; - ex_is_fence_i <= '0; + ex_is_csr <= '0; + ex_csr_op <= '0; + ex_illegal_instr <= '0; + ex_instr_access_fault <= '0; + ex_instr_page_fault <= '0; + ex_is_ecall <= '0; + ex_is_ebreak <= '0; + ex_is_mret <= '0; + ex_is_sret <= '0; + ex_is_wfi <= '0; + ex_is_sfence_vma <= '0; + ex_is_fence <= '0; + ex_is_fence_i <= '0; end else if (flush_en) begin ex_instr <= '0; + ex_instr_len <= 3'd4; ex_alu_op <= ALU_ADD; // NOP is effectively ADD x0, x0, 0 ex_alu_src1_sel <= '0; ex_alu_src2_sel <= '0; @@ -163,27 +209,42 @@ module id_ex_reg ex_is_load <= '0; ex_is_store <= '0; ex_mem_size <= '0; + ex_is_amo <= '0; + ex_amo_op <= AMO_NONE; + ex_is_fp <= '0; + ex_fp_reg_write_en <= '0; + ex_fp_store_data_sel <= '0; + ex_fp_op <= FP_OP_NONE; + ex_fp_fmt <= FP_FMT_S; + ex_fp_rm <= '0; ex_reg_write_en <= '0; // VERY IMPORTANT: Do not write to regfile on NOP ex_rd_addr <= '0; ex_wb_sel <= '0; - ex_is_csr <= '0; - ex_csr_op <= '0; - ex_illegal_instr <= '0; - ex_is_ecall <= '0; - ex_is_ebreak <= '0; - ex_is_mret <= '0; - ex_is_sret <= '0; - ex_is_wfi <= '0; - ex_is_sfence_vma <= '0; - ex_is_fence <= '0; - ex_is_fence_i <= '0; + ex_is_csr <= '0; + ex_csr_op <= '0; + ex_illegal_instr <= '0; + ex_instr_access_fault <= '0; + ex_instr_page_fault <= '0; + ex_is_ecall <= '0; + ex_is_ebreak <= '0; + ex_is_mret <= '0; + ex_is_sret <= '0; + ex_is_wfi <= '0; + ex_is_sfence_vma <= '0; + ex_is_fence <= '0; + ex_is_fence_i <= '0; end else if (~stall_en) begin ex_instr <= id_instr; + ex_instr_len <= id_instr_len; ex_pc <= id_pc; ex_rs1_rdata <= id_rs1_rdata; ex_rs2_rdata <= id_rs2_rdata; + ex_fs1_rdata <= id_fs1_rdata; + ex_fs2_rdata <= id_fs2_rdata; + ex_fs3_rdata <= id_fs3_rdata; ex_rs1_addr <= id_rs1_addr; ex_rs2_addr <= id_rs2_addr; + ex_fs3_addr <= id_fs3_addr; ex_imm <= id_imm; ex_alu_op <= id_alu_op; ex_alu_src1_sel <= id_alu_src1_sel; @@ -195,20 +256,30 @@ module id_ex_reg ex_is_load <= id_is_load; ex_is_store <= id_is_store; ex_mem_size <= id_mem_size; + ex_is_amo <= id_is_amo; + ex_amo_op <= id_amo_op; + ex_is_fp <= id_is_fp; + ex_fp_reg_write_en <= id_fp_reg_write_en; + ex_fp_store_data_sel <= id_fp_store_data_sel; + ex_fp_op <= id_fp_op; + ex_fp_fmt <= id_fp_fmt; + ex_fp_rm <= id_fp_rm; ex_reg_write_en <= id_reg_write_en; ex_rd_addr <= id_rd_addr; ex_wb_sel <= id_wb_sel; - ex_is_csr <= id_is_csr; - ex_csr_op <= id_csr_op; - ex_illegal_instr <= id_illegal_instr; - ex_is_ecall <= id_is_ecall; - ex_is_ebreak <= id_is_ebreak; - ex_is_mret <= id_is_mret; - ex_is_sret <= id_is_sret; - ex_is_wfi <= id_is_wfi; - ex_is_sfence_vma <= id_is_sfence_vma; - ex_is_fence <= id_is_fence; - ex_is_fence_i <= id_is_fence_i; + ex_is_csr <= id_is_csr; + ex_csr_op <= id_csr_op; + ex_illegal_instr <= id_illegal_instr; + ex_instr_access_fault <= id_instr_access_fault; + ex_instr_page_fault <= id_instr_page_fault; + ex_is_ecall <= id_is_ecall; + ex_is_ebreak <= id_is_ebreak; + ex_is_mret <= id_is_mret; + ex_is_sret <= id_is_sret; + ex_is_wfi <= id_is_wfi; + ex_is_sfence_vma <= id_is_sfence_vma; + ex_is_fence <= id_is_fence; + ex_is_fence_i <= id_is_fence_i; end // If stall_en && !flush_en, maintain current state end -- cgit v1.2.3