Merge "Return unsigned shorts in ShortArrayCodeInput." into dalvik-dev

1 files changed, 7 insertions, 7 deletions

diff --git a/dx/src/com/android/dx/io/instructions/ShortArrayCodeInput.java b/dx/src/com/android/dx/io/instructions/ShortArrayCodeInput.java
index 03897c906..49ce47382 100644
--- a/dx/src/com/android/dx/io/instructions/ShortArrayCodeInput.java
+++ b/dx/src/com/android/dx/io/instructions/ShortArrayCodeInput.java
@@ -47,7 +47,7 @@ public final class ShortArrayCodeInput extends BaseCodeCursor
         try {
             int value = array[cursor()];
             advance(1);
-            return value;
+            return value & 0xffff;
         } catch (ArrayIndexOutOfBoundsException ex) {
             throw new EOFException();
         }
@@ -55,18 +55,18 @@ public final class ShortArrayCodeInput extends BaseCodeCursor
 
     /** @inheritDoc */
     public int readInt() throws EOFException {
-        int short0 = read() & 0xffff;
-        int short1 = read() & 0xffff;
+        int short0 = read();
+        int short1 = read();
 
         return short0 | (short1 << 16);
     }
 
     /** @inheritDoc */
     public long readLong() throws EOFException {
-        long short0 = read() & 0xffff;
-        long short1 = read() & 0xffff;
-        long short2 = read() & 0xffff;
-        long short3 = read() & 0xffff;
+        long short0 = read();
+        long short1 = read();
+        long short2 = read();
+        long short3 = read();
 
         return short0 | (short1 << 16) | (short2 << 32) | (short3 << 48);
     }