aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBill Traynor <wmat@riscv.org>2023-05-16 10:15:34 -0400
committerBill Traynor <wmat@riscv.org>2023-05-16 10:15:34 -0400
commit7b7777817467a792584e0119c6e866282a75a006 (patch)
treee3279d374cf6be8aef24e0d8ac381cd6bb782104
parent6d0c12d32c5ecc8867f0e37b523698e94f9991d6 (diff)
downloadriscv-isa-manual-7b7777817467a792584e0119c6e866282a75a006.zip
riscv-isa-manual-7b7777817467a792584e0119c6e866282a75a006.tar.gz
riscv-isa-manual-7b7777817467a792584e0119c6e866282a75a006.tar.bz2
Setting font and row height.
Set font-size to 24. Set row height to 40. Set margins to 30 Set boxes per row to 32. Adjusted spans to match row width.
-rw-r--r--src/images/bytefield/sv57pa.edn32
-rw-r--r--src/images/bytefield/sv57pte.edn48
-rw-r--r--src/images/bytefield/sv57va.edn44
3 files changed, 62 insertions, 62 deletions
diff --git a/src/images/bytefield/sv57pa.edn b/src/images/bytefield/sv57pa.edn
index e6031ac..511b9d6 100644
--- a/src/images/bytefield/sv57pa.edn
+++ b/src/images/bytefield/sv57pa.edn
@@ -1,36 +1,36 @@
[bytefield]
----
-(defattrs :plain [:plain {:font-family "M+ 1p Fallback" :font-size 16}])
+(defattrs :plain [:plain {:font-family "M+ 1p Fallback" :font-size 24}])
(def row-height 40 )
(def row-header-fn nil)
-(def left-margin 100)
-(def right-margin 100)
-(def boxes-per-row 36)
+(def left-margin 30)
+(def right-margin 30)
+(def boxes-per-row 32)
(draw-box "55" {:span 3 :text-anchor "start" :borders {}})
-(draw-box "48" {:span 3 :text-anchor "end" :borders {}})
+(draw-box "48" {:span 2 :text-anchor "end" :borders {}})
(draw-box "47" {:span 3 :text-anchor "start" :borders {}})
-(draw-box "39" {:span 3 :text-anchor "end" :borders {}})
+(draw-box "39" {:span 2 :text-anchor "end" :borders {}})
(draw-box "38" {:span 3 :text-anchor "start" :borders {}})
-(draw-box "30" {:span 3 :text-anchor "end" :borders {}})
+(draw-box "30" {:span 2 :text-anchor "end" :borders {}})
(draw-box "29" {:span 3 :text-anchor "start" :borders {}})
-(draw-box "21" {:span 3 :text-anchor "end" :borders {}})
+(draw-box "21" {:span 2 :text-anchor "end" :borders {}})
(draw-box "20" {:span 3 :text-anchor "start" :borders {}})
(draw-box "12" {:span 3 :text-anchor "end" :borders {}})
(draw-box "11" {:span 3 :text-anchor "start" :borders {}})
(draw-box "0" {:span 3 :text-anchor "end" :borders {}})
-(draw-box "PPN[4]" {:span 6})
-(draw-box "PPN[3]" {:span 6})
-(draw-box "PPN[2]" {:span 6})
-(draw-box "PPN[1]" {:span 6})
+(draw-box "PPN[4]" {:span 5})
+(draw-box "PPN[3]" {:span 5})
+(draw-box "PPN[2]" {:span 5})
+(draw-box "PPN[1]" {:span 5})
(draw-box "PPN[0]" {:span 6})
(draw-box "page offset" {:span 6})
-(draw-box "8" {:span 6 :borders {}})
-(draw-box "9" {:span 6 :borders {}})
-(draw-box "9" {:span 6 :borders {}})
-(draw-box "9" {:span 6 :borders {}})
+(draw-box "8" {:span 5 :borders {}})
+(draw-box "9" {:span 5 :borders {}})
+(draw-box "9" {:span 5 :borders {}})
+(draw-box "9" {:span 5 :borders {}})
(draw-box "9" {:span 6 :borders {}})
(draw-box "12" {:span 6 :borders {}})
---- \ No newline at end of file
diff --git a/src/images/bytefield/sv57pte.edn b/src/images/bytefield/sv57pte.edn
index 3395166..0f8e2a8 100644
--- a/src/images/bytefield/sv57pte.edn
+++ b/src/images/bytefield/sv57pte.edn
@@ -1,21 +1,21 @@
[bytefield]
----
-(defattrs :plain [:plain {:font-family "M+ 1p Fallback" :font-size 16}])
-(def row-height 30 )
+(defattrs :plain [:plain {:font-family "M+ 1p Fallback" :font-size 24}])
+(def row-height 40 )
(def row-header-fn nil)
-(def left-margin 100)
-(def right-margin 100)
-(def boxes-per-row 24)
+(def left-margin 30)
+(def right-margin 30)
+(def boxes-per-row 32)
(draw-box "63" {:borders {}})
(draw-box "62" {:borders {}})
(draw-box "61" {:borders {}})
-(draw-box "60" {:span 3 :text-anchor "start" :borders {}})
-(draw-box "54" {:span 2 :text-anchor "end" :borders {}})
-(draw-box "53" {:span 2 :text-anchor "start" :borders {}})
-(draw-box "10" {:span 2 :text-anchor "end" :borders {}})
-(draw-box "9" {:span 2 :text-anchor "start" :borders {}})
-(draw-box "8" {:span 2 :text-anchor "end" :borders {}})
+(draw-box "60" {:span 4 :text-anchor "start" :borders {}})
+(draw-box "54" {:span 3 :text-anchor "end" :borders {}})
+(draw-box "53" {:span 4 :text-anchor "start" :borders {}})
+(draw-box "10" {:span 3 :text-anchor "end" :borders {}})
+(draw-box "9" {:span 4 :text-anchor "start" :borders {}})
+(draw-box "8" {:span 3 :text-anchor "end" :borders {}})
(draw-box "7" {:borders {}})
(draw-box "6" {:borders {}})
(draw-box "5" {:borders {}})
@@ -27,9 +27,9 @@
(draw-box "N")
(draw-box "PBMT" {:span 2})
-(draw-box "Reserved" {:span 5})
-(draw-box "PPN" {:span 4})
-(draw-box "RSW" {:span 4})
+(draw-box "Reserved" {:span 7})
+(draw-box "PPN" {:span 7})
+(draw-box "RSW" {:span 7})
(draw-box "D")
(draw-box "A")
(draw-box "G")
@@ -41,9 +41,9 @@
(draw-box "1" {:borders {}})
(draw-box "2" {:span 2 :borders {}})
-(draw-box "7" {:span 5 :borders {}})
-(draw-box "44" {:span 6 :borders {}})
-(draw-box "2" {:span 2 :borders {}})
+(draw-box "7" {:span 7 :borders {}})
+(draw-box "44" {:span 7 :borders {}})
+(draw-box "2" {:span 7 :borders {}})
(draw-box "1" {:borders {}})
(draw-box "1" {:borders {}})
(draw-box "1" {:borders {}})
@@ -53,9 +53,9 @@
(draw-box "1" {:borders {}})
(draw-box "1" {:borders {}})
-(draw-box nil {:span 24 :borders {}})
+(draw-box nil {:span 32 :borders {}})
-(draw-box nil {:span 2 :borders {}})
+(draw-box nil {:span 6 :borders {}})
(draw-box "53" {:span 2 :text-anchor "start" :borders {}})
(draw-box "46" {:span 2 :text-anchor "end" :borders {}})
(draw-box "45" {:span 2 :text-anchor "start" :borders {}})
@@ -66,22 +66,22 @@
(draw-box "19" {:span 2 :text-anchor "end" :borders {}})
(draw-box "18" {:span 2 :text-anchor "start" :borders {}})
(draw-box "10" {:span 2 :text-anchor "end" :borders {}})
-(draw-box nil {:span 2 :borders {}})
+(draw-box nil {:span 6 :borders {}})
-(draw-box nil {:span 2 :borders {}})
+(draw-box nil {:span 6 :borders {}})
(draw-box "PPN[4]" {:span 4})
(draw-box "PPN[3]" {:span 4})
(draw-box "PPN[2]" {:span 4})
(draw-box "PPN[1]" {:span 4})
(draw-box "PPN[0]" {:span 4})
-(draw-box nil {:span 2 :borders {}})
+(draw-box nil {:span 6 :borders {}})
-(draw-box nil {:span 2 :borders {}})
+(draw-box nil {:span 6 :borders {}})
(draw-box "8" {:span 4 :borders {}})
(draw-box "9" {:span 4 :borders {}})
(draw-box "9" {:span 4 :borders {}})
(draw-box "9" {:span 4 :borders {}})
(draw-box "9" {:span 4 :borders {}})
-(draw-box nil {:span 2 :borders {}})
+(draw-box nil {:span 6 :borders {}})
---- \ No newline at end of file
diff --git a/src/images/bytefield/sv57va.edn b/src/images/bytefield/sv57va.edn
index 8fefc3f..a7f525a 100644
--- a/src/images/bytefield/sv57va.edn
+++ b/src/images/bytefield/sv57va.edn
@@ -1,36 +1,36 @@
[bytefield]
----
-(defattrs :plain [:plain {:font-family "M+ 1p Fallback" :font-size 16}])
+(defattrs :plain [:plain {:font-family "M+ 1p Fallback" :font-size 24}])
(def row-height 40 )
(def row-header-fn nil)
-(def left-margin 100)
-(def right-margin 100)
-(def boxes-per-row 24)
+(def left-margin 30)
+(def right-margin 30)
+(def boxes-per-row 32)
-(draw-box "56" {:span 2 :text-anchor "start" :borders {}})
+(draw-box "56" {:span 3 :text-anchor "start" :borders {}})
(draw-box "48" {:span 2 :text-anchor "end" :borders {}})
-(draw-box "47" {:span 2 :text-anchor "start" :borders {}})
+(draw-box "47" {:span 3 :text-anchor "start" :borders {}})
(draw-box "39" {:span 2 :text-anchor "end" :borders {}})
-(draw-box "38" {:span 2 :text-anchor "start" :borders {}})
+(draw-box "38" {:span 3 :text-anchor "start" :borders {}})
(draw-box "30" {:span 2 :text-anchor "end" :borders {}})
-(draw-box "29" {:span 2 :text-anchor "start" :borders {}})
+(draw-box "29" {:span 3 :text-anchor "start" :borders {}})
(draw-box "21" {:span 2 :text-anchor "end" :borders {}})
-(draw-box "20" {:span 2 :text-anchor "start" :borders {}})
+(draw-box "20" {:span 3 :text-anchor "start" :borders {}})
(draw-box "12" {:span 2 :text-anchor "end" :borders {}})
-(draw-box "11" {:span 2 :text-anchor "start" :borders {}})
+(draw-box "11" {:span 5 :text-anchor "start" :borders {}})
(draw-box "0" {:span 2 :text-anchor "end" :borders {}})
-(draw-box "VPN[4]" {:span 4})
-(draw-box "VPN[3]" {:span 4})
-(draw-box "VPN[2]" {:span 4})
-(draw-box "VPN[1]" {:span 4})
-(draw-box "VPN[0]" {:span 4})
-(draw-box "page offset" {:span 4})
+(draw-box "VPN[4]" {:span 5})
+(draw-box "VPN[3]" {:span 5})
+(draw-box "VPN[2]" {:span 5})
+(draw-box "VPN[1]" {:span 5})
+(draw-box "VPN[0]" {:span 5})
+(draw-box "page offset" {:span 7})
-(draw-box "9" {:span 4 :borders {}})
-(draw-box "9" {:span 4 :borders {}})
-(draw-box "9" {:span 4 :borders {}})
-(draw-box "9" {:span 4 :borders {}})
-(draw-box "9" {:span 4 :borders {}})
-(draw-box "12" {:span 4 :borders {}})
+(draw-box "9" {:span 5 :borders {}})
+(draw-box "9" {:span 5 :borders {}})
+(draw-box "9" {:span 5 :borders {}})
+(draw-box "9" {:span 5 :borders {}})
+(draw-box "9" {:span 5 :borders {}})
+(draw-box "12" {:span 7 :borders {}})
---- \ No newline at end of file