commit a2775c16789a606fae3cfe4aa7dc1fc9deae143d
author Clay Murphy <claym@google.com> Tue Mar 22 17:48:58 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Mar 22 17:48:58 2016 +0000
tree b18f181dd5ae33effbbbf4bc3367cd9eb5d8b8d2
parent c011bd167ec4aed59fb551cb12579a48f818ee1f
parent 323156c78edf3b0b6172bbf4b3d6f6968d85d279

Merge "Docs: Improve documentation about Dalvik shift operations."

src/devices/tech/dalvik/dalvik-bytecode.jd

diff --git a/src/devices/tech/dalvik/dalvik-bytecode.jd b/src/devices/tech/dalvik/dalvik-bytecode.jd
index f449bce..bfd1305 100644
--- a/src/devices/tech/dalvik/dalvik-bytecode.jd
+++ b/src/devices/tech/dalvik/dalvik-bytecode.jd
@@ -893,7 +893,15 @@
     <code>B:</code> first source register or pair (8 bits)<br/>
     <code>C:</code> second source register or pair (8 bits)</td>
   <td>Perform the identified binary operation on the two source registers,
-    storing the result in the destination register.</td>
+    storing the result in the destination register.
+    <p class="note"><strong>Note:</strong>
+    Contrary to other <code>-long</code> mathematical operations (which
+    take register pairs for both their first and their second source),
+    <code>shl-long</code>, <code>shr-long</code>, and <code>ushr-long</code>
+    take a register pair for their first source (the value to be shifted),
+    but a single register for their second source (the shifting distance).
+    </p>
+</td>
 </tr>
 <tr>
   <td>b0..cf 12x</td>
@@ -935,7 +943,17 @@
       (4 bits)<br/>
     <code>B:</code> second source register or pair (4 bits)</td>
   <td>Perform the identified binary operation on the two source registers,
-    storing the result in the first source register.</td>
+    storing the result in the first source register.
+    <p class="note"><strong>Note:</strong>
+    Contrary to other <code>-long/2addr</code> mathematical operations
+    (which take register pairs for both their destination/first source and
+    their second source), <code>shl-long/2addr</code>,
+    <code>shr-long/2addr</code>, and <code>ushr-long/2addr</code> take a
+    register pair for their destination/first source (the value to be
+    shifted), but a single register for their second source (the shifting
+    distance).
+    </p>
+  </td>
 </tr>
 <tr>
   <td>d0..d7 22s</td>
@@ -1461,21 +1479,24 @@
 </tr>
 <tr>
   <td>shl-long</td>
-  <td>int64 a, b;<br/>
+  <td>int64 a;<br/>
+    int32 b;<br/>
     int64 result = a &lt;&lt; (b &amp; 0x3f);
   </td>
   <td>Bitwise shift left (with masked argument).</td>
 </tr>
 <tr>
   <td>shr-long</td>
-  <td>int64 a, b;<br/>
+  <td>int64 a;<br/>
+    int32 b;<br/>
     int64 result = a &gt;&gt; (b &amp; 0x3f);
   </td>
   <td>Bitwise signed shift right (with masked argument).</td>
 </tr>
 <tr>
   <td>ushr-long</td>
-  <td>uint64 a, b;<br/>
+  <td>uint64 a;<br/>
+    int32 b;<br/>
     int64 result = a &gt;&gt; (b &amp; 0x3f);
   </td>
   <td>Bitwise unsigned shift right (with masked argument).</td>