Mercurial > hg > graal-compiler

diff graal/com.oracle.max.asm/src/com/oracle/max/asm/Buffer.java @ 4142:bc8527f3071c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Adjust code base to new level of warnings.
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Sun, 18 Dec 2011 05:24:06 +0100
parents e233f5660da4
children
line wrap: on
line diff
--- a/graal/com.oracle.max.asm/src/com/oracle/max/asm/Buffer.java	Sun Dec 18 05:23:52 2011 +0100
+++ b/graal/com.oracle.max.asm/src/com/oracle/max/asm/Buffer.java	Sun Dec 18 05:24:06 2011 +0100
@@ -112,9 +112,10 @@
 
     public int emitByte(int b, int pos) {
         assert NumUtil.isUByte(b);
-        ensureSize(pos + 1);
-        data[pos++] = (byte) (b & 0xFF);
-        return pos;
+        int newPos = pos + 1;
+        ensureSize(newPos);
+        data[pos] = (byte) (b & 0xFF);
+        return newPos;
     }
 
     public abstract int emitShort(int b, int pos);
@@ -135,34 +136,37 @@
         @Override
         public int emitShort(int b, int pos) {
             assert NumUtil.isUShort(b);
+            int newPos = pos + 2;
             ensureSize(pos + 2);
-            data[pos++] = (byte) ((b >> 8) & 0xFF);
-            data[pos++] = (byte) (b & 0xFF);
-            return pos;
+            data[pos] = (byte) ((b >> 8) & 0xFF);
+            data[pos + 1] = (byte) (b & 0xFF);
+            return newPos;
         }
 
         @Override
         public int emitInt(int b, int pos) {
-            ensureSize(pos + 4);
-            data[pos++] = (byte) ((b >> 24) & 0xFF);
-            data[pos++] = (byte) ((b >> 16) & 0xFF);
-            data[pos++] = (byte) ((b >> 8) & 0xFF);
-            data[pos++] = (byte) (b & 0xFF);
-            return pos;
+            int newPos = pos + 4;
+            ensureSize(newPos);
+            data[pos] = (byte) ((b >> 24) & 0xFF);
+            data[pos + 1] = (byte) ((b >> 16) & 0xFF);
+            data[pos + 2] = (byte) ((b >> 8) & 0xFF);
+            data[pos + 3] = (byte) (b & 0xFF);
+            return newPos;
         }
 
         @Override
         public int emitLong(long b, int pos) {
-            ensureSize(pos + 8);
-            data[pos++] = (byte) ((b >> 56) & 0xFF);
-            data[pos++] = (byte) ((b >> 48) & 0xFF);
-            data[pos++] = (byte) ((b >> 40) & 0xFF);
-            data[pos++] = (byte) ((b >> 32) & 0xFF);
-            data[pos++] = (byte) ((b >> 24) & 0xFF);
-            data[pos++] = (byte) ((b >> 16) & 0xFF);
-            data[pos++] = (byte) ((b >> 8) & 0xFF);
-            data[pos++] = (byte) (b & 0xFF);
-            return pos;
+            int newPos = pos + 8;
+            ensureSize(newPos);
+            data[pos] = (byte) ((b >> 56) & 0xFF);
+            data[pos + 1] = (byte) ((b >> 48) & 0xFF);
+            data[pos + 2] = (byte) ((b >> 40) & 0xFF);
+            data[pos + 3] = (byte) ((b >> 32) & 0xFF);
+            data[pos + 4] = (byte) ((b >> 24) & 0xFF);
+            data[pos + 5] = (byte) ((b >> 16) & 0xFF);
+            data[pos + 6] = (byte) ((b >> 8) & 0xFF);
+            data[pos + 7] = (byte) (b & 0xFF);
+            return newPos;
         }
 
         @Override
@@ -186,34 +190,37 @@
         @Override
         public int emitShort(int b, int pos) {
             assert NumUtil.isUShort(b);
-            ensureSize(pos + 2);
-            data[pos++] = (byte) (b & 0xFF);
-            data[pos++] = (byte) ((b >> 8) & 0xFF);
-            return pos;
+            int newPos = pos + 2;
+            ensureSize(newPos);
+            data[pos] = (byte) (b & 0xFF);
+            data[pos + 1] = (byte) ((b >> 8) & 0xFF);
+            return newPos;
         }
 
         @Override
         public int emitInt(int b, int pos) {
-            ensureSize(pos + 4);
-            data[pos++] = (byte) (b & 0xFF);
-            data[pos++] = (byte) ((b >> 8) & 0xFF);
-            data[pos++] = (byte) ((b >> 16) & 0xFF);
-            data[pos++] = (byte) ((b >> 24) & 0xFF);
-            return pos;
+            int newPos = pos + 4;
+            ensureSize(newPos);
+            data[pos] = (byte) (b & 0xFF);
+            data[pos + 1] = (byte) ((b >> 8) & 0xFF);
+            data[pos + 2] = (byte) ((b >> 16) & 0xFF);
+            data[pos + 3] = (byte) ((b >> 24) & 0xFF);
+            return newPos;
         }
 
         @Override
         public int emitLong(long b, int pos) {
-            ensureSize(pos + 8);
-            data[pos++] = (byte) (b & 0xFF);
-            data[pos++] = (byte) ((b >> 8) & 0xFF);
-            data[pos++] = (byte) ((b >> 16) & 0xFF);
-            data[pos++] = (byte) ((b >> 24) & 0xFF);
-            data[pos++] = (byte) ((b >> 32) & 0xFF);
-            data[pos++] = (byte) ((b >> 40) & 0xFF);
-            data[pos++] = (byte) ((b >> 48) & 0xFF);
-            data[pos++] = (byte) ((b >> 56) & 0xFF);
-            return pos;
+            int newPos = pos + 8;
+            ensureSize(newPos);
+            data[pos] = (byte) (b & 0xFF);
+            data[pos + 1] = (byte) ((b >> 8) & 0xFF);
+            data[pos + 2] = (byte) ((b >> 16) & 0xFF);
+            data[pos + 3] = (byte) ((b >> 24) & 0xFF);
+            data[pos + 4] = (byte) ((b >> 32) & 0xFF);
+            data[pos + 5] = (byte) ((b >> 40) & 0xFF);
+            data[pos + 6] = (byte) ((b >> 48) & 0xFF);
+            data[pos + 7] = (byte) ((b >> 56) & 0xFF);
+            return newPos;
         }
 
         @Override