[llvm-commits] CVS: llvm-java/include/llvm/Java/BytecodeParser.h

[Alkis Evlogimenos]

Changes in directory llvm-java/include/llvm/Java:

BytecodeParser.h updated: 1.11 -> 1.12
---
Log message:

The order of evaluation is not specified in C/C++. Don't depend on it.


---
Diffs of the changes:  (+10 -4)

Index: llvm-java/include/llvm/Java/BytecodeParser.h
diff -u llvm-java/include/llvm/Java/BytecodeParser.h:1.11 llvm-java/include/llvm/Java/BytecodeParser.h:1.12
--- llvm-java/include/llvm/Java/BytecodeParser.h:1.11	Mon Oct 18 11:23:03 2004
+++ llvm-java/include/llvm/Java/BytecodeParser.h	Thu Oct 28 14:12:50 2004
@@ -361,9 +361,12 @@
         case LXOR:
           THIS->do_lxor();
           break;
-        case IINC:
-          THIS->do_iinc(readUByte(code, i), readSByte(code, i));
+        case IINC: {
+          unsigned index = wide ? readUShort(code, i) : readUByte(code, i);
+          int amount = wide ? readSShort(code, i) : readSByte(code, i);
+          THIS->do_iinc(index, amount);
           break;
+        }
         case I2L:
           THIS->do_i2l();
           break;
@@ -608,9 +611,12 @@
         case WIDE:
           // FIXME: must throw something
           break;
-        case MULTIANEWARRAY:
-          THIS->do_multianewarray(readUShort(code, i), readUByte(code, i));
+        case MULTIANEWARRAY: {
+          unsigned index = readUShort(code, i);
+          unsigned dims = readUByte(code, i);
+          THIS->do_multianewarray(index, dims);
           break;
+        }
         case IFNULL: {
           unsigned t = curBC + readUShort(code, i);
           THIS->do_ifnull(t, i + 1);