[Jikesrvm-commits] SF.net SVN: jikesrvm: [12296] rvmroot/trunk/rvm/src/org/jikesrvm/compilers/ opt/OPT_ExpressionFolding.java

[<cap...@us...>]

Revision: 12296
          http://svn.sourceforge.net/jikesrvm/?rev=12296&view=rev
Author:   captain5050
Date:     2007-05-23 10:51:53 -0700 (Wed, 23 May 2007)

Log Message:
-----------
Improve exceptions

Modified Paths:
--------------
    rvmroot/trunk/rvm/src/org/jikesrvm/compilers/opt/OPT_ExpressionFolding.java

Modified: rvmroot/trunk/rvm/src/org/jikesrvm/compilers/opt/OPT_ExpressionFolding.java
===================================================================
--- rvmroot/trunk/rvm/src/org/jikesrvm/compilers/opt/OPT_ExpressionFolding.java	2007-05-23 17:50:29 UTC (rev 12295)
+++ rvmroot/trunk/rvm/src/org/jikesrvm/compilers/opt/OPT_ExpressionFolding.java	2007-05-23 17:51:53 UTC (rev 12296)
@@ -2153,31 +2153,35 @@
   }
 
   private static int getIntValue(OPT_Operand op) {
-    if (op instanceof OPT_IntConstantOperand) {
+    if (op instanceof OPT_IntConstantOperand)
       return op.asIntConstant().value;
-    }
-    throw new OPT_OptimizingCompilerException("Cannot getLongValue from this operand " + op);
+    throw new OPT_OptimizingCompilerException(
+        "Cannot getIntValue from this operand " + op +
+        " of instruction " + op.instruction);
   }
 
   private static long getLongValue(OPT_Operand op) {
-    if (op instanceof OPT_LongConstantOperand) {
+    if (op instanceof OPT_LongConstantOperand)
       return op.asLongConstant().value;
-    }
-    throw new OPT_OptimizingCompilerException("Cannot getLongValue from this operand " + op);
+    throw new OPT_OptimizingCompilerException(
+        "Cannot getLongValue from this operand " + op +
+        " of instruction " + op.instruction);
   }
 
   private static float getFloatValue(OPT_Operand op) {
-    if (op instanceof OPT_FloatConstantOperand) {
+    if (op instanceof OPT_FloatConstantOperand)
       return op.asFloatConstant().value;
-    }
-    throw new OPT_OptimizingCompilerException("Cannot getFloatValue from this operand " + op);
+    throw new OPT_OptimizingCompilerException(
+        "Cannot getFloatValue from this operand " + op +
+        " of instruction " + op.instruction);
   }
 
   private static double getDoubleValue(OPT_Operand op) {
-    if (op instanceof OPT_DoubleConstantOperand) {
+    if (op instanceof OPT_DoubleConstantOperand)
       return op.asDoubleConstant().value;
-    }
-    throw new OPT_OptimizingCompilerException("Cannot getDoubleValue from this operand " + op);
+    throw new OPT_OptimizingCompilerException(
+        "Cannot getDoubleValue from this operand " + op +
+        " of instruction " + op.instruction);
   }
 
   private static Address getAddressValue(OPT_Operand op) {
@@ -2193,6 +2197,8 @@
     if (VM.BuildFor64Addr && op instanceof OPT_LongConstantOperand) {
       return Address.fromLong(op.asLongConstant().value);
     }
-    throw new OPT_OptimizingCompilerException("Cannot getWordValue from this operand " + op);
+    throw new OPT_OptimizingCompilerException(
+        "Cannot getAddressValue from this operand " + op +
+        " of instruction " + op.instruction);
   }
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.