about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorKartik Agaram <vc@akkartik.com>2018-12-04 08:18:07 -0800
committerKartik Agaram <vc@akkartik.com>2018-12-04 09:56:23 -0800
commit381d80f8a4dc52849564eba1b9245118bc1d84e1 (patch)
treec8060547a8bbd63b3d715156d39da33f9dca2be7
parenta9cce7121a684e80c1a2fb491bffa28dbcbe1df9 (diff)
downloadmu-381d80f8a4dc52849564eba1b9245118bc1d84e1.tar.gz
4834
Fix CI since 4827.
-rw-r--r--html/subx/056write.subx.html137
-rw-r--r--subx/056write.subx9
-rwxr-xr-xsubx/apps/crenshaw2-1bin7038 -> 6980 bytes
-rwxr-xr-xsubx/apps/crenshaw2-1bbin7599 -> 7541 bytes
-rwxr-xr-xsubx/apps/factorialbin5929 -> 5871 bytes
5 files changed, 64 insertions, 82 deletions
diff --git a/html/subx/056write.subx.html b/html/subx/056write.subx.html
index 727bda6b..442c7eff 100644
--- a/html/subx/056write.subx.html
+++ b/html/subx/056write.subx.html
@@ -201,80 +201,71 @@ if ('onhashchange' in window) {
 <span id="L136" class="LineNr">136 </span>    e8/call  write/disp32
 <span id="L137" class="LineNr">137 </span>    <span class="subxS2Comment"># . . discard args</span>
 <span id="L138" class="LineNr">138 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L139" class="LineNr">139 </span>    <span class="subxComment"># check-ints-equal(EAX, 2, msg)</span>
+<span id="L139" class="LineNr">139 </span>    <span class="subxComment"># check-ints-equal(*_test-stream-&gt;data, 41/A 62/b 00 00, msg)</span>
 <span id="L140" class="LineNr">140 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L141" class="LineNr">141 </span>    68/push  <span class="Constant">&quot;F - test-read-single: return EAX&quot;</span>/imm32
-<span id="L142" class="LineNr">142 </span>    68/push  2/imm32
-<span id="L143" class="LineNr">143 </span>    50/push-EAX
-<span id="L144" class="LineNr">144 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L145" class="LineNr">145 </span>    e8/call  check-ints-equal/disp32
-<span id="L146" class="LineNr">146 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L147" class="LineNr">147 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
-<span id="L148" class="LineNr">148 </span>    <span class="subxComment"># check-ints-equal(*_test-stream-&gt;data, 41/A 62/b 00 00, msg)</span>
-<span id="L149" class="LineNr">149 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L150" class="LineNr">150 </span>    68/push  <span class="Constant">&quot;F - test-write-single&quot;</span>/imm32
-<span id="L151" class="LineNr">151 </span>    68/push  0x006241/imm32/Ab
-<span id="L152" class="LineNr">152 </span>    <span class="subxS2Comment"># . . push *_test-stream-&gt;data</span>
-<span id="L153" class="LineNr">153 </span>    b8/copy-to-EAX  _test-stream/imm32
-<span id="L154" class="LineNr">154 </span>    ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EAX+12)</span>
-<span id="L155" class="LineNr">155 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L156" class="LineNr">156 </span>    e8/call  check-ints-equal/disp32
-<span id="L157" class="LineNr">157 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L158" class="LineNr">158 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
-<span id="L159" class="LineNr">159 </span>    <span class="subxComment"># end</span>
-<span id="L160" class="LineNr">160 </span>    c3/return
-<span id="L161" class="LineNr">161 </span>
-<span id="L162" class="LineNr">162 </span><span class="subxTest">test-write-appends</span>:
-<span id="L163" class="LineNr">163 </span>    <span class="subxComment"># clear-stream(_test-stream)</span>
-<span id="L164" class="LineNr">164 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L165" class="LineNr">165 </span>    68/push  _test-stream/imm32
-<span id="L166" class="LineNr">166 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L167" class="LineNr">167 </span>    e8/call  clear-stream/disp32
-<span id="L168" class="LineNr">168 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L169" class="LineNr">169 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L170" class="LineNr">170 </span>    <span class="subxComment"># write(_test-stream, &quot;C&quot;)</span>
-<span id="L171" class="LineNr">171 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L172" class="LineNr">172 </span>    68/push  <span class="Constant">&quot;C&quot;</span>/imm32
-<span id="L173" class="LineNr">173 </span>    68/push  _test-stream/imm32
-<span id="L174" class="LineNr">174 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L175" class="LineNr">175 </span>    e8/call  write/disp32
-<span id="L176" class="LineNr">176 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L177" class="LineNr">177 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L178" class="LineNr">178 </span>    <span class="subxComment"># write(_test-stream, &quot;D&quot;)</span>
-<span id="L179" class="LineNr">179 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L180" class="LineNr">180 </span>    68/push  <span class="Constant">&quot;D&quot;</span>/imm32
-<span id="L181" class="LineNr">181 </span>    68/push  _test-stream/imm32
-<span id="L182" class="LineNr">182 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L183" class="LineNr">183 </span>    e8/call  write/disp32
-<span id="L184" class="LineNr">184 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L185" class="LineNr">185 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L186" class="LineNr">186 </span>    <span class="subxComment"># check-ints-equal(*_test-stream-&gt;data, 43/C 44/D 00 00, msg)</span>
-<span id="L187" class="LineNr">187 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L188" class="LineNr">188 </span>    68/push  <span class="Constant">&quot;F - test-write-appends&quot;</span>/imm32
-<span id="L189" class="LineNr">189 </span>    68/push  0x00004443/imm32/C-D
-<span id="L190" class="LineNr">190 </span>    <span class="subxS2Comment"># . . push *_test-stream-&gt;data</span>
-<span id="L191" class="LineNr">191 </span>    b8/copy-to-EAX  _test-stream/imm32
-<span id="L192" class="LineNr">192 </span>    ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EAX+12)</span>
-<span id="L193" class="LineNr">193 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L194" class="LineNr">194 </span>    e8/call  check-ints-equal/disp32
-<span id="L195" class="LineNr">195 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L196" class="LineNr">196 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
-<span id="L197" class="LineNr">197 </span>    <span class="subxComment"># end</span>
-<span id="L198" class="LineNr">198 </span>    c3/return
-<span id="L199" class="LineNr">199 </span>
-<span id="L200" class="LineNr">200 </span>== data
-<span id="L201" class="LineNr">201 </span>
-<span id="L202" class="LineNr">202 </span><span class="subxMinorFunction">_test-stream</span>:
-<span id="L203" class="LineNr">203 </span>    <span class="subxComment"># current write index</span>
-<span id="L204" class="LineNr">204 </span>    00 00 00 00
-<span id="L205" class="LineNr">205 </span>    <span class="subxComment"># current read index</span>
-<span id="L206" class="LineNr">206 </span>    00 00 00 00
-<span id="L207" class="LineNr">207 </span>    <span class="subxComment"># length (= 8)</span>
-<span id="L208" class="LineNr">208 </span>    08 00 00 00
-<span id="L209" class="LineNr">209 </span>    <span class="subxComment"># data</span>
-<span id="L210" class="LineNr">210 </span>    00 00 00 00 00 00 00 00  <span class="subxComment"># 8 bytes</span>
-<span id="L211" class="LineNr">211 </span>
-<span id="L212" class="LineNr">212 </span><span class="subxS2Comment"># . . vim&#0058;nowrap:textwidth=0</span>
+<span id="L141" class="LineNr">141 </span>    68/push  <span class="Constant">&quot;F - test-write-single&quot;</span>/imm32
+<span id="L142" class="LineNr">142 </span>    68/push  0x006241/imm32/Ab
+<span id="L143" class="LineNr">143 </span>    <span class="subxS2Comment"># . . push *_test-stream-&gt;data</span>
+<span id="L144" class="LineNr">144 </span>    b8/copy-to-EAX  _test-stream/imm32
+<span id="L145" class="LineNr">145 </span>    ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EAX+12)</span>
+<span id="L146" class="LineNr">146 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L147" class="LineNr">147 </span>    e8/call  check-ints-equal/disp32
+<span id="L148" class="LineNr">148 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L149" class="LineNr">149 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L150" class="LineNr">150 </span>    <span class="subxComment"># end</span>
+<span id="L151" class="LineNr">151 </span>    c3/return
+<span id="L152" class="LineNr">152 </span>
+<span id="L153" class="LineNr">153 </span><span class="subxTest">test-write-appends</span>:
+<span id="L154" class="LineNr">154 </span>    <span class="subxComment"># clear-stream(_test-stream)</span>
+<span id="L155" class="LineNr">155 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L156" class="LineNr">156 </span>    68/push  _test-stream/imm32
+<span id="L157" class="LineNr">157 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L158" class="LineNr">158 </span>    e8/call  clear-stream/disp32
+<span id="L159" class="LineNr">159 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L160" class="LineNr">160 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L161" class="LineNr">161 </span>    <span class="subxComment"># write(_test-stream, &quot;C&quot;)</span>
+<span id="L162" class="LineNr">162 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L163" class="LineNr">163 </span>    68/push  <span class="Constant">&quot;C&quot;</span>/imm32
+<span id="L164" class="LineNr">164 </span>    68/push  _test-stream/imm32
+<span id="L165" class="LineNr">165 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L166" class="LineNr">166 </span>    e8/call  write/disp32
+<span id="L167" class="LineNr">167 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L168" class="LineNr">168 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L169" class="LineNr">169 </span>    <span class="subxComment"># write(_test-stream, &quot;D&quot;)</span>
+<span id="L170" class="LineNr">170 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L171" class="LineNr">171 </span>    68/push  <span class="Constant">&quot;D&quot;</span>/imm32
+<span id="L172" class="LineNr">172 </span>    68/push  _test-stream/imm32
+<span id="L173" class="LineNr">173 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L174" class="LineNr">174 </span>    e8/call  write/disp32
+<span id="L175" class="LineNr">175 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L176" class="LineNr">176 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L177" class="LineNr">177 </span>    <span class="subxComment"># check-ints-equal(*_test-stream-&gt;data, 43/C 44/D 00 00, msg)</span>
+<span id="L178" class="LineNr">178 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L179" class="LineNr">179 </span>    68/push  <span class="Constant">&quot;F - test-write-appends&quot;</span>/imm32
+<span id="L180" class="LineNr">180 </span>    68/push  0x00004443/imm32/C-D
+<span id="L181" class="LineNr">181 </span>    <span class="subxS2Comment"># . . push *_test-stream-&gt;data</span>
+<span id="L182" class="LineNr">182 </span>    b8/copy-to-EAX  _test-stream/imm32
+<span id="L183" class="LineNr">183 </span>    ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EAX+12)</span>
+<span id="L184" class="LineNr">184 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L185" class="LineNr">185 </span>    e8/call  check-ints-equal/disp32
+<span id="L186" class="LineNr">186 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L187" class="LineNr">187 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L188" class="LineNr">188 </span>    <span class="subxComment"># end</span>
+<span id="L189" class="LineNr">189 </span>    c3/return
+<span id="L190" class="LineNr">190 </span>
+<span id="L191" class="LineNr">191 </span>== data
+<span id="L192" class="LineNr">192 </span>
+<span id="L193" class="LineNr">193 </span><span class="subxMinorFunction">_test-stream</span>:
+<span id="L194" class="LineNr">194 </span>    <span class="subxComment"># current write index</span>
+<span id="L195" class="LineNr">195 </span>    00 00 00 00
+<span id="L196" class="LineNr">196 </span>    <span class="subxComment"># current read index</span>
+<span id="L197" class="LineNr">197 </span>    00 00 00 00
+<span id="L198" class="LineNr">198 </span>    <span class="subxComment"># length (= 8)</span>
+<span id="L199" class="LineNr">199 </span>    08 00 00 00
+<span id="L200" class="LineNr">200 </span>    <span class="subxComment"># data</span>
+<span id="L201" class="LineNr">201 </span>    00 00 00 00 00 00 00 00  <span class="subxComment"># 8 bytes</span>
+<span id="L202" class="LineNr">202 </span>
+<span id="L203" class="LineNr">203 </span><span class="subxS2Comment"># . . vim&#0058;nowrap:textwidth=0</span>
 </pre>
 </body>
 </html>
