Cheri-research/Toooba
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Style improvements (suggested by jrtc27)

Browse Source
This commit is contained in:
Peter Rugg
2021-05-05 13:29:42 +01:00
parent 7e77b2314b
commit 0a7e77230e
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src_Core/CPU/CsrFile.bsv
View File

@@ -644,8 +644,9 @@ module mkCsrFile #(Data hartid)(CsrFile);
// stval (sbadaddr in spike)
Reg#(Data) stval_csr <- mkCsrReg(0);
// Capability cause register
Reg#(Bit#(2)) gclg_reg <- mkCsrReg(0);
Reg#(Data) sccsr_csr = concatReg3 (readOnlyReg(60'b0), gclg_reg, readOnlyReg(2'b11));
Reg#(Bit#(1)) global_cap_load_gen_s_reg <- mkCsrReg(0);
Reg#(Bit#(1)) global_cap_load_gen_u_reg <- mkCsrReg(0);
Reg#(Data) sccsr_csr = concatReg4 (readOnlyReg(60'b0), global_cap_load_gen_u_reg, global_cap_load_gen_s_reg, readOnlyReg(2'b11));
// sip: restricted view of mip
Reg#(Data) sip_csr = concatReg9(
readOnlyReg(54'b0),
@@ -1123,7 +1124,7 @@ module mkCsrFile #(Data hartid)(CsrFile);
excLoadAddrMisaligned, excLoadAccessFault,
excStoreAddrMisaligned, excStoreAccessFault,
excLoadPageFault, excStorePageFault,
excStoreCapPageFault, excLoadCapPageFault: return addr;
excLoadCapPageFault, excStoreCapPageFault: return addr;
default: return 0;
endcase);
@@ -1292,8 +1293,8 @@ module mkCsrFile #(Data hartid)(CsrFile);
exeReadable: mxr_reg == 1,
userAccessibleByS: sum_reg == 1,
basePPN: ppn_reg,
globalCapLoadGenU: gclg_reg[1],
globalCapLoadGenS: gclg_reg[0]
globalCapLoadGenU: global_cap_load_gen_u_reg,
globalCapLoadGenS: global_cap_load_gen_s_reg
`ifdef SECURITY
, sanctum_evbase: mevbase_csr,
sanctum_evmask: mevmask_csr,
@@ -1321,8 +1322,8 @@ module mkCsrFile #(Data hartid)(CsrFile);
exeReadable: mxr_reg == 1,
userAccessibleByS: sum_reg == 1,
basePPN: ppn_reg,
globalCapLoadGenU: gclg_reg[1],
globalCapLoadGenS: gclg_reg[0]
globalCapLoadGenU: global_cap_load_gen_u_reg,
globalCapLoadGenS: global_cap_load_gen_s_reg
`ifdef SECURITY
, sanctum_evbase: mevbase_csr,
sanctum_evmask: mevmask_csr,