Merge pull request #1378 from riscv/kersten1-patch-2

Update to PMP R, W, and X bits
riscv · May 2, 2024 · ed61a8d · ed61a8d
2 parents c9842fc + f39842e
commit ed61a8d
Showing 1 changed file with 8 additions and 14 deletions.
diff --git a/src/images/bytefield/pmpcfg.adoc b/src/images/bytefield/pmpcfg.adoc
@@ -10,29 +10,23 @@
 (draw-box "7" {:span 5 :borders {}})
 (draw-box "6" {:span 3 :text-anchor "start" :borders {}})
 (draw-box "5" {:span 3 :text-anchor "end" :borders {}})
-(draw-box "4" {:span 3 :text-anchor "left" :borders {}})
+(draw-box "4" {:span 3 :text-anchor "start" :borders {}})
 (draw-box "3" {:span 3 :text-anchor "end" :borders {}})
 (draw-box "2" {:span 5 :borders {}})
 (draw-box "1" {:span 5 :borders {}})
 (draw-box "0" {:span 5 :borders {}})
 
-(draw-box "L " {:span 2 :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 :bottom :border-unrelated :right :border-unrelated}})
-(draw-box "0 " {: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 :bottom :border-unrelated :right :border-unrelated}})
-(draw-box "A " {: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 :bottom :border-unrelated :right :border-unrelated}})
-(draw-box "X " {:span 2 :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 :bottom :border-unrelated :right :border-unrelated}})
-(draw-box "W " {:span 2 :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 :bottom :border-unrelated :right :border-unrelated}})
-(draw-box "R " {:span 2 :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 :bottom :border-unrelated :right :border-unrelated}})
+(draw-box "L" {:span 5})
+(draw-box "0" {:span 6})
+(draw-box "A" {:span 6})
+(draw-box "X" {:span 5})
+(draw-box "W" {:span 5})
+(draw-box "R" {:span 5})
 
 (draw-box "1" {:span 5 :borders {}})
 (draw-box "2" {:span 6 :borders {}})
 (draw-box "2" {:span 6 :borders {}})
 (draw-box "1" {:span 5 :borders {}})
 (draw-box "1" {:span 5 :borders {}})
 (draw-box "1" {:span 5 :borders {}})
-----
+----