4982

7 files changed, 51 insertions, 47 deletions

diff --git a/html/subx/examples/ex10.subx.html b/html/subx/examples/ex10.subx.html
index 6d48a9c2..1a2ce066 100644
--- a/html/subx/examples/ex10.subx.html
+++ b/html/subx/examples/ex10.subx.html
@@ -18,6 +18,7 @@ a { color:inherit; }
 .subxS2Comment { color: #8a8a8a; }
 .LineNr { }
 .subxS1Comment { color: #0000af; }
+.SpecialChar { color: #d70000; }
 .subxFunction { color: #af5f00; text-decoration: underline; }
 .Constant { color: #008787; }
 .Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
@@ -70,7 +71,7 @@ if ('onhashchange' in window) {
 <span id="L12" class="LineNr">12 </span><span class="subxS1Comment"># . op          subop               mod             rm32          base        index         scale       r32</span>
 <span id="L13" class="LineNr">13 </span><span class="subxS1Comment"># . 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
 <span id="L14" class="LineNr">14 </span>
-<span id="L15" class="LineNr">15 </span><span class="subxComment"># main: return argv-equal(argv[1], argv[2])</span>
+<span id="L15" class="LineNr">15 </span><span class="SpecialChar">Entry</span>:  <span class="subxComment"># return argv-equal(argv[1], argv[2])</span>
 <span id="L16" class="LineNr">16 </span><span class="subxComment">#       At the start of a SubX program:</span>
 <span id="L17" class="LineNr">17 </span><span class="subxComment">#         argc: *ESP</span>
 <span id="L18" class="LineNr">18 </span><span class="subxComment">#         argv[0]: *(ESP+4)</span>
diff --git a/html/subx/examples/ex11.subx.html b/html/subx/examples/ex11.subx.html
index 2aa43cf3..26de0fa6 100644
--- a/html/subx/examples/ex11.subx.html
+++ b/html/subx/examples/ex11.subx.html
@@ -81,7 +81,7 @@ if ('onhashchange' in window) {
 <span id="L19" class="LineNr"> 19 </span><span class="subxS1Comment"># . op          subop               mod             rm32          base        index         scale       r32</span>
 <span id="L20" class="LineNr"> 20 </span><span class="subxS1Comment"># . 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
 <span id="L21" class="LineNr"> 21 </span>
-<span id="L22" class="LineNr"> 22 </span><span class="subxComment"># main:</span>
+<span id="L22" class="LineNr"> 22 </span><span class="SpecialChar">Entry</span>:  <span class="subxComment"># run all tests</span>
 <span id="L23" class="LineNr"> 23 </span>    e8/call  run-tests/disp32  <span class="subxComment"># 'run-tests' is a function created automatically by SubX. It calls all functions that start with 'test-'.</span>
 <span id="L24" class="LineNr"> 24 </span>    <span class="subxComment"># syscall(exit, EAX)</span>
 <span id="L25" class="LineNr"> 25 </span>    89/copy                         3/mod/direct    3/rm32/EBX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EAX to EBX</span>
@@ -405,7 +405,7 @@ if ('onhashchange' in window) {
 <span id="L343" class="LineNr">343 </span>
 <span id="L344" class="LineNr">344 </span><span class="SpecialChar">Newline</span>:
 <span id="L345" class="LineNr">345 </span>    <span class="subxComment"># size</span>
-<span id="L346" class="LineNr">346 </span>    01 00 00 00
+<span id="L346" class="LineNr">346 </span>    1/imm32
 <span id="L347" class="LineNr">347 </span>    <span class="subxComment"># data</span>
 <span id="L348" class="LineNr">348 </span>    0a/newline
 <span id="L349" class="LineNr">349 </span>
diff --git a/html/subx/examples/ex12.subx.html b/html/subx/examples/ex12.subx.html
index 88e939cb..02792b12 100644
--- a/html/subx/examples/ex12.subx.html
+++ b/html/subx/examples/ex12.subx.html
@@ -86,17 +86,17 @@ if ('onhashchange' in window) {
 <span id="L29" class="LineNr">29 </span><span class="subxComment"># various constants used here were found in the Linux sources (search for file mman-common.h)</span>
 <span id="L30" class="LineNr">30 </span><span class="SpecialChar">Mmap-new-segment</span>:  <span class="subxComment"># type mmap_arg_struct</span>
 <span id="L31" class="LineNr">31 </span>    <span class="subxComment"># addr</span>
-<span id="L32" class="LineNr">32 </span>    00 00 00 00  <span class="subxComment"># null</span>
+<span id="L32" class="LineNr">32 </span>    0/imm32
 <span id="L33" class="LineNr">33 </span>    <span class="subxComment"># len</span>
-<span id="L34" class="LineNr">34 </span>    00 01 00 00  <span class="subxComment"># 0x1000</span>
+<span id="L34" class="LineNr">34 </span>    0x100/imm32
 <span id="L35" class="LineNr">35 </span>    <span class="subxComment"># protection flags</span>
-<span id="L36" class="LineNr">36 </span>    03 00 00 00  <span class="subxComment"># PROT_READ | PROT_WRITE</span>
+<span id="L36" class="LineNr">36 </span>    3/imm32  <span class="subxComment"># PROT_READ | PROT_WRITE</span>
 <span id="L37" class="LineNr">37 </span>    <span class="subxComment"># sharing flags</span>
-<span id="L38" class="LineNr">38 </span>    22 00 00 00  <span class="subxComment"># MAP_PRIVATE | MAP_ANONYMOUS</span>
+<span id="L38" class="LineNr">38 </span>    0x22/imm32  <span class="subxComment"># MAP_PRIVATE | MAP_ANONYMOUS</span>
 <span id="L39" class="LineNr">39 </span>    <span class="subxComment"># fd</span>
-<span id="L40" class="LineNr">40 </span>    ff ff ff ff  <span class="subxComment"># -1 since MAP_ANONYMOUS is specified</span>
+<span id="L40" class="LineNr">40 </span>    -1/imm32  <span class="subxComment"># since MAP_ANONYMOUS is specified</span>
 <span id="L41" class="LineNr">41 </span>    <span class="subxComment"># offset</span>
-<span id="L42" class="LineNr">42 </span>    00 00 00 00  <span class="subxComment"># 0 since MAP_ANONYMOUS is specified</span>
+<span id="L42" class="LineNr">42 </span>    0/imm32  <span class="subxComment"># since MAP_ANONYMOUS is specified</span>
 <span id="L43" class="LineNr">43 </span>
 <span id="L44" class="LineNr">44 </span><span class="subxS2Comment"># . . vim&#0058;nowrap:textwidth=0</span>
 </pre>
diff --git a/html/subx/examples/ex4.subx.html b/html/subx/examples/ex4.subx.html
index 98c31507..917e1359 100644
--- a/html/subx/examples/ex4.subx.html
+++ b/html/subx/examples/ex4.subx.html
@@ -91,7 +91,7 @@ if ('onhashchange' in window) {
 <span id="L35" class="LineNr">35 </span>== data
 <span id="L36" class="LineNr">36 </span>
 <span id="L37" class="LineNr">37 </span><span class="SpecialChar">X</span>:
-<span id="L38" class="LineNr">38 </span>    00 00 00 00  <span class="subxComment"># space for read() to write to</span>
+<span id="L38" class="LineNr">38 </span>    0/imm32  <span class="subxComment"># space for read() to write to</span>
 <span id="L39" class="LineNr">39 </span>
 <span id="L40" class="LineNr">40 </span><span class="subxS2Comment"># . . vim&#0058;nowrap:textwidth=0</span>
 </pre>
diff --git a/html/subx/examples/ex5.subx.html b/html/subx/examples/ex5.subx.html
index 9dd1a45e..44ba1b76 100644
--- a/html/subx/examples/ex5.subx.html
+++ b/html/subx/examples/ex5.subx.html
@@ -18,6 +18,7 @@ a { color:inherit; }
 .subxS2Comment { color: #8a8a8a; }
 .LineNr { }
 .subxS1Comment { color: #0000af; }
+.SpecialChar { color: #d70000; }
 .Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
 -->
 </style>
@@ -65,37 +66,38 @@ if ('onhashchange' in window) {
 <span id="L9" class="LineNr"> 9 </span><span class="subxS1Comment"># . op          subop               mod             rm32          base        index         scale       r32</span>
 <span id="L10" class="LineNr">10 </span><span class="subxS1Comment"># . 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
 <span id="L11" class="LineNr">11 </span>
-<span id="L12" class="LineNr">12 </span><span class="subxComment"># main:</span>
-<span id="L13" class="LineNr">13 </span>    <span class="subxComment"># allocate x on the stack</span>
-<span id="L14" class="LineNr">14 </span>    81          5/subop/subtract    3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># subtract from ESP</span>
-<span id="L15" class="LineNr">15 </span>
-<span id="L16" class="LineNr">16 </span>    <span class="subxComment"># syscall(read, stdin, x, 1)</span>
-<span id="L17" class="LineNr">17 </span>    <span class="subxS1Comment"># . fd = 0 (stdin)</span>
-<span id="L18" class="LineNr">18 </span>    bb/copy-to-EBX  0/imm32
-<span id="L19" class="LineNr">19 </span>    <span class="subxS1Comment"># . data = x (location to write result to)</span>
-<span id="L20" class="LineNr">20 </span>    8d/copy-address                 1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none              1/r32/ECX   4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy ESP+4 to ECX</span>
-<span id="L21" class="LineNr">21 </span>    <span class="subxS1Comment"># . size = 1 character</span>
-<span id="L22" class="LineNr">22 </span>    ba/copy-to-EDX  1/imm32
-<span id="L23" class="LineNr">23 </span>    <span class="subxS1Comment"># . syscall</span>
-<span id="L24" class="LineNr">24 </span>    b8/copy-to-EAX  3/imm32/read
-<span id="L25" class="LineNr">25 </span>    cd/syscall  0x80/imm8
-<span id="L26" class="LineNr">26 </span>
-<span id="L27" class="LineNr">27 </span>    <span class="subxComment"># syscall(write, stdout, x, 1)</span>
-<span id="L28" class="LineNr">28 </span>    <span class="subxS1Comment"># . fd = 1 (stdout)</span>
-<span id="L29" class="LineNr">29 </span>    bb/copy-to-EBX  1/imm32
-<span id="L30" class="LineNr">30 </span>    <span class="subxS1Comment"># . data = x (location to read from)</span>
-<span id="L31" class="LineNr">31 </span>    8d/copy-address                 1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none              1/r32/ECX   4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy ESP+4 to ECX</span>
-<span id="L32" class="LineNr">32 </span>    <span class="subxS1Comment"># . size = 1 character</span>
-<span id="L33" class="LineNr">33 </span>    ba/copy-to-EDX  1/imm32
-<span id="L34" class="LineNr">34 </span>    <span class="subxS1Comment"># . syscall</span>
-<span id="L35" class="LineNr">35 </span>    b8/copy-to-EAX  4/imm32/write
-<span id="L36" class="LineNr">36 </span>    cd/syscall  0x80/imm8
-<span id="L37" class="LineNr">37 </span>
-<span id="L38" class="LineNr">38 </span>    <span class="subxComment"># syscall(exit, EBX)</span>
-<span id="L39" class="LineNr">39 </span>    b8/copy-to-EAX  1/imm32/exit
-<span id="L40" class="LineNr">40 </span>    cd/syscall  0x80/imm8
-<span id="L41" class="LineNr">41 </span>
-<span id="L42" class="LineNr">42 </span><span class="subxS2Comment"># . . vim&#0058;nowrap:textwidth=0</span>
+<span id="L12" class="LineNr">12 </span><span class="SpecialChar">Entry</span>:
+<span id="L13" class="LineNr">13 </span>
+<span id="L14" class="LineNr">14 </span>    <span class="subxComment"># allocate x on the stack</span>
+<span id="L15" class="LineNr">15 </span>    81          5/subop/subtract    3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># subtract from ESP</span>
+<span id="L16" class="LineNr">16 </span>
+<span id="L17" class="LineNr">17 </span>    <span class="subxComment"># syscall(read, stdin, x, 1)</span>
+<span id="L18" class="LineNr">18 </span>    <span class="subxS1Comment"># . fd = 0 (stdin)</span>
+<span id="L19" class="LineNr">19 </span>    bb/copy-to-EBX  0/imm32
+<span id="L20" class="LineNr">20 </span>    <span class="subxS1Comment"># . data = x (location to write result to)</span>
+<span id="L21" class="LineNr">21 </span>    8d/copy-address                 1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none              1/r32/ECX   4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy ESP+4 to ECX</span>
+<span id="L22" class="LineNr">22 </span>    <span class="subxS1Comment"># . size = 1 character</span>
+<span id="L23" class="LineNr">23 </span>    ba/copy-to-EDX  1/imm32
+<span id="L24" class="LineNr">24 </span>    <span class="subxS1Comment"># . syscall</span>
+<span id="L25" class="LineNr">25 </span>    b8/copy-to-EAX  3/imm32/read
+<span id="L26" class="LineNr">26 </span>    cd/syscall  0x80/imm8
+<span id="L27" class="LineNr">27 </span>
+<span id="L28" class="LineNr">28 </span>    <span class="subxComment"># syscall(write, stdout, x, 1)</span>
+<span id="L29" class="LineNr">29 </span>    <span class="subxS1Comment"># . fd = 1 (stdout)</span>
+<span id="L30" class="LineNr">30 </span>    bb/copy-to-EBX  1/imm32
+<span id="L31" class="LineNr">31 </span>    <span class="subxS1Comment"># . data = x (location to read from)</span>
+<span id="L32" class="LineNr">32 </span>    8d/copy-address                 1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none              1/r32/ECX   4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy ESP+4 to ECX</span>
+<span id="L33" class="LineNr">33 </span>    <span class="subxS1Comment"># . size = 1 character</span>
+<span id="L34" class="LineNr">34 </span>    ba/copy-to-EDX  1/imm32
+<span id="L35" class="LineNr">35 </span>    <span class="subxS1Comment"># . syscall</span>
+<span id="L36" class="LineNr">36 </span>    b8/copy-to-EAX  4/imm32/write
+<span id="L37" class="LineNr">37 </span>    cd/syscall  0x80/imm8
+<span id="L38" class="LineNr">38 </span>
+<span id="L39" class="LineNr">39 </span>    <span class="subxComment"># syscall(exit, EBX)</span>
+<span id="L40" class="LineNr">40 </span>    b8/copy-to-EAX  1/imm32/exit
+<span id="L41" class="LineNr">41 </span>    cd/syscall  0x80/imm8
+<span id="L42" class="LineNr">42 </span>
+<span id="L43" class="LineNr">43 </span><span class="subxS2Comment"># . . vim&#0058;nowrap:textwidth=0</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/examples/ex6.subx.html b/html/subx/examples/ex6.subx.html
index d2d01bed..dc0f4217 100644
--- a/html/subx/examples/ex6.subx.html
+++ b/html/subx/examples/ex6.subx.html
@@ -85,7 +85,7 @@ if ('onhashchange' in window) {
 <span id="L28" class="LineNr">28 </span>== data
 <span id="L29" class="LineNr">29 </span>
 <span id="L30" class="LineNr">30 </span><span class="SpecialChar">Size</span>:  <span class="subxComment"># size of string</span>
-<span id="L31" class="LineNr">31 </span>    0e 00 00 00  <span class="subxComment"># 14</span>
+<span id="L31" class="LineNr">31 </span>    0x0e/imm32  <span class="subxComment"># 14</span>
 <span id="L32" class="LineNr">32 </span><span class="SpecialChar">X</span>:  <span class="subxComment"># string to print</span>
 <span id="L33" class="LineNr">33 </span>    48 65 6c 6c 6f 2c 20 77 6f 72 6c 64 21 0a       00
 <span id="L34" class="LineNr">34 </span><span class="subxComment">#   H  e  l  l  o  ,  ␣  w  o  r  l  d  !  newline  null</span>
diff --git a/html/subx/examples/ex7.subx.html b/html/subx/examples/ex7.subx.html
index 60cd3ccc..98468078 100644
--- a/html/subx/examples/ex7.subx.html
+++ b/html/subx/examples/ex7.subx.html
@@ -151,15 +151,16 @@ if ('onhashchange' in window) {
 <span id="L94" class="LineNr"> 94 </span>== data
 <span id="L95" class="LineNr"> 95 </span>
 <span id="L96" class="LineNr"> 96 </span><span class="SpecialChar">Stream</span>:
-<span id="L97" class="LineNr"> 97 </span>    00 00 00 00
+<span id="L97" class="LineNr"> 97 </span>    0/imm32
 <span id="L98" class="LineNr"> 98 </span><span class="SpecialChar">A</span>:
-<span id="L99" class="LineNr"> 99 </span>    61 00 00 00
+<span id="L99" class="LineNr"> 99 </span>    61/imm32/A
 <span id="L100" class="LineNr">100 </span><span class="SpecialChar">B</span>:
-<span id="L101" class="LineNr">101 </span>    00 00 00 00
+<span id="L101" class="LineNr">101 </span>    0/imm32
 <span id="L102" class="LineNr">102 </span><span class="SpecialChar">Filename</span>:
 <span id="L103" class="LineNr">103 </span>    2e 66 6f 6f 00 00 00 00
-<span id="L104" class="LineNr">104 </span>
-<span id="L105" class="LineNr">105 </span><span class="subxS2Comment"># . . vim&#0058;nowrap:textwidth=0</span>
+<span id="L104" class="LineNr">104 </span><span class="subxComment">#   .  f  o  o  null</span>
+<span id="L105" class="LineNr">105 </span>
+<span id="L106" class="LineNr">106 </span><span class="subxS2Comment"># . . vim&#0058;nowrap:textwidth=0</span>
 </pre>
 </body>
 </html>