4817

4 files changed, 15 insertions, 14 deletions

diff --git a/html/subx/053new_segment.subx.html b/html/subx/053new_segment.subx.html
index 8e448bd7..cb34eb86 100644
--- a/html/subx/053new_segment.subx.html
+++ b/html/subx/053new_segment.subx.html
@@ -24,6 +24,7 @@ body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color:
 .subxS1Comment { color:#2d8cff; }
 .CommentedCode { color: #6c6c6c; }
 .subxFunction { color: #ff8700; }
+.subxMinorFunction { color: #875f5f; }
 .subxH1Comment { color:#00ffff; }
 -->
 </style>
@@ -89,13 +90,13 @@ if ('onhashchange' in window) {
 <span id="L27" class="LineNr">27 </span>    55/push-EBP
 <span id="L28" class="LineNr">28 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                      <span class="subxComment"># copy ESP to EBP</span>
 <span id="L29" class="LineNr">29 </span>    53/push-EBX
-<span id="L30" class="LineNr">30 </span>    <span class="subxComment"># copy len to mmap-new-segment.len</span>
-<span id="L31" class="LineNr">31 </span>    <span class="subxComment"># TODO: compute mmap-new-segment+4 before runtime</span>
+<span id="L30" class="LineNr">30 </span>    <span class="subxComment"># copy len to _mmap-new-segment.len</span>
+<span id="L31" class="LineNr">31 </span>    <span class="subxComment"># TODO: compute _mmap-new-segment+4 before runtime</span>
 <span id="L32" class="LineNr">32 </span>    8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>          0/r32/EAX   8/disp8        <span class="CommentedCode"> . </span>                      <span class="subxComment"># copy *(EBP+8) to EAX</span>
-<span id="L33" class="LineNr">33 </span>    bb/copy-to-EBX  mmap-new-segment/imm32
+<span id="L33" class="LineNr">33 </span>    bb/copy-to-EBX  _mmap-new-segment/imm32
 <span id="L34" class="LineNr">34 </span>    89/copy                         1/mod/*+disp8   3/rm32/EBX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          0/r32/EAX   4/disp8        <span class="CommentedCode"> . </span>                      <span class="subxComment"># copy EAX to *(EBX+4)</span>
-<span id="L35" class="LineNr">35 </span>    <span class="subxComment"># mmap(mmap-new-segment)</span>
-<span id="L36" class="LineNr">36 </span>    bb/copy-to-EBX  mmap-new-segment/imm32
+<span id="L35" class="LineNr">35 </span>    <span class="subxComment"># mmap(_mmap-new-segment)</span>
+<span id="L36" class="LineNr">36 </span>    bb/copy-to-EBX  _mmap-new-segment/imm32
 <span id="L37" class="LineNr">37 </span>    b8/copy-to-EAX  0x5a/imm32/mmap
 <span id="L38" class="LineNr">38 </span>    cd/syscall  0x80/imm8
 <span id="L39" class="LineNr">39 </span>    <span class="subxS1Comment"># . epilog</span>
@@ -107,7 +108,7 @@ if ('onhashchange' in window) {
 <span id="L45" class="LineNr">45 </span>== data
 <span id="L46" class="LineNr">46 </span>
 <span id="L47" class="LineNr">47 </span><span class="subxComment"># various constants used here were found in the Linux sources (search for file mman-common.h)</span>
-<span id="L48" class="LineNr">48 </span><span class="subxFunction">mmap-new-segment</span>:  <span class="subxComment"># type mmap_arg_struct</span>
+<span id="L48" class="LineNr">48 </span><span class="subxMinorFunction">_mmap-new-segment</span>:  <span class="subxComment"># type mmap_arg_struct</span>
 <span id="L49" class="LineNr">49 </span>    <span class="subxComment"># addr</span>
 <span id="L50" class="LineNr">50 </span>    00 00 00 00  <span class="subxComment"># null</span>
 <span id="L51" class="LineNr">51 </span>    <span class="subxComment"># len</span>
diff --git a/html/subx/examples/ex6.subx.html b/html/subx/examples/ex6.subx.html
index fb8b5bd7..d73c43b3 100644
--- a/html/subx/examples/ex6.subx.html
+++ b/html/subx/examples/ex6.subx.html
@@ -92,7 +92,7 @@ if ('onhashchange' in window) {
 <span id="L31" class="LineNr">31 </span>    0e 00 00 00  <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>
+<span id="L34" class="LineNr">34 </span><span class="subxComment">#   H  e  l  l  o  ,  ␣  w  o  r  l  d  !  newline  null</span>
 <span id="L35" class="LineNr">35 </span>
 <span id="L36" class="LineNr">36 </span><span class="subxS2Comment"># . . vim&#0058;nowrap:textwidth=0</span>
 </pre>
diff --git a/subx/053new_segment.subx b/subx/053new_segment.subx
index 25efaf94..d12c94a0 100644
--- a/subx/053new_segment.subx
+++ b/subx/053new_segment.subx
@@ -27,13 +27,13 @@ new-segment:  # len : int -> address
     55/push-EBP
     89/copy                         3/mod/direct    5/rm32/EBP    .           .             .           4/r32/ESP   .               .                       # copy ESP to EBP
     53/push-EBX
-    # copy len to mmap-new-segment.len
-    # TODO: compute mmap-new-segment+4 before runtime
+    # copy len to _mmap-new-segment.len
+    # TODO: compute _mmap-new-segment+4 before runtime
     8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none  .           0/r32/EAX   8/disp8         .                       # copy *(EBP+8) to EAX
-    bb/copy-to-EBX  mmap-new-segment/imm32
+    bb/copy-to-EBX  _mmap-new-segment/imm32
     89/copy                         1/mod/*+disp8   3/rm32/EBX    .           .             .           0/r32/EAX   4/disp8         .                       # copy EAX to *(EBX+4)
-    # mmap(mmap-new-segment)
-    bb/copy-to-EBX  mmap-new-segment/imm32
+    # mmap(_mmap-new-segment)
+    bb/copy-to-EBX  _mmap-new-segment/imm32
     b8/copy-to-EAX  0x5a/imm32/mmap
     cd/syscall  0x80/imm8
     # . epilog
@@ -45,7 +45,7 @@ new-segment:  # len : int -> address
 == data
 
 # various constants used here were found in the Linux sources (search for file mman-common.h)
-mmap-new-segment:  # type mmap_arg_struct
+_mmap-new-segment:  # type mmap_arg_struct
     # addr
     00 00 00 00  # null
     # len
diff --git a/subx/examples/ex6.subx b/subx/examples/ex6.subx
index 8b3637f6..c0bce83c 100644
--- a/subx/examples/ex6.subx
+++ b/subx/examples/ex6.subx
@@ -31,6 +31,6 @@ Size:  # size of string
     0e 00 00 00  # 14
 X:  # string to print
     48 65 6c 6c 6f 2c 20 77 6f 72 6c 64 21 0a       00
-# H  e  l  l  o  ,  ␣  w  o  r  l  d  !  newline  null
+#   H  e  l  l  o  ,  ␣  w  o  r  l  d  !  newline  null
 
 # . . vim:nowrap:textwidth=0