add Forms page to pdf spec

diff --git a/openpower/Makefile b/openpower/Makefile
index 450bf9511f5fc12e98abeb35ced5e642be373852..cc2b8ce3cc9f4369bb5781e554e36341e5d08005 100755 (executable)
--- a/openpower/Makefile
+++ b/openpower/Makefile
@@ -151,6 +151,13 @@ tex_out/mv_swizzle.tex : sv/mv.swizzle.mdwn
                --filter pandoc_img.py \
             -N -o tex_out/mv_swizzle.tex sv/mv.swizzle.mdwn
 
+tex_out/fields.tex : sv/fields.mdwn
+       mkdir -p tex_out
+       ./mdwn_inline.py sv/fields.mdwn tex_out/fields.mdwn
+       pandoc -f markdown -t latex --top-level-division=section \
+               --filter pandoc_img.py \
+            -N -o tex_out/fields.tex tex_out/fields.mdwn
+
 tex_out/mv_vec.tex : sv/mv.vec.mdwn
        mkdir -p tex_out
        pandoc -f markdown -t latex --top-level-division=section \

diff --git a/openpower/mdwn_inline.py b/openpower/mdwn_inline.py
index 7a6a1574503794727b8ee2baf476b73e876d4706..cea39fe21d3958bc977e03d7e9a629d6c94e8cc9 100755 (executable)
--- a/openpower/mdwn_inline.py
+++ b/openpower/mdwn_inline.py
@@ -21,5 +21,12 @@ with open(sys.argv[2], "w") as o:
                     with open("../%s" % fname) as inc:
                         o.write(inc.read())
             else:
-                with open("../%s.mdwn" % fname) as inc:
-                    o.write(inc.read())
+                if fname.endswith(".mdwn"):
+                    with open("../%s" % fname) as inc:
+                        o.write(inc.read())
+                elif fname == 'openpower/isatables/fields.text':
+                    with open("../../openpower-isa/%s" % fname) as inc:
+                        o.write(inc.read())
+                else:
+                    with open("../%s.mdwn" % fname) as inc:
+                        o.write(inc.read())

diff --git a/openpower/simple_v_spec.tex b/openpower/simple_v_spec.tex
index 4860d9d0957ea214c8edd1b79a8eb57d89715a69..7fac1c77ab545375abf95d389b96b03aa4692bac 100644 (file)
--- a/openpower/simple_v_spec.tex
+++ b/openpower/simple_v_spec.tex
@@ -154,6 +154,9 @@ Programme, requires full transparency.
 
 \part{Scalable Vectors}
 
+\chapter{Fields and Forms}
+\hypertarget{svux2ffields}{}
+\input{tex_out/fields.tex}
 \chapter{Scalable Vectors for the Power ISA}
 \hypertarget{svux2fscalvecpowisa}{}
 \hypertarget{SVux7csv}{}

diff --git a/openpower/sv/fields.mdwn b/openpower/sv/fields.mdwn
index 8337a6dda03c0bf8b20bcf3e5a16ebfd2079b2e1..d58cba968ece65107b346099af27a5b58343229b 100644 (file)
--- a/openpower/sv/fields.mdwn
+++ b/openpower/sv/fields.mdwn
@@ -5,7 +5,8 @@ following program:
 [power_fields.py](https://git.libre-soc.org/?p=openpower-isa.git;a=blob;f=src/openpower/decoder/power_fields.py;hb=HEAD)
 
 Some additions have been made for DRAFT Scalar instructions Forms:
-SVM-Form, BM2-Form.
+BM2-Form, TLI-Form and others. Other additions are for SVP64 such
+as SVM-Form, SVL-Form.
 
 ```
 [[!inline pages="openpower/isatables/fields.text" raw="yes" ]]