Revert "test improve"

This reverts commit 3d97345460.
This commit is contained in:
Paul Pan 2021-08-02 22:24:59 +08:00
parent 3d97345460
commit 648adced91
2 changed files with 3 additions and 4 deletions

View File

@ -33,7 +33,7 @@ module CP0 (
always_ff @(posedge clk) always_ff @(posedge clk)
if (rst) begin if (rst) begin
rf_cp0 = {504'b0, 8'b10000011, 105'b0, 1'b1, 117'b0, 1'b1, 288'b0}; rf_cp0 = {504'b0, 8'b10000010, 105'b0, 1'b1, 117'b0, 1'b1, 288'b0};
count_lo = 0; count_lo = 0;
end else begin end else begin
// count // count

View File

@ -221,8 +221,8 @@ module Datapath (
assign PF_pcp8 = {F.pc[31:3] + 1'b1, 3'b0}; assign PF_pcp8 = {F.pc[31:3] + 1'b1, 3'b0};
assign PF_pcb = {D.IB_pc[31:2] + {{14{D.IA_inst[15]}}, D.IA_inst[15:0]}, 2'b0}; assign PF_pcb = {D.IB_pc[31:2] + {{14{D.IA_inst[15]}}, D.IA_inst[15:0]}, 2'b0};
assign PF_pcjr = D_IA_ForwardS;
assign PF_pcj = {D.IB_pc[31:28], D.IA_inst[25:0], 2'b0}; assign PF_pcj = {D.IB_pc[31:28], D.IA_inst[25:0], 2'b0};
assign PF_pcjr = D_IA_ForwardS;
mux4 #(32) PF_pc0_mux ( mux4 #(32) PF_pc0_mux (
PF_pcp8, PF_pcp8,
PF_pcb, PF_pcb,
@ -244,8 +244,7 @@ module Datapath (
assign rstD = D_IA_valid & D.IA.BJRJ & D.IA.PCS != PCP8 & D_IB_valid & D_readygo; assign rstD = D_IA_valid & D.IA.BJRJ & D.IA.PCS != PCP8 & D_IB_valid & D_readygo;
assign rstM = C0_exception.ExcValid; assign rstM = C0_exception.ExcValid;
assign PF_go = ~D.IA_ExcValid & ~D.IB_ExcValid & ~E_I0_PrevExcValid & ~E_I1_PrevExcValid assign PF_go = ~D.IA_ExcValid & ~D.IB_ExcValid & ~E.I0.ExcValid & ~E.I1.ExcValid & PF.pc[1:0] == 2'b00;
& (~D_IB_valid | ~D.IA.BJRJ | D.IA.PCS != JR | PF_pcjr[1:0] == 2'b00);
assign fetch_i.req = ~F_valid | M_exception.ExcValid assign fetch_i.req = ~F_valid | M_exception.ExcValid
| PF_go & (~D_IB_valid & ~IQ_valids[0] | (~D.IA.BJRJ | D_readygo) | PF_go & (~D_IB_valid & ~IQ_valids[0] | (~D.IA.BJRJ | D_readygo)
& (rstD & (rstD