From 1ed309a294c88a3b827fa5da2655b0360f8ffca9 Mon Sep 17 00:00:00 2001 From: Bill Traynor Date: Mon, 17 Apr 2023 16:09:27 -0400 Subject: Fixing up diagrams Fixing up diagrams --- src/images/bytefield/hiereg.edn | 16 ++++++++++------ src/images/bytefield/hipreg.edn | 16 ++++++++++------ src/images/bytefield/hvipreg.edn | 16 ++++++++++------ 3 files changed, 30 insertions(+), 18 deletions(-) diff --git a/src/images/bytefield/hiereg.edn b/src/images/bytefield/hiereg.edn index 4c39f28..36edd7a 100644 --- a/src/images/bytefield/hiereg.edn +++ b/src/images/bytefield/hiereg.edn @@ -1,13 +1,17 @@ [bytefield] ---- -(defattrs :plain [:plain {:font-family "M+ 1p Fallback" :font-size 24}]) +(defattrs :plain [:plain {:font-family "M+ 1p Fallback" :font-size 20}]) (def row-height 40 ) (def row-header-fn nil) -(def left-margin 200) -(def right-margin 200) +(def left-margin 100) +(def right-margin 100) (def boxes-per-row 32) -(draw-column-headers {:height 24 :font-size 24 :labels (reverse ["0" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "HSXLEN-1" ""])}) -(draw-box (text "Interrupts" {:font-size 24 :font-weight "bold"} "(WARL)") {:span 32}) -(draw-box "HSXLEN" {:font-size 24 :span 32 :borders {}}) +(draw-box "HSXLEN-1" {:span 16 :text-anchor "start" :borders{}}) +(draw-box "0" {:span 16 :text-anchor "end" :borders{}}) + +(draw-box "Interrupts" {:span 16 :text-anchor "end" :borders{:top :border-unrelated :bottom :border-unrelated :left :border-unrelated}}) +(draw-box (text "(WARL)" { :font-weight "bold"}) {:span 16 :text-anchor "start" :borders{:top :border-unrelated :bottom :border-unrelated :right :border-unrelated}}) + +(draw-box "HSXLEN" {:span 32 :borders {}}) ---- \ No newline at end of file diff --git a/src/images/bytefield/hipreg.edn b/src/images/bytefield/hipreg.edn index 4c39f28..36edd7a 100644 --- a/src/images/bytefield/hipreg.edn +++ b/src/images/bytefield/hipreg.edn @@ -1,13 +1,17 @@ [bytefield] ---- -(defattrs :plain [:plain {:font-family "M+ 1p Fallback" :font-size 24}]) +(defattrs :plain [:plain {:font-family "M+ 1p Fallback" :font-size 20}]) (def row-height 40 ) (def row-header-fn nil) -(def left-margin 200) -(def right-margin 200) +(def left-margin 100) +(def right-margin 100) (def boxes-per-row 32) -(draw-column-headers {:height 24 :font-size 24 :labels (reverse ["0" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "HSXLEN-1" ""])}) -(draw-box (text "Interrupts" {:font-size 24 :font-weight "bold"} "(WARL)") {:span 32}) -(draw-box "HSXLEN" {:font-size 24 :span 32 :borders {}}) +(draw-box "HSXLEN-1" {:span 16 :text-anchor "start" :borders{}}) +(draw-box "0" {:span 16 :text-anchor "end" :borders{}}) + +(draw-box "Interrupts" {:span 16 :text-anchor "end" :borders{:top :border-unrelated :bottom :border-unrelated :left :border-unrelated}}) +(draw-box (text "(WARL)" { :font-weight "bold"}) {:span 16 :text-anchor "start" :borders{:top :border-unrelated :bottom :border-unrelated :right :border-unrelated}}) + +(draw-box "HSXLEN" {:span 32 :borders {}}) ---- \ No newline at end of file diff --git a/src/images/bytefield/hvipreg.edn b/src/images/bytefield/hvipreg.edn index 981a584..6c7bda2 100644 --- a/src/images/bytefield/hvipreg.edn +++ b/src/images/bytefield/hvipreg.edn @@ -1,13 +1,17 @@ [bytefield] ---- -(defattrs :plain [:plain {:font-family "M+ 1p Fallback" :font-size 24}]) +(defattrs :plain [:plain {:font-family "M+ 1p Fallback" :font-size 20}]) (def row-height 40 ) (def row-header-fn nil) -(def left-margin 200) -(def right-margin 200) +(def left-margin 100) +(def right-margin 100) (def boxes-per-row 32) -(draw-column-headers {:height 24 :font-size 24 :labels (reverse ["0" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "HSXLEN-1" ""])}) -(draw-box (text "Virtual Interrupts" {:font-size 24 :font-weight "bold"} "(WARL)") {:span 32}) -(draw-box "HSXLEN" {:font-size 24 :span 32 :borders {}}) +(draw-box "HSXLEN-1" {:span 16 :text-anchor "start" :borders{}}) +(draw-box "0" {:span 16 :text-anchor "end" :borders{}}) + +(draw-box "Virtual Interrupts" {:span 18 :text-anchor "end" :borders{:top :border-unrelated :bottom :border-unrelated :left :border-unrelated}}) +(draw-box (text "(WARL)" { :font-weight "bold"}) {:span 14 :text-anchor "start" :borders{:top :border-unrelated :bottom :border-unrelated :right :border-unrelated}}) + +(draw-box "HSXLEN" {:span 32 :borders {}}) ---- \ No newline at end of file -- cgit v1.1