Minor fixes/improvements, update copyright

rswinkle · rswinkle · commit aafa0f69988e · 2022-01-08T13:14:15.000-07:00
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 
 All book related files are
-(C) 2021 http://robertwinkler.com[Robert Winkler]
+(C) 2021-2022 http://robertwinkler.com[Robert Winkler]
 
 Licensed under https://creativecommons.org/licenses/by-nc-sa/4.0/[Creative Commons].
 
diff --git a/book.adoc b/book.adoc
@@ -2,7 +2,7 @@
 
 = MIPS Assembly Programmming
 Robert Winkler <mips@robertwinkler.com>
-v0.9.7, 2021-09-28: Beta
+v0.9.8, 2022-01-08: Beta
 :toc:
 
 //include::contents.adoc[]
diff --git a/ch7.adoc b/ch7.adoc
@@ -50,7 +50,7 @@ it, even less than I would in a higher level language.
 . *Put the `.data` section at the top, similar to declaring globals in C.*
 +
 There are exceptions for this.  When dealing with a larger program with lots
-of strings, it can be convienent to have multiple `.data` sections with the
+of strings, it can be convenient to have multiple `.data` sections with the
 strings you're using declared close to where you use them.  The downside is
 you have to keep swapping back and forth between `.text` and `.data`.
 
@@ -477,7 +477,7 @@ include::pseudo_equivalents_pdf.adoc[]
 endif::[]
 
 You can see how you use the non-pseudoinstructions to match the same behavior, and
-there's often (usually) more than one way.  Of all of them, the `ble` and `bge` are
+there's often (usually) more than one way.  Of all of them, `ble` is
 the worst, because what was 1 instruction becomes 3, and you'll sometimes need an
 extra register to hold the "plus 1" value if you still need the original.
 
diff --git a/info.adoc b/info.adoc
@@ -1,6 +1,6 @@
 == Info
 
-Copyright (C) 2021 http://robertwinkler.com[Robert Winkler]
+Copyright (C) 2021-2022 http://robertwinkler.com[Robert Winkler]
 
 Licensed under https://creativecommons.org/licenses/by-nc-sa/4.0/[Creative Commons].
 
diff --git a/mips_book.html b/mips_book.html
@@ -521,8 +521,8 @@ <h1>MIPS Assembly Programmming</h1>
 <div class="details">
 <span id="author" class="author">Robert Winkler</span><br>
 <span id="email" class="email"><a href="mailto:mips@robertwinkler.com">mips@robertwinkler.com</a></span><br>
-<span id="revnumber">version 0.9.7,</span>
-<span id="revdate">2021-09-28</span>
+<span id="revnumber">version 0.9.8,</span>
+<span id="revdate">2022-01-08</span>
 <br><span id="revremark">Beta</span>
 </div>
 <div id="toc" class="toc">
@@ -599,7 +599,7 @@ <h1>MIPS Assembly Programmming</h1>
 <h2 id="_info">Info</h2>
 <div class="sectionbody">
 <div class="paragraph">
-<p>Copyright &#169; 2021 <a href="http://robertwinkler.com">Robert Winkler</a></p>
+<p>Copyright &#169; 2021-2022 <a href="http://robertwinkler.com">Robert Winkler</a></p>
 </div>
 <div class="paragraph">
 <p>Licensed under <a href="https://creativecommons.org/licenses/by-nc-sa/4.0/">Creative Commons</a>.</p>
@@ -4268,7 +4268,7 @@ <h3 id="_formatting">Formatting</h3>
 <p><strong>Put the <code>.data</code> section at the top, similar to declaring globals in C.</strong></p>
 <div class="paragraph">
 <p>There are exceptions for this.  When dealing with a larger program with lots
-of strings, it can be convienent to have multiple <code>.data</code> sections with the
+of strings, it can be convenient to have multiple <code>.data</code> sections with the
 strings you&#8217;re using declared close to where you use them.  The downside is
 you have to keep swapping back and forth between <code>.text</code> and <code>.data</code>.</p>
 </div>
@@ -5200,6 +5200,14 @@ <h3 id="_no_pseudoinstructions_allowed">No Pseudoinstructions Allowed</h3>
 bne   $t2, $0, label</pre>
 </div>
 </div>
