zcy
/
tinyriscv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rtl: core: optimization 

Signed-off-by: liangkangnan <liangkangnan@163.com>
pull/1/head
Blue Liang 2020-08-13 09:01:27 +08:00
parent fa958a6153
commit fccb920070
4 changed files with 179 additions and 270 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

346
rtl/core/ex.v
View File

@ -34,6 +34,10 @@ module ex(
input wire[`RegBus] csr_rdata_i, // CSR寄存器输入数据 input wire[`RegBus] csr_rdata_i, // CSR寄存器输入数据
input wire int_assert_i, // 中断发生标志 input wire int_assert_i, // 中断发生标志
input wire[`InstAddrBus] int_addr_i, // 中断跳转地址 input wire[`InstAddrBus] int_addr_i, // 中断跳转地址
input wire[`MemAddrBus] op1_i,
input wire[`MemAddrBus] op2_i,
input wire[`MemAddrBus] op1_jump_i,
input wire[`MemAddrBus] op2_jump_i,
// from mem // from mem
input wire[`MemBus] mem_rdata_i, // 内存输入数据 input wire[`MemBus] mem_rdata_i, // 内存输入数据
@ -76,12 +80,21 @@ module ex(
); );
wire[31:0] sign_extend_tmp;
wire[4:0] shift_bits;
wire[1:0] mem_raddr_index; wire[1:0] mem_raddr_index;
wire[1:0] mem_waddr_index; wire[1:0] mem_waddr_index;
wire[`DoubleRegBus] mul_temp; wire[`DoubleRegBus] mul_temp;
wire[`DoubleRegBus] mul_temp_invert; wire[`DoubleRegBus] mul_temp_invert;
wire[31:0] sr_shift;
wire[31:0] sri_shift;
wire[31:0] sr_shift_mask;
wire[31:0] sri_shift_mask;
wire[31:0] op1_add_op2_res;
wire[31:0] op1_jump_add_op2_jump_res;
wire[31:0] reg1_data_invert;
wire[31:0] reg2_data_invert;
wire op1_ge_op2_signed;
wire op1_ge_op2_unsigned;
wire op1_eq_op2;
reg[`RegBus] mul_op1; reg[`RegBus] mul_op1;
reg[`RegBus] mul_op2; reg[`RegBus] mul_op2;
wire[6:0] opcode; wire[6:0] opcode;
@ -111,14 +124,28 @@ module ex(
assign rd = inst_i[11:7]; assign rd = inst_i[11:7];
assign uimm = inst_i[19:15]; assign uimm = inst_i[19:15];
assign sign_extend_tmp = {{20{inst_i[31]}}, inst_i[31:20]}; assign sr_shift = reg1_rdata_i >> reg2_rdata_i[4:0];
assign shift_bits = inst_i[24:20]; assign sri_shift = reg1_rdata_i >> inst_i[24:20];
assign sr_shift_mask = 32'hffffffff >> reg2_rdata_i[4:0];
assign sri_shift_mask = 32'hffffffff >> inst_i[24:20];
assign op1_add_op2_res = op1_i + op2_i;
assign op1_jump_add_op2_jump_res = op1_jump_i + op2_jump_i;
assign reg1_data_invert = ~reg1_rdata_i + 1;
assign reg2_data_invert = ~reg2_rdata_i + 1;
// 有符号数比较
assign op1_ge_op2_signed = $signed(op1_i) >= $signed(op2_i);
// 无符号数比较
assign op1_ge_op2_unsigned = op1_i >= op2_i;
assign op1_eq_op2 = (op1_i == op2_i);
assign mul_temp = mul_op1 * mul_op2; assign mul_temp = mul_op1 * mul_op2;
assign mul_temp_invert = ~mul_temp + 1; assign mul_temp_invert = ~mul_temp + 1;
assign mem_raddr_index = ((reg1_rdata_i + {{20{inst_i[31]}}, inst_i[31:20]}) - ((reg1_rdata_i + {{20{inst_i[31]}}, inst_i[31:20]}) & 32'hfffffffc)) & 2'b11; assign mem_raddr_index = (reg1_rdata_i + {{20{inst_i[31]}}, inst_i[31:20]}) & 2'b11;
assign mem_waddr_index = ((reg1_rdata_i + {{20{inst_i[31]}}, inst_i[31:25], inst_i[11:7]}) - (reg1_rdata_i + {{20{inst_i[31]}}, inst_i[31:25], inst_i[11:7]} & 32'hfffffffc)) & 2'b11; assign mem_waddr_index = (reg1_rdata_i + {{20{inst_i[31]}}, inst_i[31:25], inst_i[11:7]}) & 2'b11;
assign div_start_o = (int_assert_i == `INT_ASSERT)? `DivStop: div_start; assign div_start_o = (int_assert_i == `INT_ASSERT)? `DivStop: div_start;
@ -155,12 +182,12 @@ module ex(
mul_op2 = reg2_rdata_i; mul_op2 = reg2_rdata_i;
end end
`INST_MULHSU: begin `INST_MULHSU: begin
mul_op1 = (reg1_rdata_i[31] == 1'b1)? (~reg1_rdata_i + 1): reg1_rdata_i; mul_op1 = (reg1_rdata_i[31] == 1'b1)? (reg1_data_invert): reg1_rdata_i;
mul_op2 = reg2_rdata_i; mul_op2 = reg2_rdata_i;
end end
`INST_MULH: begin `INST_MULH: begin
mul_op1 = (reg1_rdata_i[31] == 1'b1)? (~reg1_rdata_i + 1): reg1_rdata_i; mul_op1 = (reg1_rdata_i[31] == 1'b1)? (reg1_data_invert): reg1_rdata_i;
mul_op2 = (reg2_rdata_i[31] == 1'b1)? (~reg2_rdata_i + 1): reg2_rdata_i; mul_op2 = (reg2_rdata_i[31] == 1'b1)? (reg2_data_invert): reg2_rdata_i;
end end
default: begin default: begin
mul_op1 = reg1_rdata_i; mul_op1 = reg1_rdata_i;
@ -202,7 +229,7 @@ module ex(
div_start = `DivStart; div_start = `DivStart;
div_jump_flag = `JumpEnable; div_jump_flag = `JumpEnable;
div_hold_flag = `HoldEnable; div_hold_flag = `HoldEnable;
div_jump_addr = inst_addr_i + 4'h4; div_jump_addr = op1_jump_add_op2_jump_res;
end end
default: begin default: begin
div_start = `DivStop; div_start = `DivStop;
@ -283,7 +310,7 @@ module ex(
mem_raddr_o = `ZeroWord; mem_raddr_o = `ZeroWord;
mem_waddr_o = `ZeroWord; mem_waddr_o = `ZeroWord;
mem_we = `WriteDisable; mem_we = `WriteDisable;
reg_wdata = reg1_rdata_i + {{20{inst_i[31]}}, inst_i[31:20]}; reg_wdata = op1_add_op2_res;
end end
`INST_SLTI: begin `INST_SLTI: begin
jump_flag = `JumpDisable; jump_flag = `JumpDisable;
@ -293,28 +320,7 @@ module ex(
mem_raddr_o = `ZeroWord; mem_raddr_o = `ZeroWord;
mem_waddr_o = `ZeroWord; mem_waddr_o = `ZeroWord;
mem_we = `WriteDisable; mem_we = `WriteDisable;
case ({reg1_rdata_i[31], sign_extend_tmp[31]}) reg_wdata = {32{(~op1_ge_op2_signed)}} & 32'h1;
2'b11: begin
if (reg1_rdata_i < sign_extend_tmp) begin
reg_wdata = 32'h00000001;
end else begin
reg_wdata = 32'h00000000;
end
end
2'b10: begin
reg_wdata = 32'h00000001;
end
2'b01: begin
reg_wdata = 32'h00000000;
end
default: begin
if (reg1_rdata_i < sign_extend_tmp) begin
reg_wdata = 32'h00000001;
end else begin
reg_wdata = 32'h00000000;
end
end
endcase
end end
`INST_SLTIU: begin `INST_SLTIU: begin
jump_flag = `JumpDisable; jump_flag = `JumpDisable;
@ -324,28 +330,7 @@ module ex(
mem_raddr_o = `ZeroWord; mem_raddr_o = `ZeroWord;
mem_waddr_o = `ZeroWord; mem_waddr_o = `ZeroWord;
mem_we = `WriteDisable; mem_we = `WriteDisable;
case ({reg1_rdata_i[31], sign_extend_tmp[31]}) reg_wdata = {32{(~op1_ge_op2_unsigned)}} & 32'h1;
2'b11: begin
if (reg1_rdata_i < sign_extend_tmp) begin
reg_wdata = 32'h00000001;
end else begin
reg_wdata = 32'h00000000;
end
end
2'b10: begin
reg_wdata = 32'h00000000;
end
2'b01: begin
reg_wdata = 32'h00000001;
end
default: begin
if (reg1_rdata_i < sign_extend_tmp) begin
reg_wdata = 32'h00000001;
end else begin
reg_wdata = 32'h00000000;
end
end
endcase
end end
`INST_XORI: begin `INST_XORI: begin
jump_flag = `JumpDisable; jump_flag = `JumpDisable;
@ -355,7 +340,7 @@ module ex(
mem_raddr_o = `ZeroWord; mem_raddr_o = `ZeroWord;
mem_waddr_o = `ZeroWord; mem_waddr_o = `ZeroWord;
mem_we = `WriteDisable; mem_we = `WriteDisable;
reg_wdata = reg1_rdata_i ^ {{20{inst_i[31]}}, inst_i[31:20]}; reg_wdata = op1_i ^ op2_i;
end end
`INST_ORI: begin `INST_ORI: begin
jump_flag = `JumpDisable; jump_flag = `JumpDisable;
@ -365,7 +350,7 @@ module ex(
mem_raddr_o = `ZeroWord; mem_raddr_o = `ZeroWord;
mem_waddr_o = `ZeroWord; mem_waddr_o = `ZeroWord;
mem_we = `WriteDisable; mem_we = `WriteDisable;
reg_wdata = reg1_rdata_i | {{20{inst_i[31]}}, inst_i[31:20]}; reg_wdata = op1_i | op2_i;
end end
`INST_ANDI: begin `INST_ANDI: begin
jump_flag = `JumpDisable; jump_flag = `JumpDisable;
@ -375,7 +360,7 @@ module ex(
mem_raddr_o = `ZeroWord; mem_raddr_o = `ZeroWord;
mem_waddr_o = `ZeroWord; mem_waddr_o = `ZeroWord;
mem_we = `WriteDisable; mem_we = `WriteDisable;
reg_wdata = reg1_rdata_i & {{20{inst_i[31]}}, inst_i[31:20]}; reg_wdata = op1_i & op2_i;
end end
`INST_SLLI: begin `INST_SLLI: begin
jump_flag = `JumpDisable; jump_flag = `JumpDisable;
@ -385,7 +370,7 @@ module ex(
mem_raddr_o = `ZeroWord; mem_raddr_o = `ZeroWord;
mem_waddr_o = `ZeroWord; mem_waddr_o = `ZeroWord;
mem_we = `WriteDisable; mem_we = `WriteDisable;
reg_wdata = reg1_rdata_i << shift_bits; reg_wdata = reg1_rdata_i << inst_i[24:20];
end end
`INST_SRI: begin `INST_SRI: begin
jump_flag = `JumpDisable; jump_flag = `JumpDisable;
@ -396,9 +381,9 @@ module ex(
mem_waddr_o = `ZeroWord; mem_waddr_o = `ZeroWord;
mem_we = `WriteDisable; mem_we = `WriteDisable;
if (inst_i[30] == 1'b1) begin if (inst_i[30] == 1'b1) begin
reg_wdata = ({32{reg1_rdata_i[31]}} << (6'd32 - {1'b0, shift_bits})) | (reg1_rdata_i >> shift_bits); reg_wdata = (sri_shift & sri_shift_mask) | ({32{reg1_rdata_i[31]}} & (~sri_shift_mask));
end else begin end else begin
reg_wdata = reg1_rdata_i >> shift_bits; reg_wdata = reg1_rdata_i >> inst_i[24:20];
end end
end end
default: begin default: begin
@ -425,9 +410,9 @@ module ex(
mem_waddr_o = `ZeroWord; mem_waddr_o = `ZeroWord;
mem_we = `WriteDisable; mem_we = `WriteDisable;
if (inst_i[30] == 1'b0) begin if (inst_i[30] == 1'b0) begin
reg_wdata = reg1_rdata_i + reg2_rdata_i; reg_wdata = op1_add_op2_res;
end else begin end else begin
reg_wdata = reg1_rdata_i - reg2_rdata_i; reg_wdata = op1_i - op2_i;
end end
end end
`INST_SLL: begin `INST_SLL: begin
@ -438,7 +423,7 @@ module ex(
mem_raddr_o = `ZeroWord; mem_raddr_o = `ZeroWord;
mem_waddr_o = `ZeroWord; mem_waddr_o = `ZeroWord;
mem_we = `WriteDisable; mem_we = `WriteDisable;
reg_wdata = reg1_rdata_i << reg2_rdata_i[4:0]; reg_wdata = op1_i << op2_i[4:0];
end end
`INST_SLT: begin `INST_SLT: begin
jump_flag = `JumpDisable; jump_flag = `JumpDisable;
@ -448,28 +433,7 @@ module ex(
mem_raddr_o = `ZeroWord; mem_raddr_o = `ZeroWord;
mem_waddr_o = `ZeroWord; mem_waddr_o = `ZeroWord;
mem_we = `WriteDisable; mem_we = `WriteDisable;
case ({reg1_rdata_i[31], reg2_rdata_i[31]}) reg_wdata = {32{(~op1_ge_op2_signed)}} & 32'h1;
2'b11: begin
if (reg1_rdata_i < reg2_rdata_i) begin
reg_wdata = 32'h00000001;
end else begin
reg_wdata = 32'h00000000;
end
end
2'b10: begin
reg_wdata = 32'h00000001;
end
2'b01: begin
reg_wdata = 32'h00000000;
end
default: begin
if (reg1_rdata_i < reg2_rdata_i) begin
reg_wdata = 32'h00000001;
end else begin
reg_wdata = 32'h00000000;
end
end
endcase
end end
`INST_SLTU: begin `INST_SLTU: begin
jump_flag = `JumpDisable; jump_flag = `JumpDisable;
@ -479,28 +443,7 @@ module ex(
mem_raddr_o = `ZeroWord; mem_raddr_o = `ZeroWord;
mem_waddr_o = `ZeroWord; mem_waddr_o = `ZeroWord;
mem_we = `WriteDisable; mem_we = `WriteDisable;
case ({reg1_rdata_i[31], reg2_rdata_i[31]}) reg_wdata = {32{(~op1_ge_op2_unsigned)}} & 32'h1;
2'b11: begin
if (reg1_rdata_i < reg2_rdata_i) begin
reg_wdata = 32'h00000001;
end else begin
reg_wdata = 32'h00000000;
end
end
2'b10: begin
reg_wdata = 32'h00000000;
end
2'b01: begin
reg_wdata = 32'h00000001;
end
default: begin
if (reg1_rdata_i < reg2_rdata_i) begin
reg_wdata = 32'h00000001;
end else begin
reg_wdata = 32'h00000000;
end
end
endcase
end end
`INST_XOR: begin `INST_XOR: begin
jump_flag = `JumpDisable; jump_flag = `JumpDisable;
@ -510,7 +453,7 @@ module ex(
mem_raddr_o = `ZeroWord; mem_raddr_o = `ZeroWord;
mem_waddr_o = `ZeroWord; mem_waddr_o = `ZeroWord;
mem_we = `WriteDisable; mem_we = `WriteDisable;
reg_wdata = reg1_rdata_i ^ reg2_rdata_i; reg_wdata = op1_i ^ op2_i;
end end
`INST_SR: begin `INST_SR: begin
jump_flag = `JumpDisable; jump_flag = `JumpDisable;
@ -521,7 +464,7 @@ module ex(
mem_waddr_o = `ZeroWord; mem_waddr_o = `ZeroWord;
mem_we = `WriteDisable; mem_we = `WriteDisable;
if (inst_i[30] == 1'b1) begin if (inst_i[30] == 1'b1) begin
reg_wdata = ({32{reg1_rdata_i[31]}} << (6'd32 - {1'b0, reg2_rdata_i[4:0]})) | (reg1_rdata_i >> reg2_rdata_i[4:0]); reg_wdata = (sr_shift & sr_shift_mask) | ({32{reg1_rdata_i[31]}} & (~sr_shift_mask));
end else begin end else begin
reg_wdata = reg1_rdata_i >> reg2_rdata_i[4:0]; reg_wdata = reg1_rdata_i >> reg2_rdata_i[4:0];
end end
@ -534,7 +477,7 @@ module ex(
mem_raddr_o = `ZeroWord; mem_raddr_o = `ZeroWord;
mem_waddr_o = `ZeroWord; mem_waddr_o = `ZeroWord;
mem_we = `WriteDisable; mem_we = `WriteDisable;
reg_wdata = reg1_rdata_i | reg2_rdata_i; reg_wdata = op1_i | op2_i;
end end
`INST_AND: begin `INST_AND: begin
jump_flag = `JumpDisable; jump_flag = `JumpDisable;
@ -544,7 +487,7 @@ module ex(
mem_raddr_o = `ZeroWord; mem_raddr_o = `ZeroWord;
mem_waddr_o = `ZeroWord; mem_waddr_o = `ZeroWord;
mem_we = `WriteDisable; mem_we = `WriteDisable;
reg_wdata = reg1_rdata_i & reg2_rdata_i; reg_wdata = op1_i & op2_i;
end end
default: begin default: begin
jump_flag = `JumpDisable; jump_flag = `JumpDisable;
@ -647,7 +590,8 @@ module ex(
mem_wdata_o = `ZeroWord; mem_wdata_o = `ZeroWord;
mem_waddr_o = `ZeroWord; mem_waddr_o = `ZeroWord;
mem_we = `WriteDisable; mem_we = `WriteDisable;
mem_raddr_o = reg1_rdata_i + {{20{inst_i[31]}}, inst_i[31:20]}; mem_req = `RIB_REQ;
mem_raddr_o = op1_add_op2_res;
case (mem_raddr_index) case (mem_raddr_index)
2'b00: begin 2'b00: begin
reg_wdata = {{24{mem_rdata_i[7]}}, mem_rdata_i[7:0]}; reg_wdata = {{24{mem_rdata_i[7]}}, mem_rdata_i[7:0]};
@ -670,7 +614,8 @@ module ex(
mem_wdata_o = `ZeroWord; mem_wdata_o = `ZeroWord;
mem_waddr_o = `ZeroWord; mem_waddr_o = `ZeroWord;
mem_we = `WriteDisable; mem_we = `WriteDisable;
mem_raddr_o = reg1_rdata_i + {{20{inst_i[31]}}, inst_i[31:20]}; mem_req = `RIB_REQ;
mem_raddr_o = op1_add_op2_res;
if (mem_raddr_index == 2'b0) begin if (mem_raddr_index == 2'b0) begin
reg_wdata = {{16{mem_rdata_i[15]}}, mem_rdata_i[15:0]}; reg_wdata = {{16{mem_rdata_i[15]}}, mem_rdata_i[15:0]};
end else begin end else begin
@ -684,7 +629,8 @@ module ex(
mem_wdata_o = `ZeroWord; mem_wdata_o = `ZeroWord;
mem_waddr_o = `ZeroWord; mem_waddr_o = `ZeroWord;
mem_we = `WriteDisable; mem_we = `WriteDisable;
mem_raddr_o = reg1_rdata_i + {{20{inst_i[31]}}, inst_i[31:20]}; mem_req = `RIB_REQ;
mem_raddr_o = op1_add_op2_res;
reg_wdata = mem_rdata_i; reg_wdata = mem_rdata_i;
end end
`INST_LBU: begin `INST_LBU: begin
@ -694,7 +640,8 @@ module ex(
mem_wdata_o = `ZeroWord; mem_wdata_o = `ZeroWord;
mem_waddr_o = `ZeroWord; mem_waddr_o = `ZeroWord;
mem_we = `WriteDisable; mem_we = `WriteDisable;
mem_raddr_o = reg1_rdata_i + {{20{inst_i[31]}}, inst_i[31:20]}; mem_req = `RIB_REQ;
mem_raddr_o = op1_add_op2_res;
case (mem_raddr_index) case (mem_raddr_index)
2'b00: begin 2'b00: begin
reg_wdata = {24'h0, mem_rdata_i[7:0]}; reg_wdata = {24'h0, mem_rdata_i[7:0]};
@ -717,7 +664,8 @@ module ex(
mem_wdata_o = `ZeroWord; mem_wdata_o = `ZeroWord;
mem_waddr_o = `ZeroWord; mem_waddr_o = `ZeroWord;
mem_we = `WriteDisable; mem_we = `WriteDisable;
mem_raddr_o = reg1_rdata_i + {{20{inst_i[31]}}, inst_i[31:20]}; mem_req = `RIB_REQ;
mem_raddr_o = op1_add_op2_res;
if (mem_raddr_index == 2'b0) begin if (mem_raddr_index == 2'b0) begin
reg_wdata = {16'h0, mem_rdata_i[15:0]}; reg_wdata = {16'h0, mem_rdata_i[15:0]};
end else begin end else begin
@ -745,8 +693,8 @@ module ex(
reg_wdata = `ZeroWord; reg_wdata = `ZeroWord;
mem_we = `WriteEnable; mem_we = `WriteEnable;
mem_req = `RIB_REQ; mem_req = `RIB_REQ;
mem_waddr_o = reg1_rdata_i + {{20{inst_i[31]}}, inst_i[31:25], inst_i[11:7]}; mem_waddr_o = op1_add_op2_res;
mem_raddr_o = reg1_rdata_i + {{20{inst_i[31]}}, inst_i[31:25], inst_i[11:7]}; mem_raddr_o = op1_add_op2_res;
case (mem_waddr_index) case (mem_waddr_index)
2'b00: begin 2'b00: begin
mem_wdata_o = {mem_rdata_i[31:8], reg2_rdata_i[7:0]}; mem_wdata_o = {mem_rdata_i[31:8], reg2_rdata_i[7:0]};
@ -769,8 +717,8 @@ module ex(
reg_wdata = `ZeroWord; reg_wdata = `ZeroWord;
mem_we = `WriteEnable; mem_we = `WriteEnable;
mem_req = `RIB_REQ; mem_req = `RIB_REQ;
mem_waddr_o = reg1_rdata_i + {{20{inst_i[31]}}, inst_i[31:25], inst_i[11:7]}; mem_waddr_o = op1_add_op2_res;
mem_raddr_o = reg1_rdata_i + {{20{inst_i[31]}}, inst_i[31:25], inst_i[11:7]}; mem_raddr_o = op1_add_op2_res;
if (mem_waddr_index == 2'b00) begin if (mem_waddr_index == 2'b00) begin
mem_wdata_o = {mem_rdata_i[31:16], reg2_rdata_i[15:0]}; mem_wdata_o = {mem_rdata_i[31:16], reg2_rdata_i[15:0]};
end else begin end else begin
@ -784,8 +732,8 @@ module ex(
reg_wdata = `ZeroWord; reg_wdata = `ZeroWord;
mem_we = `WriteEnable; mem_we = `WriteEnable;
mem_req = `RIB_REQ; mem_req = `RIB_REQ;
mem_waddr_o = reg1_rdata_i + {{20{inst_i[31]}}, inst_i[31:25], inst_i[11:7]}; mem_waddr_o = op1_add_op2_res;
mem_raddr_o = reg1_rdata_i + {{20{inst_i[31]}}, inst_i[31:25], inst_i[11:7]}; mem_raddr_o = op1_add_op2_res;
mem_wdata_o = reg2_rdata_i; mem_wdata_o = reg2_rdata_i;
end end
default: begin default: begin
@ -809,13 +757,8 @@ module ex(
mem_waddr_o = `ZeroWord; mem_waddr_o = `ZeroWord;
mem_we = `WriteDisable; mem_we = `WriteDisable;
reg_wdata = `ZeroWord; reg_wdata = `ZeroWord;
if (reg1_rdata_i == reg2_rdata_i) begin jump_flag = op1_eq_op2 & `JumpEnable;
jump_flag = `JumpEnable; jump_addr = {32{op1_eq_op2}} & op1_jump_add_op2_jump_res;
jump_addr = inst_addr_i + {{20{inst_i[31]}}, inst_i[7], inst_i[30:25], inst_i[11:8], 1'b0};
end else begin
jump_flag = `JumpDisable;
jump_addr = `ZeroWord;
end
end end
`INST_BNE: begin `INST_BNE: begin
hold_flag = `HoldDisable; hold_flag = `HoldDisable;
@ -824,13 +767,8 @@ module ex(
mem_waddr_o = `ZeroWord; mem_waddr_o = `ZeroWord;
mem_we = `WriteDisable; mem_we = `WriteDisable;
reg_wdata = `ZeroWord; reg_wdata = `ZeroWord;
if (reg1_rdata_i != reg2_rdata_i) begin jump_flag = (~op1_eq_op2) & `JumpEnable;
jump_flag = `JumpEnable; jump_addr = {32{(~op1_eq_op2)}} & op1_jump_add_op2_jump_res;
jump_addr = inst_addr_i + {{20{inst_i[31]}}, inst_i[7], inst_i[30:25], inst_i[11:8], 1'b0};
end else begin
jump_flag = `JumpDisable;
jump_addr = `ZeroWord;
end
end end
`INST_BLT: begin `INST_BLT: begin
hold_flag = `HoldDisable; hold_flag = `HoldDisable;
@ -839,34 +777,8 @@ module ex(
mem_waddr_o = `ZeroWord; mem_waddr_o = `ZeroWord;
mem_we = `WriteDisable; mem_we = `WriteDisable;
reg_wdata = `ZeroWord; reg_wdata = `ZeroWord;
case ({reg1_rdata_i[31], reg2_rdata_i[31]}) jump_flag = (~op1_ge_op2_signed) & `JumpEnable;
2'b10: begin jump_addr = {32{(~op1_ge_op2_signed)}} & op1_jump_add_op2_jump_res;
jump_flag = `JumpEnable;
jump_addr = inst_addr_i + {{20{inst_i[31]}}, inst_i[7], inst_i[30:25], inst_i[11:8], 1'b0};
end
2'b11: begin
if (reg1_rdata_i >= reg2_rdata_i) begin
jump_flag = `JumpDisable;
jump_addr = `ZeroWord;
end else begin
jump_flag = `JumpEnable;
jump_addr = inst_addr_i + {{20{inst_i[31]}}, inst_i[7], inst_i[30:25], inst_i[11:8], 1'b0};
end
end
2'b00: begin
if (reg1_rdata_i >= reg2_rdata_i) begin
jump_flag = `JumpDisable;
jump_addr = `ZeroWord;
end else begin
jump_flag = `JumpEnable;
jump_addr = inst_addr_i + {{20{inst_i[31]}}, inst_i[7], inst_i[30:25], inst_i[11:8], 1'b0};
end
end
default: begin
jump_flag = `JumpDisable;
jump_addr = `ZeroWord;
end
endcase
end end
`INST_BGE: begin `INST_BGE: begin
hold_flag = `HoldDisable; hold_flag = `HoldDisable;
@ -875,34 +787,8 @@ module ex(
mem_waddr_o = `ZeroWord; mem_waddr_o = `ZeroWord;
mem_we = `WriteDisable; mem_we = `WriteDisable;
reg_wdata = `ZeroWord; reg_wdata = `ZeroWord;
case ({reg1_rdata_i[31], reg2_rdata_i[31]}) jump_flag = (op1_ge_op2_signed) & `JumpEnable;
2'b01: begin jump_addr = {32{(op1_ge_op2_signed)}} & op1_jump_add_op2_jump_res;
jump_flag = `JumpEnable;
jump_addr = inst_addr_i + {{20{inst_i[31]}}, inst_i[7], inst_i[30:25], inst_i[11:8], 1'b0};
end
2'b11: begin
if (reg1_rdata_i < reg2_rdata_i) begin
jump_flag = `JumpDisable;
jump_addr = `ZeroWord;
end else begin
jump_flag = `JumpEnable;
jump_addr = inst_addr_i + {{20{inst_i[31]}}, inst_i[7], inst_i[30:25], inst_i[11:8], 1'b0};
end
end
2'b00: begin
if (reg1_rdata_i < reg2_rdata_i) begin
jump_flag = `JumpDisable;
jump_addr = `ZeroWord;
end else begin
jump_flag = `JumpEnable;
jump_addr = inst_addr_i + {{20{inst_i[31]}}, inst_i[7], inst_i[30:25], inst_i[11:8], 1'b0};
end
end
default: begin
jump_flag = `JumpDisable;
jump_addr = `ZeroWord;
end
endcase
end end
`INST_BLTU: begin `INST_BLTU: begin
hold_flag = `HoldDisable; hold_flag = `HoldDisable;
@ -911,34 +797,8 @@ module ex(
mem_waddr_o = `ZeroWord; mem_waddr_o = `ZeroWord;
mem_we = `WriteDisable; mem_we = `WriteDisable;
reg_wdata = `ZeroWord; reg_wdata = `ZeroWord;
case ({reg1_rdata_i[31], reg2_rdata_i[31]}) jump_flag = (~op1_ge_op2_unsigned) & `JumpEnable;
2'b10: begin jump_addr = {32{(~op1_ge_op2_unsigned)}} & op1_jump_add_op2_jump_res;
jump_flag = `JumpDisable;
jump_addr = `ZeroWord;
end
2'b11: begin
if (reg1_rdata_i >= reg2_rdata_i) begin
jump_flag = `JumpDisable;
jump_addr = `ZeroWord;
end else begin
jump_flag = `JumpEnable;
jump_addr = inst_addr_i + {{20{inst_i[31]}}, inst_i[7], inst_i[30:25], inst_i[11:8], 1'b0};
end
end
2'b00: begin
if (reg1_rdata_i >= reg2_rdata_i) begin
jump_flag = `JumpDisable;
jump_addr = `ZeroWord;
end else begin
jump_flag = `JumpEnable;
jump_addr = inst_addr_i + {{20{inst_i[31]}}, inst_i[7], inst_i[30:25], inst_i[11:8], 1'b0};
end
end
default: begin
jump_flag = `JumpEnable;
jump_addr = inst_addr_i + {{20{inst_i[31]}}, inst_i[7], inst_i[30:25], inst_i[11:8], 1'b0};
end
endcase
end end
`INST_BGEU: begin `INST_BGEU: begin
hold_flag = `HoldDisable; hold_flag = `HoldDisable;
@ -947,34 +807,8 @@ module ex(
mem_waddr_o = `ZeroWord; mem_waddr_o = `ZeroWord;
mem_we = `WriteDisable; mem_we = `WriteDisable;
reg_wdata = `ZeroWord; reg_wdata = `ZeroWord;
case ({reg1_rdata_i[31], reg2_rdata_i[31]}) jump_flag = (op1_ge_op2_unsigned) & `JumpEnable;
2'b01: begin jump_addr = {32{(op1_ge_op2_unsigned)}} & op1_jump_add_op2_jump_res;
jump_flag = `JumpDisable;
jump_addr = `ZeroWord;
end
2'b11: begin
if (reg1_rdata_i < reg2_rdata_i) begin
jump_flag = `JumpDisable;
jump_addr = `ZeroWord;
end else begin
jump_flag = `JumpEnable;
jump_addr = inst_addr_i + {{20{inst_i[31]}}, inst_i[7], inst_i[30:25], inst_i[11:8], 1'b0};
end
end
2'b00: begin
if (reg1_rdata_i < reg2_rdata_i) begin
jump_flag = `JumpDisable;
jump_addr = `ZeroWord;
end else begin
jump_flag = `JumpEnable;
jump_addr = inst_addr_i + {{20{inst_i[31]}}, inst_i[7], inst_i[30:25], inst_i[11:8], 1'b0};
end
end
default: begin
jump_flag = `JumpEnable;
jump_addr = inst_addr_i + {{20{inst_i[31]}}, inst_i[7], inst_i[30:25], inst_i[11:8], 1'b0};
end
endcase
end end
default: begin default: begin
jump_flag = `JumpDisable; jump_flag = `JumpDisable;
@ -995,8 +829,8 @@ module ex(
mem_waddr_o = `ZeroWord; mem_waddr_o = `ZeroWord;
mem_we = `WriteDisable; mem_we = `WriteDisable;
jump_flag = `JumpEnable; jump_flag = `JumpEnable;
jump_addr = inst_addr_i + {{12{inst_i[31]}}, inst_i[19:12], inst_i[20], inst_i[30:21], 1'b0}; jump_addr = op1_jump_add_op2_jump_res;
reg_wdata = inst_addr_i + 4'h4; reg_wdata = op1_add_op2_res;
end end
`INST_JALR: begin `INST_JALR: begin
hold_flag = `HoldDisable; hold_flag = `HoldDisable;
@ -1005,8 +839,8 @@ module ex(
mem_waddr_o = `ZeroWord; mem_waddr_o = `ZeroWord;
mem_we = `WriteDisable; mem_we = `WriteDisable;
jump_flag = `JumpEnable; jump_flag = `JumpEnable;
jump_addr = (reg1_rdata_i + {{20{inst_i[31]}}, inst_i[31:20]}) & (32'hfffffffe); jump_addr = op1_jump_add_op2_jump_res;
reg_wdata = inst_addr_i + 4'h4; reg_wdata = op1_add_op2_res;
end end
`INST_LUI: begin `INST_LUI: begin
hold_flag = `HoldDisable; hold_flag = `HoldDisable;
@ -1016,7 +850,7 @@ module ex(
mem_we = `WriteDisable; mem_we = `WriteDisable;
jump_addr = `ZeroWord; jump_addr = `ZeroWord;
jump_flag = `JumpDisable; jump_flag = `JumpDisable;
reg_wdata = {inst_i[31:12], 12'b0}; reg_wdata = op1_add_op2_res;
end end
`INST_AUIPC: begin `INST_AUIPC: begin
hold_flag = `HoldDisable; hold_flag = `HoldDisable;
@ -1026,7 +860,7 @@ module ex(
mem_we = `WriteDisable; mem_we = `WriteDisable;
jump_addr = `ZeroWord; jump_addr = `ZeroWord;
jump_flag = `JumpDisable; jump_flag = `JumpDisable;
reg_wdata = {inst_i[31:12], 12'b0} + inst_addr_i; reg_wdata = op1_add_op2_res;
end end
`INST_NOP_OP: begin `INST_NOP_OP: begin
jump_flag = `JumpDisable; jump_flag = `JumpDisable;
@ -1046,7 +880,7 @@ module ex(
mem_we = `WriteDisable; mem_we = `WriteDisable;
reg_wdata = `ZeroWord; reg_wdata = `ZeroWord;
jump_flag = `JumpEnable; jump_flag = `JumpEnable;
jump_addr = inst_addr_i + 4'h4; jump_addr = op1_jump_add_op2_jump_res;
end end
`INST_CSR: begin `INST_CSR: begin
jump_flag = `JumpDisable; jump_flag = `JumpDisable;

55
rtl/core/id.v
View File

@ -43,9 +43,11 @@ module id(
// to csr reg // to csr reg
output reg[`MemAddrBus] csr_raddr_o, // 读CSR寄存器地址 output reg[`MemAddrBus] csr_raddr_o, // 读CSR寄存器地址
output wire mem_req_o, // 向总线请求访问内存标志
// to ex // to ex
output reg[`MemAddrBus] op1_o,
output reg[`MemAddrBus] op2_o,
output reg[`MemAddrBus] op1_jump_o,
output reg[`MemAddrBus] op2_jump_o,
output reg[`InstBus] inst_o, // 指令内容 output reg[`InstBus] inst_o, // 指令内容
output reg[`InstAddrBus] inst_addr_o, // 指令地址 output reg[`InstAddrBus] inst_addr_o, // 指令地址
output reg[`RegBus] reg1_rdata_o, // 通用寄存器1数据 output reg[`RegBus] reg1_rdata_o, // 通用寄存器1数据
@ -65,11 +67,6 @@ module id(
wire[4:0] rs1 = inst_i[19:15]; wire[4:0] rs1 = inst_i[19:15];
wire[4:0] rs2 = inst_i[24:20]; wire[4:0] rs2 = inst_i[24:20];
reg mem_req;
// 跳转时不向总线请求访问内存
assign mem_req_o = ((mem_req == `RIB_REQ) && (ex_jump_flag_i == `JumpDisable));
always @ (*) begin always @ (*) begin
if (rst == `RstEnable) begin if (rst == `RstEnable) begin
@ -85,17 +82,23 @@ module id(
csr_we_o = `WriteDisable; csr_we_o = `WriteDisable;
reg_waddr_o = `ZeroReg; reg_waddr_o = `ZeroReg;
csr_waddr_o = `ZeroWord; csr_waddr_o = `ZeroWord;
mem_req = `RIB_NREQ; op1_o = `ZeroWord;
op2_o = `ZeroWord;
op1_jump_o = `ZeroWord;
op2_jump_o = `ZeroWord;
end else begin end else begin
inst_o = inst_i; inst_o = inst_i;
inst_addr_o = inst_addr_i; inst_addr_o = inst_addr_i;
reg1_rdata_o = reg1_rdata_i; reg1_rdata_o = reg1_rdata_i;
reg2_rdata_o = reg2_rdata_i; reg2_rdata_o = reg2_rdata_i;
csr_rdata_o = csr_rdata_i; csr_rdata_o = csr_rdata_i;
mem_req = `RIB_NREQ;
csr_raddr_o = `ZeroWord; csr_raddr_o = `ZeroWord;
csr_waddr_o = `ZeroWord; csr_waddr_o = `ZeroWord;
csr_we_o = `WriteDisable; csr_we_o = `WriteDisable;
op1_o = `ZeroWord;
op2_o = `ZeroWord;
op1_jump_o = `ZeroWord;
op2_jump_o = `ZeroWord;
case (opcode) case (opcode)
`INST_TYPE_I: begin `INST_TYPE_I: begin
@ -105,6 +108,8 @@ module id(
reg_waddr_o = rd; reg_waddr_o = rd;
reg1_raddr_o = rs1; reg1_raddr_o = rs1;
reg2_raddr_o = `ZeroReg; reg2_raddr_o = `ZeroReg;
op1_o = reg1_rdata_i;
op2_o = {{20{inst_i[31]}}, inst_i[31:20]};
end end
default: begin default: begin
reg_we_o = `WriteDisable; reg_we_o = `WriteDisable;
@ -122,6 +127,8 @@ module id(
reg_waddr_o = rd; reg_waddr_o = rd;
reg1_raddr_o = rs1; reg1_raddr_o = rs1;
reg2_raddr_o = rs2; reg2_raddr_o = rs2;
op1_o = reg1_rdata_i;
op2_o = reg2_rdata_i;
end end
default: begin default: begin
reg_we_o = `WriteDisable; reg_we_o = `WriteDisable;
@ -137,12 +144,18 @@ module id(
reg_waddr_o = rd; reg_waddr_o = rd;
reg1_raddr_o = rs1; reg1_raddr_o = rs1;
reg2_raddr_o = rs2; reg2_raddr_o = rs2;
op1_o = reg1_rdata_i;
op2_o = reg2_rdata_i;
end end
`INST_DIV, `INST_DIVU, `INST_REM, `INST_REMU: begin `INST_DIV, `INST_DIVU, `INST_REM, `INST_REMU: begin
reg_we_o = `WriteDisable; reg_we_o = `WriteDisable;
reg_waddr_o = rd; reg_waddr_o = rd;
reg1_raddr_o = rs1; reg1_raddr_o = rs1;
reg2_raddr_o = rs2; reg2_raddr_o = rs2;
op1_o = reg1_rdata_i;
op2_o = reg2_rdata_i;
op1_jump_o = inst_addr_i;
op2_jump_o = 32'h4;
end end
default: begin default: begin
reg_we_o = `WriteDisable; reg_we_o = `WriteDisable;
@ -165,7 +178,8 @@ module id(
reg2_raddr_o = `ZeroReg; reg2_raddr_o = `ZeroReg;
reg_we_o = `WriteEnable; reg_we_o = `WriteEnable;
reg_waddr_o = rd; reg_waddr_o = rd;
mem_req = `RIB_REQ; op1_o = reg1_rdata_i;
op2_o = {{20{inst_i[31]}}, inst_i[31:20]};
end end
default: begin default: begin
reg1_raddr_o = `ZeroReg; reg1_raddr_o = `ZeroReg;
@ -182,7 +196,8 @@ module id(
reg2_raddr_o = rs2; reg2_raddr_o = rs2;
reg_we_o = `WriteDisable; reg_we_o = `WriteDisable;
reg_waddr_o = `ZeroReg; reg_waddr_o = `ZeroReg;
mem_req = `RIB_REQ; op1_o = reg1_rdata_i;
op2_o = {{20{inst_i[31]}}, inst_i[31:25], inst_i[11:7]};
end end
default: begin default: begin
reg1_raddr_o = `ZeroReg; reg1_raddr_o = `ZeroReg;
@ -199,6 +214,10 @@ module id(
reg2_raddr_o = rs2; reg2_raddr_o = rs2;
reg_we_o = `WriteDisable; reg_we_o = `WriteDisable;
reg_waddr_o = `ZeroReg; reg_waddr_o = `ZeroReg;
op1_o = reg1_rdata_i;
op2_o = reg2_rdata_i;
op1_jump_o = inst_addr_i;
op2_jump_o = {{20{inst_i[31]}}, inst_i[7], inst_i[30:25], inst_i[11:8], 1'b0};
end end
default: begin default: begin
reg1_raddr_o = `ZeroReg; reg1_raddr_o = `ZeroReg;
@ -213,24 +232,36 @@ module id(
reg_waddr_o = rd; reg_waddr_o = rd;
reg1_raddr_o = `ZeroReg; reg1_raddr_o = `ZeroReg;
reg2_raddr_o = `ZeroReg; reg2_raddr_o = `ZeroReg;
op1_o = inst_addr_i;
op2_o = 32'h4;
op1_jump_o = inst_addr_i;
op2_jump_o = {{12{inst_i[31]}}, inst_i[19:12], inst_i[20], inst_i[30:21], 1'b0};
end end
`INST_JALR: begin `INST_JALR: begin
reg_we_o = `WriteEnable; reg_we_o = `WriteEnable;
reg1_raddr_o = rs1; reg1_raddr_o = rs1;
reg2_raddr_o = `ZeroReg; reg2_raddr_o = `ZeroReg;
reg_waddr_o = rd; reg_waddr_o = rd;
op1_o = inst_addr_i;
op2_o = 32'h4;
op1_jump_o = reg1_rdata_i;
op2_jump_o = {{20{inst_i[31]}}, inst_i[31:20]};
end end
`INST_LUI: begin `INST_LUI: begin
reg_we_o = `WriteEnable; reg_we_o = `WriteEnable;
reg_waddr_o = rd; reg_waddr_o = rd;
reg1_raddr_o = `ZeroReg; reg1_raddr_o = `ZeroReg;
reg2_raddr_o = `ZeroReg; reg2_raddr_o = `ZeroReg;
op1_o = {inst_i[31:12], 12'b0};
op2_o = `ZeroWord;
end end
`INST_AUIPC: begin `INST_AUIPC: begin
reg_we_o = `WriteEnable; reg_we_o = `WriteEnable;
reg_waddr_o = rd; reg_waddr_o = rd;
reg1_raddr_o = `ZeroReg; reg1_raddr_o = `ZeroReg;
reg2_raddr_o = `ZeroReg; reg2_raddr_o = `ZeroReg;
op1_o = inst_addr_i;
op2_o = {inst_i[31:12], 12'b0};
end end
`INST_NOP_OP: begin `INST_NOP_OP: begin
reg_we_o = `WriteDisable; reg_we_o = `WriteDisable;
@ -243,6 +274,8 @@ module id(
reg_waddr_o = `ZeroReg; reg_waddr_o = `ZeroReg;
reg1_raddr_o = `ZeroReg; reg1_raddr_o = `ZeroReg;
reg2_raddr_o = `ZeroReg; reg2_raddr_o = `ZeroReg;
op1_jump_o = inst_addr_i;
op2_jump_o = 32'h4;
end end
`INST_CSR: begin `INST_CSR: begin
reg_we_o = `WriteDisable; reg_we_o = `WriteDisable;

20
rtl/core/id_ex.v
View File

@ -31,9 +31,17 @@ module id_ex(
input wire csr_we_i, // 写CSR寄存器标志 input wire csr_we_i, // 写CSR寄存器标志
input wire[`MemAddrBus] csr_waddr_i, // 写CSR寄存器地址 input wire[`MemAddrBus] csr_waddr_i, // 写CSR寄存器地址
input wire[`RegBus] csr_rdata_i, // CSR寄存器读数据 input wire[`RegBus] csr_rdata_i, // CSR寄存器读数据
input wire[`MemAddrBus] op1_i,
input wire[`MemAddrBus] op2_i,
input wire[`MemAddrBus] op1_jump_i,
input wire[`MemAddrBus] op2_jump_i,
input wire[`Hold_Flag_Bus] hold_flag_i, // 流水线暂停标志 input wire[`Hold_Flag_Bus] hold_flag_i, // 流水线暂停标志
output reg[`MemAddrBus] op1_o,
output reg[`MemAddrBus] op2_o,
output reg[`MemAddrBus] op1_jump_o,
output reg[`MemAddrBus] op2_jump_o,
output reg[`InstBus] inst_o, // 指令内容 output reg[`InstBus] inst_o, // 指令内容
output reg[`InstAddrBus] inst_addr_o, // 指令地址 output reg[`InstAddrBus] inst_addr_o, // 指令地址
output reg reg_we_o, // 写通用寄存器标志 output reg reg_we_o, // 写通用寄存器标志
@ -57,6 +65,10 @@ module id_ex(
csr_we_o <= `WriteDisable; csr_we_o <= `WriteDisable;
csr_waddr_o <= `ZeroWord; csr_waddr_o <= `ZeroWord;
csr_rdata_o <= `ZeroWord; csr_rdata_o <= `ZeroWord;
op1_o <= `ZeroWord;
op2_o <= `ZeroWord;
op1_jump_o <= `ZeroWord;
op2_jump_o <= `ZeroWord;
end else begin end else begin
// 流水线暂停时传递默认值 // 流水线暂停时传递默认值
if (hold_flag_i >= `Hold_Id) begin if (hold_flag_i >= `Hold_Id) begin
@ -69,6 +81,10 @@ module id_ex(
csr_we_o <= `WriteDisable; csr_we_o <= `WriteDisable;
csr_waddr_o <= `ZeroWord; csr_waddr_o <= `ZeroWord;
csr_rdata_o <= `ZeroWord; csr_rdata_o <= `ZeroWord;
op1_o <= `ZeroWord;
op2_o <= `ZeroWord;
op1_jump_o <= `ZeroWord;
op2_jump_o <= `ZeroWord;
end else begin end else begin
inst_o <= inst_i; inst_o <= inst_i;
inst_addr_o <= inst_addr_i; inst_addr_o <= inst_addr_i;
@ -79,6 +95,10 @@ module id_ex(
csr_we_o <= csr_we_i; csr_we_o <= csr_we_i;
csr_waddr_o <= csr_waddr_i; csr_waddr_o <= csr_waddr_i;
csr_rdata_o <= csr_rdata_i; csr_rdata_o <= csr_rdata_i;
op1_o <= op1_i;
op2_o <= op2_i;
op1_jump_o <= op1_jump_i;
op2_jump_o <= op2_jump_i;
end end
end end
end end

28
rtl/core/tinyriscv.v
View File

@ -55,7 +55,6 @@ module tinyriscv(
// id模块输出信号 // id模块输出信号
wire[`RegAddrBus] id_reg1_raddr_o; wire[`RegAddrBus] id_reg1_raddr_o;
wire[`RegAddrBus] id_reg2_raddr_o; wire[`RegAddrBus] id_reg2_raddr_o;
wire id_mem_req_o;
wire[`InstBus] id_inst_o; wire[`InstBus] id_inst_o;
wire[`InstAddrBus] id_inst_addr_o; wire[`InstAddrBus] id_inst_addr_o;
wire[`RegBus] id_reg1_rdata_o; wire[`RegBus] id_reg1_rdata_o;
@ -66,6 +65,10 @@ module tinyriscv(
wire id_csr_we_o; wire id_csr_we_o;
wire[`RegBus] id_csr_rdata_o; wire[`RegBus] id_csr_rdata_o;
wire[`MemAddrBus] id_csr_waddr_o; wire[`MemAddrBus] id_csr_waddr_o;
wire[`MemAddrBus] id_op1_o;
wire[`MemAddrBus] id_op2_o;
wire[`MemAddrBus] id_op1_jump_o;
wire[`MemAddrBus] id_op2_jump_o;
// id_ex模块输出信号 // id_ex模块输出信号
wire[`InstBus] ie_inst_o; wire[`InstBus] ie_inst_o;
@ -77,6 +80,10 @@ module tinyriscv(
wire ie_csr_we_o; wire ie_csr_we_o;
wire[`MemAddrBus] ie_csr_waddr_o; wire[`MemAddrBus] ie_csr_waddr_o;
wire[`RegBus] ie_csr_rdata_o; wire[`RegBus] ie_csr_rdata_o;
wire[`MemAddrBus] ie_op1_o;
wire[`MemAddrBus] ie_op2_o;
wire[`MemAddrBus] ie_op1_jump_o;
wire[`MemAddrBus] ie_op2_jump_o;
// ex模块输出信号 // ex模块输出信号
wire[`MemBus] ex_mem_wdata_o; wire[`MemBus] ex_mem_wdata_o;
@ -135,7 +142,7 @@ module tinyriscv(
assign rib_ex_addr_o = (ex_mem_we_o == `WriteEnable)? ex_mem_waddr_o: ex_mem_raddr_o; assign rib_ex_addr_o = (ex_mem_we_o == `WriteEnable)? ex_mem_waddr_o: ex_mem_raddr_o;
assign rib_ex_data_o = ex_mem_wdata_o; assign rib_ex_data_o = ex_mem_wdata_o;
assign rib_ex_req_o = ex_mem_req_o | id_mem_req_o; assign rib_ex_req_o = ex_mem_req_o;
assign rib_ex_we_o = ex_mem_we_o; assign rib_ex_we_o = ex_mem_we_o;
assign rib_pc_addr_o = pc_pc_o; assign rib_pc_addr_o = pc_pc_o;
@ -226,13 +233,16 @@ module tinyriscv(
.ex_jump_flag_i(ex_jump_flag_o), .ex_jump_flag_i(ex_jump_flag_o),
.reg1_raddr_o(id_reg1_raddr_o), .reg1_raddr_o(id_reg1_raddr_o),
.reg2_raddr_o(id_reg2_raddr_o), .reg2_raddr_o(id_reg2_raddr_o),
.mem_req_o(id_mem_req_o),
.inst_o(id_inst_o), .inst_o(id_inst_o),
.inst_addr_o(id_inst_addr_o), .inst_addr_o(id_inst_addr_o),
.reg1_rdata_o(id_reg1_rdata_o), .reg1_rdata_o(id_reg1_rdata_o),
.reg2_rdata_o(id_reg2_rdata_o), .reg2_rdata_o(id_reg2_rdata_o),
.reg_we_o(id_reg_we_o), .reg_we_o(id_reg_we_o),
.reg_waddr_o(id_reg_waddr_o), .reg_waddr_o(id_reg_waddr_o),
.op1_o(id_op1_o),
.op2_o(id_op2_o),
.op1_jump_o(id_op1_jump_o),
.op2_jump_o(id_op2_jump_o),
.csr_rdata_i(csr_data_o), .csr_rdata_i(csr_data_o),
.csr_raddr_o(id_csr_raddr_o), .csr_raddr_o(id_csr_raddr_o),
.csr_we_o(id_csr_we_o), .csr_we_o(id_csr_we_o),
@ -257,6 +267,14 @@ module tinyriscv(
.reg_waddr_o(ie_reg_waddr_o), .reg_waddr_o(ie_reg_waddr_o),
.reg1_rdata_o(ie_reg1_rdata_o), .reg1_rdata_o(ie_reg1_rdata_o),
.reg2_rdata_o(ie_reg2_rdata_o), .reg2_rdata_o(ie_reg2_rdata_o),
.op1_i(id_op1_o),
.op2_i(id_op2_o),
.op1_jump_i(id_op1_jump_o),
.op2_jump_i(id_op2_jump_o),
.op1_o(ie_op1_o),
.op2_o(ie_op2_o),
.op1_jump_o(ie_op1_jump_o),
.op2_jump_o(ie_op2_jump_o),
.csr_we_i(id_csr_we_o), .csr_we_i(id_csr_we_o),
.csr_waddr_i(id_csr_waddr_o), .csr_waddr_i(id_csr_waddr_o),
.csr_rdata_i(id_csr_rdata_o), .csr_rdata_i(id_csr_rdata_o),
@ -274,6 +292,10 @@ module tinyriscv(
.reg_waddr_i(ie_reg_waddr_o), .reg_waddr_i(ie_reg_waddr_o),
.reg1_rdata_i(ie_reg1_rdata_o), .reg1_rdata_i(ie_reg1_rdata_o),
.reg2_rdata_i(ie_reg2_rdata_o), .reg2_rdata_i(ie_reg2_rdata_o),
.op1_i(ie_op1_o),
.op2_i(ie_op2_o),
.op1_jump_i(ie_op1_jump_o),
.op2_jump_i(ie_op2_jump_o),
.mem_rdata_i(rib_ex_data_i), .mem_rdata_i(rib_ex_data_i),
.mem_wdata_o(ex_mem_wdata_o), .mem_wdata_o(ex_mem_wdata_o),
.mem_raddr_o(ex_mem_raddr_o), .mem_raddr_o(ex_mem_raddr_o),