From ca293c8b6edf9533b43db944b41afeecb06e89fb Mon Sep 17 00:00:00 2001 From: Luke Kenneth Casson Leighton Date: Mon, 4 Jul 2022 14:58:51 +0100 Subject: [PATCH] add Forms page to pdf spec --- openpower/Makefile | 7 +++++++ openpower/mdwn_inline.py | 11 +++++++++-- openpower/simple_v_spec.tex | 3 +++ openpower/sv/fields.mdwn | 3 ++- 4 files changed, 21 insertions(+), 3 deletions(-) diff --git a/openpower/Makefile b/openpower/Makefile index 450bf9511..cc2b8ce3c 100755 --- 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 7a6a15745..cea39fe21 100755 --- 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 4860d9d09..7fac1c77a 100644 --- 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 8337a6dda..d58cba968 100644 --- 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" ]] -- 2.30.2