Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Code cleanup #52

Merged
merged 2 commits into from
Oct 17, 2024
Merged

Code cleanup #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ba89d95
cheri_ex_err_info flop signals weren't used
marnovandermaas Oct 15, 2024
df72504
PVIO needs 3 bit indexes not 4
marnovandermaas Oct 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions rtl/cheri_ex.sv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,6 @@ module cheri_ex import cheri_pkg::*; #(

full_cap_t setaddr1_outcap, setbounds_outcap;
logic [15:0] cheri_wb_err_info_q, cheri_wb_err_info_d;
logic [11:0] cheri_ex_err_info_q, cheri_ex_err_info_d;
logic set_bounds_done;

logic [4:0] cheri_err_cause, rv32_err_cause;
Expand Down Expand Up @@ -1015,7 +1014,6 @@ module cheri_ex import cheri_pkg::*; #(
if (!rst_ni) begin
cheri_wb_err_q <= 1'b0;
cheri_wb_err_info_q <= 'h0;
cheri_ex_err_info_q <= 'h0;
end else begin
// Simple flop here works since
// -- cheri_wb_err is gated by cheri_exec_id/ex_valid
Expand All @@ -1024,7 +1022,6 @@ module cheri_ex import cheri_pkg::*; #(
// -- faulted non-load/store instruction can only stay 1 cycle in wb_stage
cheri_wb_err_q <= cheri_wb_err_d;
cheri_wb_err_info_q <= cheri_wb_err_info_d;
cheri_ex_err_info_q <= cheri_ex_err_info_d;
end
end

Expand Down
16 changes: 8 additions & 8 deletions rtl/cheri_pkg.sv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -858,14 +858,14 @@ $display("--- set_bounds: b1 = %x, t1 = %x, b2 = %x, t2 = %x", base1, top1, bas
// permission violations
parameter int unsigned W_PVIO = 8;

parameter logic [3:0] PVIO_TAG = 4'h0;
parameter logic [3:0] PVIO_SEAL = 4'h1;
parameter logic [3:0] PVIO_EX = 4'h2;
parameter logic [3:0] PVIO_LD = 4'h3;
parameter logic [3:0] PVIO_SD = 4'h4;
parameter logic [3:0] PVIO_SC = 4'h5;
parameter logic [3:0] PVIO_ASR = 4'h6;
parameter logic [3:0] PVIO_ALIGN = 4'h7;
parameter logic [2:0] PVIO_TAG = 3'h0;
parameter logic [2:0] PVIO_SEAL = 3'h1;
parameter logic [2:0] PVIO_EX = 3'h2;
parameter logic [2:0] PVIO_LD = 3'h3;
parameter logic [2:0] PVIO_SD = 3'h4;
parameter logic [2:0] PVIO_SC = 3'h5;
parameter logic [2:0] PVIO_ASR = 3'h6;
parameter logic [2:0] PVIO_ALIGN = 3'h7;


function automatic logic [4:0] vio_cause_enc (logic bound_vio, logic[W_PVIO-1:0] perm_vio_vec);
Expand Down
Loading