say how it's sorted

diff --git a/iwjpictest/Makefile b/iwjpictest/Makefile
index fab06cd87d67e2d32e77251773b2a8be2a6791c6..71c11fa2d74e9535c35d04b9a1ebb8a302fd0bae 100644 (file)
--- a/iwjpictest/Makefile
+++ b/iwjpictest/Makefile
@@ -1,6 +1,8 @@
 TARGETS=       config.hex $(INSN_TARGETS)
 
-INSN_TARGETS=  insn-aliases.inc insn-1.ps insn-2.ps
+INSN_TARGETS=  insn-aliases.inc \
+               insn-1.txt insn-2.txt \
+               insn-1.ps insn-2.ps
 
 PROGRAMS=      flasher copybits serialloop
 
@@ -14,10 +16,10 @@ insn-aliases.inc:   insn-aliases.inc-gen
                ./$< --macros $o
 
 insn-%.txt:    insn-aliases.inc-gen Makefile
-               sed -e '1,/^#--1--/d; /^#--2--/,$$d' <$< >$@.1.tmp
+               sed -e '1,/^#--$*--/d; /^#--0--/,$$d' <$< >$@.1.tmp
                ./$< --descs >$@.2.tmp
                sort -t % -k 1.$(subst 2,28,$*) <$@.2.tmp >>$@.1.tmp
-               sed -e '1,/^#--2--/d; /^#--3--/,$$d' <$< >>$@.1.tmp
+               sed -e '1,/^#--3--/d; /^#--0--/,$$d' <$< >>$@.1.tmp
                mv -f $@.1.tmp $@
 
 insn-%.ps:     insn-%.txt

diff --git a/iwjpictest/insn-aliases.inc-gen b/iwjpictest/insn-aliases.inc-gen
index 8b499ce59a59ace171251e7e752c1f92a7d73ee7..8477096c7f9cc52fc1ebd8cdf0b5140bff78986e 100755 (executable)
--- a/iwjpictest/insn-aliases.inc-gen
+++ b/iwjpictest/insn-aliases.inc-gen
@@ -165,13 +165,22 @@ if $macros; then echo ' ; the end'; fi
 
 exit 0
 #--1--
+PIC18F458 INSTRUCTIONS AND PROVIDED OPCODE ALIASES  sorted by OPCODE/ALIAS
+
 Our opcode     Args  Notes Description                            Official
  ------------- ------ ---- --------------------------------------- -------
+#--0--
 #--2--
+PIC18F458 INSTRUCTIONS AND PROVIDED OPCODE ALIASES   sorted by DESCRIPTION
+
+Our opcode     Args  Notes Description                            Official
+ ------------- ------ ---- --------------------------------------- -------
+#--0--
+#--3--
  ------------- ------ ---- --------------------------------------- -------
 Notes:  R  Branch uses relative offset.
         A  Uses BSR for F iff F address is not in Access Bank.  There are
            also <op>_<how>a (always uses access bank) and <op>_<how>b
            (always uses BSR).  (<op>_<how>[ab]_if<what> for conditionals.)
     digits Gives number of bits of address or offset.
-#--3--
+#--0--