-
Notifications
You must be signed in to change notification settings - Fork 779
[cheriot,rtl] Add TRVK filter to Ibex sources #2455
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
base: master
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| // Copyright lowRISC contributors (OpenTitan project). | ||
| // Licensed under the Apache License, Version 2.0, see LICENSE for details. | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
|
|
||
| package ibex_cheriot_pkg; | ||
|
|
||
| parameter int unsigned TOP_W = 9; | ||
| parameter int unsigned BOT_W = 9; | ||
| parameter int unsigned EXP_W = 5; | ||
| parameter int unsigned OTYPE_W = 3; | ||
| parameter int unsigned CPERMS_W = 6; | ||
|
|
||
|
|
||
| // Obtain 32-bit representation of top | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 33-bit |
||
| function automatic logic[32:0] get_bound33(logic [TOP_W-1:0] top, logic [1:0] cor, | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think it makes sense to call this "get_top33" right?
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I would keep this aligned with the name originally used by the reference implementation of Microsoft. The plan is to merge the current |
||
| logic [EXP_W-1:0] exponent, logic [31:0] addr); | ||
| logic [32:0] t1, t2, mask, cor_val; | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. t1 and t2 should have more descriptive names.
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Agreed, but we should align ourself with the nomenclature used in the core. @SamuelRiedel, will you rename these signals? |
||
|
|
||
| if (cor[1]) | ||
| // negative sign extension | ||
| cor_val = {33{cor[1]}}; | ||
| else | ||
| cor_val = {32'h0, (~cor[1]) & cor[0]}; | ||
|
|
||
| cor_val = (cor_val << exponent) << TOP_W; | ||
| mask = (33'h1_ffff_ffff << exponent) << TOP_W; | ||
|
|
||
| // apply correction and truncate | ||
| t1 = ({1'b0, addr} & mask) + cor_val; | ||
| // extend to 32 bit | ||
| t2 = {24'h0, top}; | ||
| t1 = t1 | (t2 << exponent); | ||
|
|
||
| return t1; | ||
| endfunction | ||
|
|
||
|
|
||
| // Update the top/base correction for a cap | ||
| function automatic logic [2:0] update_temp_fields(logic [TOP_W-1:0] top, logic [BOT_W-1:0] base, | ||
| logic [BOT_W-1:0] addrmi); | ||
| logic top_hi, addr_hi; | ||
| logic [2:0] res3; | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This should probably be called something like "correction_bits"
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I would keep this aligned with the name originally used by the reference implementation of Microsoft. The plan is to merge the current ibex_cheriot_pkg.sv with the one that will be introduced with the core. |
||
|
|
||
| top_hi = (top < base); | ||
| addr_hi = (addrmi < base); | ||
|
|
||
| // top_cor | ||
| res3[2:1] = (top_hi == addr_hi)? 2'b00 : ((top_hi && (!addr_hi))? 2'b01 : 2'b11); | ||
|
|
||
| // base_cor | ||
| res3[0] = (addr_hi) ? 1'b1 : 1'b0; | ||
|
|
||
| return res3; | ||
| endfunction | ||
|
|
||
| endpackage | ||
Uh oh!
There was an error while loading. Please reload this page.