Skip to content

[rtl] Remove ztop related dead code #2504

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

Merged
SamuelRiedel merged 1 commit into from
Sep 17, 2026
+4 −17
Merged

[rtl] Remove ztop related dead code #2504

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 4 additions & 13 deletions rtl/ibex_cheriot_ex.sv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,9 +112,6 @@ module ibex_cheriot_ex import ibex_cheriot_pkg::*; import ibex_pkg::*; #(
output logic csr_mshwm_set_o,
output logic [31:0] csr_mshwm_new_o,

input logic [31:0] ztop_rdata_i,
input cap_t ztop_rcap_i,

// debug feature
input logic csr_dbg_tclr_fault_i
);
Expand Down Expand Up @@ -181,7 +178,7 @@ module ibex_cheriot_ex import ibex_cheriot_pkg::*; import ibex_pkg::*; #(
perms_t pmask;
logic clr_sealed;
logic instr_fault;
logic is_write, is_ztop;
logic is_write;
cap_t trcap;
logic [2:0] seal_type;
logic [31:0] tmp32a, tmp32b;
Expand Down Expand Up @@ -461,13 +458,12 @@ module ibex_cheriot_ex import ibex_cheriot_pkg::*; import ibex_pkg::*; #(
end
cheriot_operator_i.CCSR_RW: // cd <-- scr; scr <-- cs1 if cs1 != C0
begin
is_ztop = (cheriot_cs2_dec_i == CHERIOT_SCR_ZTOPC);
is_write = (rf_raddr_a_i != 0);
instr_fault = perm_vio | illegal_scr_addr;

csr_access_o = ~instr_fault;
csr_op_o = CHERIOT_CSR_RW;
csr_op_en_raw = ~instr_fault && is_write && ~is_ztop;
csr_op_en_raw = ~instr_fault && is_write;
csr_addr_o = cheriot_cs2_dec_i;

if (cheriot_cs2_dec_i == CHERIOT_SCR_MTCC) begin
Expand Down Expand Up @@ -504,13 +500,8 @@ module ibex_cheriot_ex import ibex_cheriot_pkg::*; import ibex_pkg::*; #(
csr_wcap_o = rf_rcap_a;
end

if (is_ztop) begin
result_data_o = ztop_rdata_i;
result_cap_o = ztop_rcap_i;
end else begin
result_data_o = csr_rdata_i;
result_cap_o = csr_rcap_i;
end
result_data_o = csr_rdata_i;
result_cap_o = csr_rcap_i;
cheriot_rf_we_raw = ~instr_fault;
cheriot_ex_valid_raw = 1'b1;
cheriot_wb_err_raw = instr_fault;
Expand Down
1 change: 0 additions & 1 deletion rtl/ibex_cheriot_pkg.sv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -915,7 +915,6 @@ package ibex_cheriot_pkg;
parameter logic [4:0] CHERIOT_SCR_MSCRATCHC = 5'h1e;
parameter logic [4:0] CHERIOT_SCR_MTDC = 5'h1d;
parameter logic [4:0] CHERIOT_SCR_MTCC = 5'h1c;
parameter logic [4:0] CHERIOT_SCR_ZTOPC = 5'h1b;
parameter logic [4:0] CHERIOT_SCR_DSCRATCHC1 = 5'h1a;
parameter logic [4:0] CHERIOT_SCR_DSCRATCHC0 = 5'h19;
parameter logic [4:0] CHERIOT_SCR_DEPCC = 5'h18;
Expand Down
2 changes: 0 additions & 2 deletions rtl/ibex_core.sv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -992,8 +992,6 @@ module ibex_core import ibex_pkg::*; import ibex_cheriot_pkg::*; #(
.csr_mshwmb_i (csr_mshwmb),
.csr_mshwm_set_o (csr_mshwm_set),
.csr_mshwm_new_o (csr_mshwm_new),
.ztop_rdata_i (32'h0),
.ztop_rcap_i (NULL_CAP),
.csr_dbg_tclr_fault_i (csr_dbg_tclr_fault)
);

Expand Down
1 change: 0 additions & 1 deletion rtl/ibex_tracer.sv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,6 @@ module ibex_tracer import ibex_cheriot_pkg::*; import ibex_pkg::*; (
// Get a SCR name for a CHERIoT SCR address.
function automatic string get_scr_name(input logic [4:0] scr_addr);
unique case (scr_addr)
5'd27: return "ztopc";
5'd28: return "mtcc";
5'd29: return "mtdc";
5'd30: return "mscratchc";
Expand Down
Loading