PrettyGoodRISCV/E-Series
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

WIP

Browse Source
This commit is contained in:
John Terrell 2023-04-25 16:45:58 -07:00
parent b82a6a9a79
commit 96b36317b3
Signed by untrusted user who does not match committer: johnt
GPG Key ID: 2E424258DD3731F4
2 changed files with 27 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/Cpu/CSRs/MachineStatus.bsv
View File

@ -150,8 +150,8 @@ endinstance
interface MachineStatusIfc#(numeric type xlen);
method Action beginTrap(RVPrivilegeLevel currentPriv);
interface Get#(Bit#(xlen)) getMachineStatus;
interface Put#(Bit#(xlen)) putMachineStatus;
method Bit#(xlen) get;
method Action put(Bit#(xlen) newMachineStatus);
endinterface
module mkMachineStatus#(IsaCfg#(xlen) cfg)(MachineStatusIfc#(xlen))
@ -172,30 +172,31 @@ module mkMachineStatus#(IsaCfg#(xlen) cfg)(MachineStatusIfc#(xlen))
mstatus <= mstatus_pack(mstatus_);
endmethod
interface Get getMachineStatus = toGet(mstatus);
interface Put putMachineStatus;
method Action put(Bit#(xlen) newValue);
//
// Only MPP, MIE, and MIE are writable.
//
MachineStatus mstatus_ = mstatus_unpack(mstatus);
MachineStatus value = mstatus_unpack(newValue);
method Bit#(xlen) get;
return mstatus;
endmethod
if (cfg.extS) begin
mstatus_.mpp = value.mpp;
end else begin
// Supervisor mode not supported, ensure only USER and MACHINE
// mode are set in MPP.
RVPrivilegeLevel requestedMPP = value.mpp;
if (requestedMPP == priv_USER || requestedMPP == priv_MACHINE) begin
mstatus_.mpp = requestedMPP;
end
method Action put(Bit#(xlen) newMachineStatus);
//
// Only MPP, MIE, and MIE are writable.
//
MachineStatus mstatus_ = mstatus_unpack(mstatus);
MachineStatus value = mstatus_unpack(newMachineStatus);
if (cfg.extS) begin
mstatus_.mpp = value.mpp;
end else begin
// Supervisor mode not supported, ensure only USER and MACHINE
// mode are set in MPP.
RVPrivilegeLevel requestedMPP = value.mpp;
if (requestedMPP == priv_USER || requestedMPP == priv_MACHINE) begin
mstatus_.mpp = requestedMPP;
end
end
mstatus_.mpie = value.mpie;
mstatus_.mie = value.mie;
mstatus_.mpie = value.mpie;
mstatus_.mie = value.mie;
mstatus <= mstatus_pack(mstatus_);
endmethod
endinterface
mstatus <= mstatus_pack(mstatus_);
endmethod
endmodule

4
src/Cpu/CsrFile.bsv
View File

@ -180,7 +180,7 @@ module mkCsrFile#(IsaCfg#(xlen) cfg)(CsrFileIfc#(xlen))
csr_MIDELEG: result.value = mideleg;
csr_MEDELEG: result.value = medeleg;
csr_MSTATUS: result.value <- mstatus.getMachineStatus.get;
csr_MSTATUS: result.value = mstatus.get;
csr_MCYCLE, csr_CYCLE: begin
result.value = mcycle;
@ -226,7 +226,7 @@ module mkCsrFile#(IsaCfg#(xlen) cfg)(CsrFileIfc#(xlen))
// No-Op
end
csr_MSCRATCH: mscratch <= value;
csr_MSTATUS: mstatus.putMachineStatus.put(value);
csr_MSTATUS: mstatus.put(value);
csr_MTVAL: mtval <= value;
csr_MTVEC: mtvec <= value;
csr_MIE: mie <= value;