riscv/rocket-chip
1
0
Fork 0
Code Releases Activity

add dummy mul_rdy signal

Browse Source
This commit is contained in:
Andrew Waterman 2011-12-17 07:30:47 -08:00
parent 96c78829b4
commit bcceb08373
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rocket/src/main/scala/ctrl.scala
View File

@ -56,6 +56,7 @@ class ioCtrlDpath extends Bundle()
val br_ltu = Bool('input); val br_ltu = Bool('input);
val div_rdy = Bool('input); val div_rdy = Bool('input);
val div_result_val = Bool('input); val div_result_val = Bool('input);
val mul_rdy = Bool('input);
val mul_result_val = Bool('input); val mul_result_val = Bool('input);
val ex_waddr = UFix(5,'input); // write addr from execute stage val ex_waddr = UFix(5,'input); // write addr from execute stage
val mem_waddr = UFix(5,'input); // write addr from memory stage val mem_waddr = UFix(5,'input); // write addr from memory stage
@ -628,6 +629,7 @@ class rocketCtrl extends Component
((id_sync === SYNC_D) || (id_sync === SYNC_I)) && !io.dmem.req_rdy || ((id_sync === SYNC_D) || (id_sync === SYNC_I)) && !io.dmem.req_rdy ||
id_console_out_val && !io.console.rdy || id_console_out_val && !io.console.rdy ||
id_div_val.toBool && !io.dpath.div_rdy || id_div_val.toBool && !io.dpath.div_rdy ||
id_mul_val.toBool && !io.dpath.mul_rdy ||
io.dpath.div_result_val || io.dpath.div_result_val ||
io.dpath.mul_result_val io.dpath.mul_result_val
); );

1
rocket/src/main/scala/dpath.scala
View File

@ -289,6 +289,7 @@ class rocketDpath extends Component
mul.io.in0 := ex_reg_rs1; mul.io.in0 := ex_reg_rs1;
mul.io.in1 := ex_reg_rs2; mul.io.in1 := ex_reg_rs2;
io.ctrl.mul_rdy := mul.io.mul_rdy
io.ctrl.mul_result_val := mul.io.result_val; io.ctrl.mul_result_val := mul.io.result_val;
io.ctrl.ex_waddr := ex_reg_waddr; // for load/use hazard detection & bypass control io.ctrl.ex_waddr := ex_reg_waddr; // for load/use hazard detection & bypass control

2
rocket/src/main/scala/multiplier.scala
View File

@ -7,6 +7,7 @@ import Constants._;
class ioMultiplier(width: Int) extends Bundle { class ioMultiplier(width: Int) extends Bundle {
// requests // requests
val mul_val = Bool('input); val mul_val = Bool('input);
val mul_rdy = Bool('output);
val dw = UFix(1, 'input); val dw = UFix(1, 'input);
val mul_fn = UFix(2, 'input); val mul_fn = UFix(2, 'input);
val mul_tag = UFix(5, 'input); val mul_tag = UFix(5, 'input);
@ -61,6 +62,7 @@ class rocketMultiplier extends Component {
val r_result_tag = Reg(Reg(Reg(r_tag))); val r_result_tag = Reg(Reg(Reg(r_tag)));
val r_result_val = Reg(Reg(Reg(r_val))); val r_result_val = Reg(Reg(Reg(r_val)));
io.mul_rdy := Bool(true)
io.result := r_result; io.result := r_result;
io.result_tag := r_result_tag; io.result_tag := r_result_tag;
io.result_val := r_result_val; io.result_val := r_result_val;