This commit is contained in:
Markus Wegmann 2017-01-05 20:15:02 +01:00
parent 08976be32f
commit 0d2fca156e
4 changed files with 8 additions and 8 deletions

View file

@ -165,7 +165,7 @@ module riscv_controller
input logic wb_valid_i, // WB stage is done input logic wb_valid_i, // WB stage is done
// CONFIG_REGION: JUMP_IN_ID // CONFIG_REGION: JUMP_IN_ID
`ifdef JUMP_IN_ID `ifndef JUMP_IN_ID
input logic fetch_valid_i, // intended for jump in EX to see whether it is safe so go back to decode state input logic fetch_valid_i, // intended for jump in EX to see whether it is safe so go back to decode state
`endif `endif

View file

@ -116,7 +116,7 @@ module riscv_id_stage
input logic wb_valid_i, // WB stage is done input logic wb_valid_i, // WB stage is done
// CONFIG_REGION: JUMP_IN_ID // CONFIG_REGION: JUMP_IN_ID
`ifdef JUMP_IN_ID `ifndef JUMP_IN_ID
input logic fetch_valid_i, // intended for jump in EX to see whether it is safe so go back to decode state input logic fetch_valid_i, // intended for jump in EX to see whether it is safe so go back to decode state
`endif `endif
@ -1274,7 +1274,7 @@ module riscv_id_stage
.wb_valid_i ( wb_valid_i ), .wb_valid_i ( wb_valid_i ),
// CONFIG_REGION: JUMP_IN_ID // CONFIG_REGION: JUMP_IN_ID
`ifdef JUMP_IN_ID `ifndef JUMP_IN_ID
.fetch_valid_i ( fetch_valid_i ), .fetch_valid_i ( fetch_valid_i ),
`endif `endif

View file

@ -91,7 +91,7 @@ module riscv_if_stage #(
input logic id_ready_i, input logic id_ready_i,
output logic if_valid_o, output logic if_valid_o,
// CONFIG_REGION: JUMP_IN_ID // CONFIG_REGION: JUMP_IN_ID
`ifdef JUMP_IN_ID `ifndef JUMP_IN_ID
output logic fetch_valid_o, // intended for jump in EX to see whether it is safe so go back to decode state output logic fetch_valid_o, // intended for jump in EX to see whether it is safe so go back to decode state
`endif `endif
// misc signals // misc signals
@ -486,7 +486,7 @@ module riscv_if_stage #(
assign if_valid_o = (~halt_if_i) & if_ready_o; assign if_valid_o = (~halt_if_i) & if_ready_o;
// CONFIG_REGION: JUMP_IN_ID // CONFIG_REGION: JUMP_IN_ID
`ifdef JUMP_IN_ID `ifndef JUMP_IN_ID
assign fetch_valid_o = fetch_valid; assign fetch_valid_o = fetch_valid;
`endif `endif

View file

@ -251,7 +251,7 @@ module riscv_core
logic lsu_ready_wb; logic lsu_ready_wb;
// CONFIG_REGION: JUMP_IN_ID // CONFIG_REGION: JUMP_IN_ID
`ifdef JUMP_IN_ID `ifndef JUMP_IN_ID
logic fetch_valid; logic fetch_valid;
`endif `endif
@ -435,7 +435,7 @@ module riscv_core
.id_ready_i ( id_ready ), .id_ready_i ( id_ready ),
.if_valid_o ( if_valid ), .if_valid_o ( if_valid ),
// CONFIG_REGION: JUMP_IN_ID // CONFIG_REGION: JUMP_IN_ID
`ifdef JUMP_IN_ID `ifndef JUMP_IN_ID
.fetch_valid_o ( fetch_valid ), .fetch_valid_o ( fetch_valid ),
`endif `endif
@ -515,7 +515,7 @@ module riscv_core
.wb_valid_i ( wb_valid ), .wb_valid_i ( wb_valid ),
// CONFIG_REGION: JUMP_IN_ID // CONFIG_REGION: JUMP_IN_ID
`ifdef JUMP_IN_ID `ifndef JUMP_IN_ID
.fetch_valid_i ( fetch_valid ), .fetch_valid_i ( fetch_valid ),
`endif `endif