diff --git a/subx/056write.subx b/subx/056write.subx
index c76d0737..64856f97 100644
--- a/subx/056write.subx
+++ b/subx/056write.subx
@@ -136,15 +136,6 @@ test-write-single:
     e8/call  write/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               8/imm32           # add to ESP
-    # check-ints-equal(EAX, 2, msg)
-    # . . push args
-    68/push  "F - test-read-single: return EAX"/imm32
-    68/push  2/imm32
-    50/push-EAX
-    # . . call
-    e8/call  check-ints-equal/disp32
-    # . . discard args
-    81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               0xc/imm32         # add to ESP
     # check-ints-equal(*_test-stream->data, 41/A 62/b 00 00, msg)
     # . . push args
     68/push  "F - test-write-single"/imm32
diff --git a/subx/apps/crenshaw2-1 b/subx/apps/crenshaw2-1
index 744fdc59..5092e428 100755
--- a/subx/apps/crenshaw2-1
+++ b/subx/apps/crenshaw2-1
Binary files differdiff --git a/subx/apps/crenshaw2-1b b/subx/apps/crenshaw2-1b
index 4e1a6cf3..43f62080 100755
--- a/subx/apps/crenshaw2-1b
+++ b/subx/apps/crenshaw2-1b
Binary files differdiff --git a/subx/apps/factorial b/subx/apps/factorial
index 5eed1795..ae38f80a 100755
--- a/subx/apps/factorial
+++ b/subx/apps/factorial
Binary files differ