# HG changeset patch
# User Lukas Stadler <lukas.stadler@jku.at>
# Date 1312893821 -7200
# Node ID 16cee060c446e356f9acdcf40bf58556222c5bf6
# Parent  0ffcce571d0993ba85e2b3112b23b7c22de2cb0d
added NodeInfo annotation

diff -r 0ffcce571d09 -r 16cee060c446 graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/And.java
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/And.java	Tue Aug 09 13:48:46 2011 +0200
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/And.java	Tue Aug 09 14:43:41 2011 +0200
@@ -22,30 +22,19 @@
  */
 package com.oracle.max.graal.compiler.ir;
 
-import com.oracle.max.graal.compiler.phases.CanonicalizerPhase.NotifyReProcess;
 import com.oracle.max.graal.compiler.phases.CanonicalizerPhase.*;
 import com.oracle.max.graal.graph.*;
 import com.sun.cri.bytecode.*;
 import com.sun.cri.ci.*;
 
+@NodeInfo(shortName = "&")
 public final class And extends Logic {
     private static final AndCanonicalizerOp CANONICALIZER = new AndCanonicalizerOp();
 
-    /**
-     * @param opcode
-     * @param x
-     * @param y
-     * @param graph
-     */
     public And(CiKind kind, Value x, Value y, Graph graph) {
         super(kind, kind == CiKind.Int ? Bytecodes.IAND : Bytecodes.LAND, x, y, graph);
     }
 
-    @Override
-    public String shortName() {
-        return "&";
-    }
-
     @SuppressWarnings("unchecked")
     @Override
     public <T extends Op> T lookup(Class<T> clazz) {
diff -r 0ffcce571d09 -r 16cee060c446 graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/Arithmetic.java
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/Arithmetic.java	Tue Aug 09 13:48:46 2011 +0200
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/Arithmetic.java	Tue Aug 09 14:43:41 2011 +0200
@@ -68,7 +68,4 @@
     public void print(LogStream out) {
         out.print(x()).print(' ').print(this.shortName()).print(' ').print(y());
     }
-
-    @Override
-    public abstract String shortName();
 }
diff -r 0ffcce571d09 -r 16cee060c446 graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/Deoptimize.java
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/Deoptimize.java	Tue Aug 09 13:48:46 2011 +0200
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/Deoptimize.java	Tue Aug 09 14:43:41 2011 +0200
@@ -28,6 +28,7 @@
 import com.oracle.max.graal.graph.*;
 import com.sun.cri.ci.*;
 
+@NodeInfo(shortName = "Deopt")
 public class Deoptimize extends FixedNode {
 
     public static enum DeoptAction {
@@ -69,11 +70,6 @@
     }
 
     @Override
-    public String shortName() {
-        return message == null ? "Deopt " : "Deopt " + message;
-    }
-
-    @Override
     public Map<Object, Object> getDebugProperties() {
         Map<Object, Object> properties = super.getDebugProperties();
         properties.put("message", message);
diff -r 0ffcce571d09 -r 16cee060c446 graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/FloatAdd.java
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/FloatAdd.java	Tue Aug 09 13:48:46 2011 +0200
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/FloatAdd.java	Tue Aug 09 14:43:41 2011 +0200
@@ -28,7 +28,7 @@
 import com.sun.cri.bytecode.*;
 import com.sun.cri.ci.*;
 
-
+@NodeInfo(shortName = "+")
 public final class FloatAdd extends FloatArithmetic {
     private static final FloatAddCanonicalizerOp CANONICALIZER = new FloatAddCanonicalizerOp();
 
@@ -36,11 +36,6 @@
         super(kind, kind == CiKind.Double ? Bytecodes.DADD : Bytecodes.FADD, x, y, isStrictFP, graph);
     }
 
-    @Override
-    public String shortName() {
-        return "+";
-    }
-
     @SuppressWarnings("unchecked")
     @Override
     public <T extends Op> T lookup(Class<T> clazz) {
diff -r 0ffcce571d09 -r 16cee060c446 graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/FloatArithmetic.java
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/FloatArithmetic.java	Tue Aug 09 13:48:46 2011 +0200
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/FloatArithmetic.java	Tue Aug 09 14:43:41 2011 +0200
@@ -25,20 +25,8 @@
 import com.oracle.max.graal.graph.*;
 import com.sun.cri.ci.*;
 
-
-/**
- *
- */
 public abstract class FloatArithmetic extends Arithmetic {
 
-    /**
-     * @param opcode
-     * @param kind
-     * @param x
-     * @param y
-     * @param isStrictFP
-     * @param graph
-     */
     public FloatArithmetic(CiKind kind, int opcode, Value x, Value y, boolean isStrictFP, Graph graph) {
         super(kind, opcode, x, y, isStrictFP, graph);
     }
diff -r 0ffcce571d09 -r 16cee060c446 graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/FloatDiv.java
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/FloatDiv.java	Tue Aug 09 13:48:46 2011 +0200
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/FloatDiv.java	Tue Aug 09 14:43:41 2011 +0200
@@ -22,12 +22,12 @@
  */
 package com.oracle.max.graal.compiler.ir;
 
-import com.oracle.max.graal.compiler.phases.CanonicalizerPhase.NotifyReProcess;
 import com.oracle.max.graal.compiler.phases.CanonicalizerPhase.*;
 import com.oracle.max.graal.graph.*;
 import com.sun.cri.bytecode.*;
 import com.sun.cri.ci.*;
 
+@NodeInfo(shortName = "/")
 public final class FloatDiv extends FloatArithmetic {
     private static final FloatDivCanonicalizerOp CANONICALIZER = new FloatDivCanonicalizerOp();
 
@@ -35,11 +35,6 @@
         super(kind, kind == CiKind.Double ? Bytecodes.DDIV : Bytecodes.FDIV, x, y, isStrictFP, graph);
     }
 
-    @Override
-    public String shortName() {
-        return "/";
-    }
-
     @SuppressWarnings("unchecked")
     @Override
     public <T extends Op> T lookup(Class<T> clazz) {
diff -r 0ffcce571d09 -r 16cee060c446 graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/FloatMul.java
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/FloatMul.java	Tue Aug 09 13:48:46 2011 +0200
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/FloatMul.java	Tue Aug 09 14:43:41 2011 +0200
@@ -22,36 +22,19 @@
  */
 package com.oracle.max.graal.compiler.ir;
 
-import com.oracle.max.graal.compiler.phases.CanonicalizerPhase.NotifyReProcess;
 import com.oracle.max.graal.compiler.phases.CanonicalizerPhase.*;
 import com.oracle.max.graal.graph.*;
 import com.sun.cri.bytecode.*;
 import com.sun.cri.ci.*;
 
-
-/**
- *
- */
+@NodeInfo(shortName = "*")
 public final class FloatMul extends FloatArithmetic {
     private static final FloatMulCanonicalizerOp CANONICALIZER = new FloatMulCanonicalizerOp();
 
-    /**
-     * @param opcode
-     * @param kind
-     * @param x
-     * @param y
-     * @param isStrictFP
-     * @param graph
-     */
     public FloatMul(CiKind kind, Value x, Value y, boolean isStrictFP, Graph graph) {
         super(kind, kind == CiKind.Double ? Bytecodes.DMUL : Bytecodes.FMUL, x, y, isStrictFP, graph);
     }
 
-    @Override
-    public String shortName() {
-        return "*";
-    }
-
     @SuppressWarnings("unchecked")
     @Override
     public <T extends Op> T lookup(Class<T> clazz) {
diff -r 0ffcce571d09 -r 16cee060c446 graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/FloatRem.java
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/FloatRem.java	Tue Aug 09 13:48:46 2011 +0200
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/FloatRem.java	Tue Aug 09 14:43:41 2011 +0200
@@ -22,13 +22,12 @@
  */
 package com.oracle.max.graal.compiler.ir;
 
-import com.oracle.max.graal.compiler.phases.CanonicalizerPhase.NotifyReProcess;
 import com.oracle.max.graal.compiler.phases.CanonicalizerPhase.*;
 import com.oracle.max.graal.graph.*;
 import com.sun.cri.bytecode.*;
 import com.sun.cri.ci.*;
 
-
+@NodeInfo(shortName = "%")
 public final class FloatRem extends FloatArithmetic {
     private static final FloatRemCanonicalizerOp CANONICALIZER = new FloatRemCanonicalizerOp();
 
@@ -36,11 +35,6 @@
         super(kind, kind == CiKind.Double ? Bytecodes.DREM : Bytecodes.FREM, x, y, isStrictFP, graph);
     }
 
-    @Override
-    public String shortName() {
-        return "%";
-    }
-
     @SuppressWarnings("unchecked")
     @Override
     public <T extends Op> T lookup(Class<T> clazz) {
diff -r 0ffcce571d09 -r 16cee060c446 graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/FloatSub.java
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/FloatSub.java	Tue Aug 09 13:48:46 2011 +0200
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/FloatSub.java	Tue Aug 09 14:43:41 2011 +0200
@@ -22,13 +22,12 @@
  */
 package com.oracle.max.graal.compiler.ir;
 
-import com.oracle.max.graal.compiler.phases.CanonicalizerPhase.NotifyReProcess;
 import com.oracle.max.graal.compiler.phases.CanonicalizerPhase.*;
 import com.oracle.max.graal.graph.*;
 import com.sun.cri.bytecode.*;
 import com.sun.cri.ci.*;
 
-
+@NodeInfo(shortName = "-")
 public final class FloatSub extends FloatArithmetic {
     private static final FloatSubCanonicalizerOp CANONICALIZER = new FloatSubCanonicalizerOp();
 
@@ -36,11 +35,6 @@
         super(kind, kind == CiKind.Double ? Bytecodes.DSUB : Bytecodes.FSUB, x, y, isStrictFP, graph);
     }
 
-    @Override
-    public String shortName() {
-        return "-";
-    }
-
     @SuppressWarnings("unchecked")
     @Override
     public <T extends Op> T lookup(Class<T> clazz) {
diff -r 0ffcce571d09 -r 16cee060c446 graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/FloatingNode.java
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/FloatingNode.java	Tue Aug 09 13:48:46 2011 +0200
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/FloatingNode.java	Tue Aug 09 14:43:41 2011 +0200
@@ -25,7 +25,6 @@
 import com.oracle.max.graal.graph.*;
 import com.sun.cri.ci.*;
 
-
 public abstract class FloatingNode extends Value {
 
     public FloatingNode(CiKind kind, Graph graph) {
diff -r 0ffcce571d09 -r 16cee060c446 graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/If.java
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/If.java	Tue Aug 09 13:48:46 2011 +0200
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/If.java	Tue Aug 09 14:43:41 2011 +0200
@@ -109,11 +109,6 @@
         print(falseSuccessor());
     }
 
-    @Override
-    public String shortName() {
-        return "If";
-    }
-
     @SuppressWarnings("unchecked")
     @Override
     public <T extends Op> T lookup(Class<T> clazz) {
diff -r 0ffcce571d09 -r 16cee060c446 graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/IntegerAdd.java
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/IntegerAdd.java	Tue Aug 09 13:48:46 2011 +0200
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/IntegerAdd.java	Tue Aug 09 14:43:41 2011 +0200
@@ -28,7 +28,7 @@
 import com.sun.cri.bytecode.*;
 import com.sun.cri.ci.*;
 
-
+@NodeInfo(shortName = "+")
 public final class IntegerAdd extends IntegerArithmeticNode {
     private static final IntegerAddCanonicalizerOp CANONICALIZER = new IntegerAddCanonicalizerOp();
 
@@ -36,11 +36,6 @@
         super(kind, kind == CiKind.Int ? Bytecodes.IADD : Bytecodes.LADD, x, y, graph);
     }
 
-    @Override
-    public String shortName() {
-        return "+";
-    }
-
     @SuppressWarnings("unchecked")
     @Override
     public <T extends Op> T lookup(Class<T> clazz) {
diff -r 0ffcce571d09 -r 16cee060c446 graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/IntegerDiv.java
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/IntegerDiv.java	Tue Aug 09 13:48:46 2011 +0200
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/IntegerDiv.java	Tue Aug 09 14:43:41 2011 +0200
@@ -22,13 +22,12 @@
  */
 package com.oracle.max.graal.compiler.ir;
 
-import com.oracle.max.graal.compiler.phases.CanonicalizerPhase.NotifyReProcess;
 import com.oracle.max.graal.compiler.phases.CanonicalizerPhase.*;
 import com.oracle.max.graal.graph.*;
 import com.sun.cri.bytecode.*;
 import com.sun.cri.ci.*;
 
-
+@NodeInfo(shortName = "/")
 public final class IntegerDiv extends IntegerArithmeticNode {
     private static final IntegerDivCanonicalizerOp CANONICALIZER = new IntegerDivCanonicalizerOp();
 
@@ -36,11 +35,6 @@
         super(kind, kind == CiKind.Int ? Bytecodes.IDIV : Bytecodes.LDIV, x, y, graph);
     }
 
-    @Override
-    public String shortName() {
-        return "/";
-    }
-
     @SuppressWarnings("unchecked")
     @Override
     public <T extends Op> T lookup(Class<T> clazz) {
diff -r 0ffcce571d09 -r 16cee060c446 graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/IntegerMul.java
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/IntegerMul.java	Tue Aug 09 13:48:46 2011 +0200
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/IntegerMul.java	Tue Aug 09 14:43:41 2011 +0200
@@ -22,13 +22,12 @@
  */
 package com.oracle.max.graal.compiler.ir;
 
-import com.oracle.max.graal.compiler.phases.CanonicalizerPhase.NotifyReProcess;
 import com.oracle.max.graal.compiler.phases.CanonicalizerPhase.*;
 import com.oracle.max.graal.graph.*;
 import com.sun.cri.bytecode.*;
 import com.sun.cri.ci.*;
 
-
+@NodeInfo(shortName = "*")
 public final class IntegerMul extends IntegerArithmeticNode {
     private static final IntegerMulCanonicalizerOp CANONICALIZER = new IntegerMulCanonicalizerOp();
 
@@ -36,11 +35,6 @@
         super(kind, kind == CiKind.Int ? Bytecodes.IMUL : Bytecodes.LMUL, x, y, graph);
     }
 
-    @Override
-    public String shortName() {
-        return "*";
-    }
-
     @SuppressWarnings("unchecked")
     @Override
     public <T extends Op> T lookup(Class<T> clazz) {
diff -r 0ffcce571d09 -r 16cee060c446 graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/IntegerRem.java
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/IntegerRem.java	Tue Aug 09 13:48:46 2011 +0200
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/IntegerRem.java	Tue Aug 09 14:43:41 2011 +0200
@@ -22,13 +22,12 @@
  */
 package com.oracle.max.graal.compiler.ir;
 
-import com.oracle.max.graal.compiler.phases.CanonicalizerPhase.NotifyReProcess;
 import com.oracle.max.graal.compiler.phases.CanonicalizerPhase.*;
 import com.oracle.max.graal.graph.*;
 import com.sun.cri.bytecode.*;
 import com.sun.cri.ci.*;
 
-
+@NodeInfo(shortName = "%")
 public final class IntegerRem extends IntegerArithmeticNode {
     private static final IntegerRemCanonicalizerOp CANONICALIZER = new IntegerRemCanonicalizerOp();
 
@@ -36,11 +35,6 @@
         super(kind, kind == CiKind.Int ? Bytecodes.IREM : Bytecodes.LREM, x, y, graph);
     }
 
-    @Override
-    public String shortName() {
-        return "%";
-    }
-
     @SuppressWarnings("unchecked")
     @Override
     public <T extends Op> T lookup(Class<T> clazz) {
diff -r 0ffcce571d09 -r 16cee060c446 graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/IntegerSub.java
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/IntegerSub.java	Tue Aug 09 13:48:46 2011 +0200
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/IntegerSub.java	Tue Aug 09 14:43:41 2011 +0200
@@ -22,13 +22,12 @@
  */
 package com.oracle.max.graal.compiler.ir;
 
-import com.oracle.max.graal.compiler.phases.CanonicalizerPhase.NotifyReProcess;
 import com.oracle.max.graal.compiler.phases.CanonicalizerPhase.*;
 import com.oracle.max.graal.graph.*;
 import com.sun.cri.bytecode.*;
 import com.sun.cri.ci.*;
 
-
+@NodeInfo(shortName = "-")
 public final class IntegerSub extends IntegerArithmeticNode {
     private static final IntegerSubCanonicalizerOp CANONICALIZER = new IntegerSubCanonicalizerOp();
 
@@ -36,11 +35,6 @@
         super(kind, kind == CiKind.Int ? Bytecodes.ISUB : Bytecodes.LSUB, x, y, graph);
     }
 
-    @Override
-    public String shortName() {
-        return "-";
-    }
-
     @SuppressWarnings("unchecked")
     @Override
     public <T extends Op> T lookup(Class<T> clazz) {
diff -r 0ffcce571d09 -r 16cee060c446 graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/LeftShift.java
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/LeftShift.java	Tue Aug 09 13:48:46 2011 +0200
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/LeftShift.java	Tue Aug 09 14:43:41 2011 +0200
@@ -28,7 +28,7 @@
 import com.sun.cri.bytecode.*;
 import com.sun.cri.ci.*;
 
-
+@NodeInfo(shortName = "<<")
 public final class LeftShift extends Shift {
     private static final LeftShiftCanonicalizerOp CANONICALIZER = new LeftShiftCanonicalizerOp();
 
@@ -36,11 +36,6 @@
         super(kind, kind == CiKind.Int ? Bytecodes.ISHL : Bytecodes.LSHL, x, y, graph);
     }
 
-    @Override
-    public String shortName() {
-        return "<<";
-    }
-
     @SuppressWarnings("unchecked")
     @Override
     public <T extends Op> T lookup(Class<T> clazz) {
diff -r 0ffcce571d09 -r 16cee060c446 graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/LocationNode.java
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/LocationNode.java	Tue Aug 09 13:48:46 2011 +0200
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/LocationNode.java	Tue Aug 09 14:43:41 2011 +0200
@@ -73,7 +73,7 @@
 
     public static LocationNode create(Object identity, CiKind kind, int displacement, Graph graph) {
         LocationNode result = new LocationNode(identity, kind, displacement, graph);
-        return graph.ideal(result);
+        return graph.value(result);
     }
 
     private LocationNode(Object identity, CiKind kind, int displacement, Graph graph) {
diff -r 0ffcce571d09 -r 16cee060c446 graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/Logic.java
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/Logic.java	Tue Aug 09 13:48:46 2011 +0200
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/Logic.java	Tue Aug 09 14:43:41 2011 +0200
@@ -50,7 +50,4 @@
     public void print(LogStream out) {
         out.print(x()).print(' ').print(this.shortName()).print(' ').print(y());
     }
-
-    @Override
-    public abstract String shortName();
 }
diff -r 0ffcce571d09 -r 16cee060c446 graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/LoopBegin.java
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/LoopBegin.java	Tue Aug 09 13:48:46 2011 +0200
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/LoopBegin.java	Tue Aug 09 14:43:41 2011 +0200
@@ -68,11 +68,6 @@
     }
 
     @Override
-    public String shortName() {
-        return "LoopBegin";
-    }
-
-    @Override
     public int phiPredecessorCount() {
         return 2;
     }
diff -r 0ffcce571d09 -r 16cee060c446 graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/LoopEnd.java
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/LoopEnd.java	Tue Aug 09 13:48:46 2011 +0200
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/LoopEnd.java	Tue Aug 09 14:43:41 2011 +0200
@@ -57,11 +57,6 @@
     }
 
     @Override
-    public String shortName() {
-        return "LoopEnd";
-    }
-
-    @Override
     public Iterable< ? extends Node> dataInputs() {
         return Collections.emptyList();
     }
diff -r 0ffcce571d09 -r 16cee060c446 graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/Merge.java
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/Merge.java	Tue Aug 09 13:48:46 2011 +0200
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/Merge.java	Tue Aug 09 14:43:41 2011 +0200
@@ -260,11 +260,6 @@
         return sb.toString();
     }
 
-    @Override
-    public String shortName() {
-        return "Merge #" + id();
-    }
-
     public void removeEnd(EndNode pred) {
         int predIndex = ends.indexOf(pred);
         assert predIndex != -1;
diff -r 0ffcce571d09 -r 16cee060c446 graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/Or.java
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/Or.java	Tue Aug 09 13:48:46 2011 +0200
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/Or.java	Tue Aug 09 14:43:41 2011 +0200
@@ -22,35 +22,19 @@
  */
 package com.oracle.max.graal.compiler.ir;
 
-import com.oracle.max.graal.compiler.phases.CanonicalizerPhase.NotifyReProcess;
 import com.oracle.max.graal.compiler.phases.CanonicalizerPhase.*;
 import com.oracle.max.graal.graph.*;
 import com.sun.cri.bytecode.*;
 import com.sun.cri.ci.*;
 
-
-/**
- *
- */
+@NodeInfo(shortName = "|")
 public final class Or extends Logic {
     private static final OrCanonicalizerOp CANONICALIZER = new OrCanonicalizerOp();
 
-    /**
-     * @param opcode
-     * @param kind
-     * @param x
-     * @param y
-     * @param graph
-     */
     public Or(CiKind kind, Value x, Value y, Graph graph) {
         super(kind, kind == CiKind.Int ? Bytecodes.IOR : Bytecodes.LOR, x, y, graph);
     }
 
-    @Override
-    public String shortName() {
-        return "|";
-    }
-
     @SuppressWarnings("unchecked")
     @Override
     public <T extends Op> T lookup(Class<T> clazz) {
diff -r 0ffcce571d09 -r 16cee060c446 graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/Placeholder.java
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/Placeholder.java	Tue Aug 09 13:48:46 2011 +0200
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/Placeholder.java	Tue Aug 09 14:43:41 2011 +0200
@@ -42,9 +42,4 @@
     public void print(LogStream out) {
         assert false;
     }
-
-    @Override
-    public String shortName() {
-        return "Placeholder" + id();
-    }
 }
diff -r 0ffcce571d09 -r 16cee060c446 graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/RightShift.java
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/RightShift.java	Tue Aug 09 13:48:46 2011 +0200
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/RightShift.java	Tue Aug 09 14:43:41 2011 +0200
@@ -22,13 +22,12 @@
  */
 package com.oracle.max.graal.compiler.ir;
 
-import com.oracle.max.graal.compiler.phases.CanonicalizerPhase.NotifyReProcess;
 import com.oracle.max.graal.compiler.phases.CanonicalizerPhase.*;
 import com.oracle.max.graal.graph.*;
 import com.sun.cri.bytecode.*;
 import com.sun.cri.ci.*;
 
-
+@NodeInfo(shortName = ">>")
 public final class RightShift extends Shift {
     private static final RighShiftCanonicalizerOp CANONICALIZER = new RighShiftCanonicalizerOp();
 
@@ -36,11 +35,6 @@
         super(kind, kind == CiKind.Int ? Bytecodes.ISHR : Bytecodes.LSHR, x, y, graph);
     }
 
-    @Override
-    public String shortName() {
-        return ">>";
-    }
-
     @SuppressWarnings("unchecked")
     @Override
     public <T extends Op> T lookup(Class<T> clazz) {
diff -r 0ffcce571d09 -r 16cee060c446 graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/Shift.java
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/Shift.java	Tue Aug 09 13:48:46 2011 +0200
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/Shift.java	Tue Aug 09 14:43:41 2011 +0200
@@ -51,7 +51,4 @@
     public void print(LogStream out) {
         out.print(x()).print(' ').print(this.shortName()).print(' ').print(y());
     }
-
-    @Override
-    public abstract String shortName();
 }
diff -r 0ffcce571d09 -r 16cee060c446 graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/UnsignedRightShift.java
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/UnsignedRightShift.java	Tue Aug 09 13:48:46 2011 +0200
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/UnsignedRightShift.java	Tue Aug 09 14:43:41 2011 +0200
@@ -22,13 +22,12 @@
  */
 package com.oracle.max.graal.compiler.ir;
 
-import com.oracle.max.graal.compiler.phases.CanonicalizerPhase.NotifyReProcess;
 import com.oracle.max.graal.compiler.phases.CanonicalizerPhase.*;
 import com.oracle.max.graal.graph.*;
 import com.sun.cri.bytecode.*;
 import com.sun.cri.ci.*;
 
-
+@NodeInfo(shortName = ">>>")
 public final class UnsignedRightShift extends Shift {
     private static final UnsignedRightShiftCanonicalizerOp CANONICALIZER = new UnsignedRightShiftCanonicalizerOp();
 
@@ -36,11 +35,6 @@
         super(kind, kind == CiKind.Int ? Bytecodes.IUSHR : Bytecodes.LUSHR, x, y, graph);
     }
 
-    @Override
-    public String shortName() {
-        return ">>>";
-    }
-
     @SuppressWarnings("unchecked")
     @Override
     public <T extends Op> T lookup(Class<T> clazz) {
diff -r 0ffcce571d09 -r 16cee060c446 graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/Xor.java
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/Xor.java	Tue Aug 09 13:48:46 2011 +0200
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/Xor.java	Tue Aug 09 14:43:41 2011 +0200
@@ -22,31 +22,19 @@
  */
 package com.oracle.max.graal.compiler.ir;
 
-import com.oracle.max.graal.compiler.phases.CanonicalizerPhase.NotifyReProcess;
 import com.oracle.max.graal.compiler.phases.CanonicalizerPhase.*;
 import com.oracle.max.graal.graph.*;
 import com.sun.cri.bytecode.*;
 import com.sun.cri.ci.*;
 
+@NodeInfo(shortName = "^")
 public final class Xor extends Logic {
     private static final XorCanonicalizerOp CANONICALIZER = new XorCanonicalizerOp();
 
-    /**
-     * @param opcode
-     * @param kind
-     * @param x
-     * @param y
-     * @param graph
-     */
     public Xor(CiKind kind, Value x, Value y, Graph graph) {
         super(kind, kind == CiKind.Int ? Bytecodes.IXOR : Bytecodes.LXOR, x, y, graph);
     }
 
-    @Override
-    public String shortName() {
-        return "^";
-    }
-
     @SuppressWarnings("unchecked")
     @Override
     public <T extends Op> T lookup(Class<T> clazz) {
diff -r 0ffcce571d09 -r 16cee060c446 graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/phases/GlobalValueNumberingPhase.java
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/phases/GlobalValueNumberingPhase.java	Tue Aug 09 13:48:46 2011 +0200
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/phases/GlobalValueNumberingPhase.java	Tue Aug 09 14:43:41 2011 +0200
@@ -27,9 +27,6 @@
 import com.oracle.max.graal.graph.*;
 import com.oracle.max.graal.graph.collections.*;
 
-/**
- * Duplicates every node in the graph to test the implementation of the {@link com.oracle.max.graal.graph.Node#copy()} method in node subclasses.
- */
 public class GlobalValueNumberingPhase extends Phase {
 
     @Override
@@ -46,7 +43,7 @@
             for (Node input : n.inputs()) {
                 apply(input, visited);
             }
-            Node newNode = n.graph().ideal(n);
+            Node newNode = n.graph().value(n);
             if (newNode != n) {
                 GraalMetrics.GlobalValueNumberingHits++;
                 if (GraalOptions.TraceGVN) {
diff -r 0ffcce571d09 -r 16cee060c446 graal/com.oracle.max.graal.examples/src/com/oracle/max/graal/examples/intrinsics/SafeAddNode.java
--- a/graal/com.oracle.max.graal.examples/src/com/oracle/max/graal/examples/intrinsics/SafeAddNode.java	Tue Aug 09 13:48:46 2011 +0200
+++ b/graal/com.oracle.max.graal.examples/src/com/oracle/max/graal/examples/intrinsics/SafeAddNode.java	Tue Aug 09 14:43:41 2011 +0200
@@ -28,17 +28,12 @@
 import com.sun.cri.bytecode.*;
 import com.sun.cri.ci.*;
 
-
+@NodeInfo(shortName = "[+]")
 public final class SafeAddNode extends IntegerArithmeticNode {
     public SafeAddNode(Value x, Value y, Graph graph) {
         super(CiKind.Int, Bytecodes.LADD, x, y, graph);
     }
 
-    @Override
-    public String shortName() {
-        return "[+]";
-    }
-
     @SuppressWarnings("unchecked")
     @Override
     public <T extends Op> T lookup(Class<T> clazz) {