+<div class="literalblock">
+<div class="content">
+<pre># or if you're counting up and
+# you know they'll be equal,
+# you can simplify to
+bne   $t0, $t1, label</pre>
+</div>
+</div>
 <hr></div></td>
 </tr>
 <tr>
@@ -5227,9 +5235,19 @@ <h3 id="_no_pseudoinstructions_allowed">No Pseudoinstructions Allowed</h3>
 </div></div></td>
 <td class="tableblock halign-left valign-top"><div class="content"><div class="literalblock">
 <div class="content">
-<pre># add 1 to change &lt;= to &lt;
-addi   $t1, $t1, 1
+<pre># test for &lt; and = separately
 slt    $t2, $t0, $t1
+bne    $t2, $0, label
+beq    $t0, $t1, label</pre>
+</div>
+</div>
+<div class="literalblock">
+<div class="content">
+<pre># or add 1 to change &lt;= to &lt;
+# use a spare reg if you need
+# to preserve the original value
+addi   $t3, $t1, 1
+slt    $t2, $t0, $t3
 bne    $t2, $0, label</pre>
 </div>
 </div>
@@ -5256,7 +5274,7 @@ <h3 id="_no_pseudoinstructions_allowed">No Pseudoinstructions Allowed</h3>
 </table>
 <div class="paragraph">
 <p>You can see how you use the non-pseudoinstructions to match the same behavior, and
-there&#8217;s often (usually) more than one way.  Of all of them, the <code>ble</code> and <code>bge</code> are
+there&#8217;s often (usually) more than one way.  Of all of them, <code>ble</code> is
 the worst, because what was 1 instruction becomes 3, and you&#8217;ll sometimes need an
 extra register to hold the "plus 1" value if you still need the original.</p>
 </div>
@@ -5514,8 +5532,8 @@ <h2 id="_references_and_useful_links">References and Useful Links</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Version 0.9.7<br>
-Last updated 2021-12-28 13:52:39 -0700
+Version 0.9.8<br>
+Last updated 2022-01-08 13:07:18 -0700
 </div>
 </div>
 </body>
diff --git a/mips_book.pdf b/mips_book.pdf
diff --git a/pseudo_equivalents.adoc b/pseudo_equivalents.adoc
@@ -53,6 +53,11 @@
  slt   $t2, $t0, $t1
  bne   $t2, $0, label
 
+ # or if you're counting up and
+ # you know they'll be equal,
+ # you can simplify to
+ bne   $t0, $t1, label
+
 '''
 
 | Branch Greater Than |
@@ -69,10 +74,17 @@
 
  ble  $t0, $t1, label |
 
- # add 1 to change <= to <
- addi   $t1, $t1, 1
+ # test for < and = separately
  slt    $t2, $t0, $t1
  bne    $t2, $0, label
+ beq    $t0, $t1, label
+
+ # or add 1 to change <= to <
+ # use a spare reg if you need
+ # to preserve the original value
+ addi   $t3, $t1, 1
+ slt    $t2, $t0, $t3
+ bne    $t2, $0, label
 
 '''
 
diff --git a/pseudo_equivalents_pdf.adoc b/pseudo_equivalents_pdf.adoc
@@ -44,6 +44,11 @@
  slt   $t2, $t0, $t1
  bne   $t2, $0, label
 
+ # or if you're counting up and
+ # you know they'll be equal,
+ # you can simplify to
+ bne   $t0, $t1, label
+
 | Branch Greater Than |
 
  bgt  $t0, $t1, label |
@@ -56,10 +61,17 @@
 
  ble  $t0, $t1, label |
 
- # add 1 to change <= to <
- addi   $t1, $t1, 1
+ # test for < and = separately
  slt    $t2, $t0, $t1
  bne    $t2, $0, label
+ beq    $t0, $t1, label
+
+ # or add 1 to change <= to <
+ # use a spare reg if you need
+ # to preserve the original value
+ addi   $t3, $t1, 1
+ slt    $t2, $t0, $t3
+ bne    $t2, $0, label
 
 | Branch Greater Than or Equal |
 
