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.

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

Fix spr_eear to save appropriate value for each exception #108

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions rtl/verilog/mor1kx_ctrl_cappuccino.v
Original file line number Diff line number Diff line change
Expand Up @@ -833,9 +833,9 @@ module mor1kx_ctrl_cappuccino
spr_eear <= {OPTION_OPERAND_WIDTH{1'b0}};
else if (/*padv_ctrl & exception*/ exception_re)
begin
if (except_ibus_err_i | except_itlb_miss_i | except_ipagefault_i)
if (except_ibus_err_i | except_itlb_miss_i | except_ipagefault_i | except_illegal_i)
spr_eear <= pc_ctrl_i;
else
else if (except_dbus_i | except_dtlb_miss_i | except_dpagefault_i | except_align_i)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why is this needed?
either this list is covering all the cases that are not covered in the previous if and then it is superfluous,
or it does not contain all the cases that are not covered in the previous if and then it is wrong

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree, with verilog we should always have an else case otherwise the logic is incomplete. Also, the reason I am looking at this is because I noticed during linux debugging with mor1kx the trap instructions are appearing to have incorrect EEAR set. The trap case doesn't seem to be handler here, maybe its somewhere else?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well, my comment is wrong here l.trap doesn't set eear as per spec.

spr_eear <= ctrl_lsu_adr_i;
end

Expand Down