Add Zicfilp support to Smrnmi

src/images/bytefield/mnstatus.edn

@@ -5,25 +5,29 @@
 (def row-header-fn nil)
 (def left-margin 30)
 (def right-margin 30)
-(def boxes-per-row 32)
-(draw-column-headers {:height 24 :font-size 24 :labels (reverse ["0" "" "" "2" "" "3" "4" "" "" "6" "" "" "" "7" "" "" "8" "" "" "10" "11" "" "" "12" "13" "" "" "" "" "" "MXLEN-1" ""])})
+(def boxes-per-row 35)
+(draw-column-headers {:height 24 :font-size 24 :labels (reverse ["0" "" "" "2" "" "3" "4" "" "" "6" "" "" "7" "" "" "8" "" "" "9" "" "" "10" "" "11" "" "" "12" "13" "" "" "" "" "" "MXLEN-1" ""])})
 
 (draw-box (text "Reserved" {:font-style "italic" :font-size 24}) {:span 8})
 (draw-box (text "MNPP" {:font-size 24}) {:span 2 :text-anchor "end" :borders {:top :border-unrelated :bottom :border-unrelated :left :border-unrelated}})
 (draw-box (text "(WARL)" {:font-weight "bold" :font-size 20}) {:span 2 :text-anchor "start"  :borders {:top :border-unrelated :right :border-unrelated :bottom :border-unrelated}})
-(draw-box (text "Reserved" {:font-style "italic" :font-size 24}) {:span 4})
-(draw-box (text "MNPV" {:font-size 24}) {:span 3 :text-anchor "end" :borders {:top :border-unrelated :bottom :border-unrelated :left :border-unrelated}})
-(draw-box (text "(WARL)" {:font-weight "bold" :font-size 24}) {:span 3 :text-anchor "start" :borders {:top :border-unrelated :right :border-unrelated :bottom :border-unrelated}})
+(draw-box (text "Reserved" {:font-style "italic" :font-size 24}) {:span 3})
+(draw-box (text "MNPELP" {:font-style "italic" :font-size 20}) {:span 3})
+(draw-box (text "Reserved" {:font-style "italic" :font-size 20}) {:span 3})
+(draw-box (text "MNPV" {:font-size 24}) {:span 2 :text-anchor "end" :borders {:top :border-unrelated :bottom :border-unrelated :left :border-unrelated}})
+(draw-box (text "(WARL)" {:font-weight "bold" :font-size 20}) {:span 2 :text-anchor "start" :borders {:top :border-unrelated :right :border-unrelated :bottom :border-unrelated}})
 (draw-box (text "Reserved" {:font-style "italic" :font-size 24}) {:span 4})
 (draw-box "NMIE" {:span 2})
 (draw-box (text "Reserved" {:font-style "italic" :font-size 24}) {:span 4})
 
 (draw-box "MXLEN-13" {:span 8 :borders {}})
 (draw-box "2" {:span 4 :borders {}})
-(draw-box "3" {:span 4 :borders {}})
-(draw-box "1" {:span 6 :borders {}})
+(draw-box "1" {:span 3 :borders {}})
+(draw-box "1" {:span 3 :borders {}})
+(draw-box "1" {:span 3 :borders {}})
+(draw-box "1" {:span 4 :borders {}})
 (draw-box "3" {:span 4 :borders {}})
 (draw-box "1" {:span 2 :borders {}})
 (draw-box "3" {:span 4 :borders {}})
 
-----
+----

src/rnmi.adoc

@@ -91,6 +91,10 @@ field, MNPV, which on entry to the RNMI trap handler holds the virtualization
 mode of the interrupted context, encoded in the same manner as
 `mstatus`.MPV.
 
+If the Zicfilp extension is implemented, `mnstatus` also holds the MNPELP
+field, which on entry to the RNMI trap handler holds the previous `ELP` state.
+When an RNMI trap is taken, MNPELP is set to `ELP` and `ELP` is set to 0.
+
 `mnstatus` also holds the NMIE bit. When NMIE=1, nonmaskable interrupts
 are enabled. When NMIE=0, _all_ interrupts are disabled.
 
@@ -137,6 +141,8 @@ MNRET is an M-mode-only instruction that uses the values in `mnepc` and
 `mnstatus` to return to the program counter, privilege mode, and
 virtualization mode of the interrupted context. This instruction also
 sets `mnstatus`.NMIE.  If MNRET changes the privilege mode to a mode less privileged than M, it also sets `mstatus`.MPRV to 0.
+If the Zicfilp extension is implemented, then if `mnstatus`.MNPP holds the
+value __y__, MNRET sets `ELP` to the logical AND of __y__LPE and `mnstatus`.MNPELP.
 
 === RNMI Operation