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

Update bitfield syntax #484

Merged
merged 1 commit into from
May 21, 2024
Merged

Update bitfield syntax #484

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
6 changes: 3 additions & 3 deletions model/riscv_pmp_regs.sail
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ function pmpReadCfgReg(n : range(0, 15)) -> xlenbits = {

function pmpReadAddrReg(n : range(0, 63)) -> xlenbits = {
let G = sys_pmp_grain();
let match_type = pmpcfg_n[n].A();
let match_type = pmpcfg_n[n][A];
let addr = pmpaddr_n[n];

match match_type[1] {
Expand Down Expand Up @@ -104,12 +104,12 @@ function pmpWriteCfg(n: range(0, 63), cfg: Pmpcfg_ent, v: bits(8)) -> Pmpcfg_ent
// "The R, W, and X fields form a collective WARL field for which the combinations with R=0 and W=1 are reserved."
// In this implementation if R=0 and W=1 then R, W and X are all set to 0.
// This is the least risky option from a security perspective.
let cfg = if cfg.W() == 0b1 & cfg.R() == 0b0 then [cfg with X = 0b0, W = 0b0, R = 0b0] else cfg;
let cfg = if cfg[W] == 0b1 & cfg[R] == 0b0 then [cfg with X = 0b0, W = 0b0, R = 0b0] else cfg;

// "When G >= 1, the NA4 mode is not selectable."
// In this implementation we set it to OFF if NA4 is selected.
// This is the least risky option from a security perspective.
let cfg = if sys_pmp_grain() >= 1 & pmpAddrMatchType_of_bits(cfg.A()) == NA4
let cfg = if sys_pmp_grain() >= 1 & pmpAddrMatchType_of_bits(cfg[A]) == NA4
then [cfg with A = pmpAddrMatchType_to_bits(OFF)]
else cfg;

Expand Down
4 changes: 2 additions & 2 deletions model/riscv_vmem.sail
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -426,8 +426,8 @@ function translateAddr(vAddr : xlenbits,
if not(valid_va) then
TR_Failure(translationException(ac, PTW_Invalid_Addr()), init_ext_ptw)
else {
let mxr = mstatus.MXR() == 0b1;
let do_sum = mstatus.SUM() == 0b1;
let mxr = mstatus[MXR] == 0b1;
let do_sum = mstatus[SUM] == 0b1;
let asid : asidbits = satp_to_asid(satp);
let ptb : bits(64) = satp_to_PT_base(satp);
let tr_result1 = translate(sv_params,
Expand Down
2 changes: 1 addition & 1 deletion model/riscv_vmem_pte.sail
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ function update_PTE_Bits(sv_params : SV_Params,
let pte_flags = [pte_flags with
A = 0b1,
D = (if update_d then 0b1 else pte_flags[D])];
Some(pte[63 .. 8] @ pte_flags.bits())
Some(pte[63 .. 8] @ pte_flags.bits)
}
else
None()
Expand Down
Loading