From 138f2373c743c4dd0a7ee87ea634df4f4cf09067 Mon Sep 17 00:00:00 2001 From: Olof Kindgren Date: Fri, 25 Oct 2019 10:21:09 +0200 Subject: [PATCH 1/2] Fully connect priority_encoder --- rtl/priority_encoder.v | 2 ++ 1 file changed, 2 insertions(+) diff --git a/rtl/priority_encoder.v b/rtl/priority_encoder.v index 73030630..6d7f31b5 100644 --- a/rtl/priority_encoder.v +++ b/rtl/priority_encoder.v @@ -71,6 +71,7 @@ generate priority_encoder_inst1 ( .input_unencoded(input_unencoded[W2-1:0]), .output_valid(valid1), + .output_unencoded(), .output_encoded(out1) ); priority_encoder #( @@ -80,6 +81,7 @@ generate priority_encoder_inst2 ( .input_unencoded({{W1-WIDTH{1'b0}}, input_unencoded[WIDTH-1:W2]}), .output_valid(valid2), + .output_unencoded(), .output_encoded(out2) ); // multiplexer to select part From 22a418e91d60dd8c2015adef7da0bfed67f98217 Mon Sep 17 00:00:00 2001 From: Olof Kindgren Date: Fri, 25 Oct 2019 10:21:45 +0200 Subject: [PATCH 2/2] Fix width mismatches in arbiter --- rtl/arbiter.v | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rtl/arbiter.v b/rtl/arbiter.v index 8b0443fd..3612fc45 100644 --- a/rtl/arbiter.v +++ b/rtl/arbiter.v @@ -97,12 +97,12 @@ always @* begin grant_encoded_next = 0; mask_next = mask_reg; - if (BLOCK == "REQUEST" && grant_reg & request) begin + if (BLOCK == "REQUEST" && |(grant_reg & request)) begin // granted request still asserted; hold it grant_valid_next = grant_valid_reg; grant_next = grant_reg; grant_encoded_next = grant_encoded_reg; - end else if (BLOCK == "ACKNOWLEDGE" && grant_valid && !(grant_reg & acknowledge)) begin + end else if (BLOCK == "ACKNOWLEDGE" && grant_valid && !(|(grant_reg & acknowledge))) begin // granted request not yet acknowledged; hold it grant_valid_next = grant_valid_reg; grant_next = grant_reg;