github-mirrors/cva6
1
0
Fork 0
mirror of https://github.com/openhwgroup/cva6.git synced 2025-04-22 21:27:10 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix #65, writes are ignored in sstatus

Browse source
This commit is contained in:
Florian Zaruba 2018-07-20 17:34:17 -07:00
parent 79a2189e15
commit cd1db48d14
No known key found for this signature in database
GPG key ID: E742FFE8EC38A792
1 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/csr_regfile.sv
View file

@ -179,7 +179,7 @@ module csr_regfile #(
if (csr_read) begin
case (csr_addr.address)
CSR_SSTATUS: csr_rdata = mstatus_q & 64'h3fffe1fee;
CSR_SSTATUS: csr_rdata = mstatus_q & 64'h80000003000DE133;
CSR_SIE: csr_rdata = mie_q & mideleg_q;
CSR_SIP: csr_rdata = mip_q & mideleg_q;
CSR_STVEC: csr_rdata = stvec_q;
@ -286,7 +286,16 @@ module csr_regfile #(
case (csr_addr.address)
// sstatus is a subset of mstatus - mask it accordingly
CSR_SSTATUS: begin
mstatus_d = csr_wdata & 64'h3fffe1fee;
mstatus_d = csr_wdata;
// not all fields of mstatus can be written
mstatus_d.mie = mstatus_q.mie;
mstatus_d.mpie = mstatus_q.mipe;
mstatus_d.mpp = mscratch_q.mpp
mstatus_d.mprv = mstatus_q.mprv;
mstatus_d.tsr = mstatus_q.tsr;
mstatus_d.tw = mstatus_q.tw;
mstatus_d.tvm = mstatus_q.tvm;
mstatus_d.sxl = mstatus_q.sxl;
// this instruction has side-effects
flush_o = 1'b1;
end