# HG changeset patch
# User Thomas Wuerthinger <thomas@wuerthinger.net>
# Date 1312727290 -7200
# Node ID 82480cb4a51ea21feb34941ae51d8ecf907eac3e
# Parent  faf60b7be40d24b902560e7a45332b2a88f7696c
Renamed NodeInput=>Input and NodeSuccessor=>Successor and made them inner classes of Node.

diff -r faf60b7be40d -r 82480cb4a51e graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/AbstractMemoryCheckpointNode.java
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/AbstractMemoryCheckpointNode.java	Sun Aug 07 16:11:40 2011 +0200
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/AbstractMemoryCheckpointNode.java	Sun Aug 07 16:28:10 2011 +0200
@@ -30,8 +30,7 @@
 
 public abstract class AbstractMemoryCheckpointNode extends StateSplit {
 
-    @NodeInput
-    private final NodeInputList<Node> mergedNodes = new NodeInputList<Node>(this);
+    @Input    private final NodeInputList<Node> mergedNodes = new NodeInputList<Node>(this);
 
     private static final int SUCCESSOR_COUNT = 0;
     private static final int INPUT_COUNT = 0;
diff -r faf60b7be40d -r 82480cb4a51e graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/AbstractVectorNode.java
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/AbstractVectorNode.java	Sun Aug 07 16:11:40 2011 +0200
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/AbstractVectorNode.java	Sun Aug 07 16:28:10 2011 +0200
@@ -29,9 +29,7 @@
 
 
 public abstract class AbstractVectorNode extends StateSplit {
-
-    @NodeInput
-    private AbstractVectorNode vector;
+    @Input private AbstractVectorNode vector;
 
     public AbstractVectorNode vector() {
         return vector;
diff -r faf60b7be40d -r 82480cb4a51e graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/AccessArray.java
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/AccessArray.java	Sun Aug 07 16:11:40 2011 +0200
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/AccessArray.java	Sun Aug 07 16:28:10 2011 +0200
@@ -30,8 +30,7 @@
  */
 public abstract class AccessArray extends StateSplit {
 
-    @NodeInput
-    private Value array;
+    @Input    private Value array;
 
     public Value array() {
         return array;
diff -r faf60b7be40d -r 82480cb4a51e graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/AccessField.java
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/AccessField.java	Sun Aug 07 16:11:40 2011 +0200
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/AccessField.java	Sun Aug 07 16:28:10 2011 +0200
@@ -34,8 +34,7 @@
  */
 public abstract class AccessField extends StateSplit {
 
-    @NodeInput
-    private Value object;
+    @Input    private Value object;
 
     public Value object() {
         return object;
diff -r faf60b7be40d -r 82480cb4a51e graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/AccessIndexed.java
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/AccessIndexed.java	Sun Aug 07 16:11:40 2011 +0200
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/AccessIndexed.java	Sun Aug 07 16:28:10 2011 +0200
@@ -31,11 +31,9 @@
  */
 public abstract class AccessIndexed extends AccessArray {
 
-    @NodeInput
-    private Value index;
+    @Input    private Value index;
 
-    @NodeInput
-    private Value length;
+    @Input    private Value length;
 
     public Value index() {
         return index;
diff -r faf60b7be40d -r 82480cb4a51e graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/AccessMonitor.java
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/AccessMonitor.java	Sun Aug 07 16:11:40 2011 +0200
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/AccessMonitor.java	Sun Aug 07 16:28:10 2011 +0200
@@ -30,11 +30,9 @@
  */
 public abstract class AccessMonitor extends AbstractMemoryCheckpointNode {
 
-    @NodeInput
-    private Value object;
+    @Input    private Value object;
 
-    @NodeInput
-    private Value lockAddress;
+    @Input    private Value lockAddress;
 
     public Value object() {
         return object;
diff -r faf60b7be40d -r 82480cb4a51e graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/AccessNode.java
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/AccessNode.java	Sun Aug 07 16:11:40 2011 +0200
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/AccessNode.java	Sun Aug 07 16:28:10 2011 +0200
@@ -28,18 +28,10 @@
 
 
 public abstract class AccessNode extends AbstractMemoryCheckpointNode {
-
-    @NodeInput
-    private Value object;
-
-    @NodeInput
-    private GuardNode guard;
-
-    @NodeInput
-    private LocationNode location;
-
-    @NodeInput
-    private final NodeInputList<Node> dependencies = new NodeInputList<Node>(this);
+    @Input private Value object;
+    @Input private GuardNode guard;
+    @Input private LocationNode location;
+    @Input private final NodeInputList<Node> dependencies = new NodeInputList<Node>(this);
 
     public Value object() {
         return object;
diff -r faf60b7be40d -r 82480cb4a51e graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/AccessVectorNode.java
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/AccessVectorNode.java	Sun Aug 07 16:11:40 2011 +0200
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/AccessVectorNode.java	Sun Aug 07 16:28:10 2011 +0200
@@ -27,15 +27,9 @@
 
 
 public abstract class AccessVectorNode extends AbstractVectorNode {
-
-    @NodeInput
-    private Value object;
-
-    @NodeInput
-    private LocationNode location;
-
-    @NodeInput
-    private final NodeInputList<Node> dependencies = new NodeInputList<Node>(this);
+    @Input private Value object;
+    @Input private LocationNode location;
+    @Input private final NodeInputList<Node> dependencies = new NodeInputList<Node>(this);
 
     public Value object() {
         return object;
diff -r faf60b7be40d -r 82480cb4a51e graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/Anchor.java
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/Anchor.java	Sun Aug 07 16:11:40 2011 +0200
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/Anchor.java	Sun Aug 07 16:28:10 2011 +0200
@@ -33,8 +33,7 @@
  */
 public final class Anchor extends FixedNodeWithNext {
 
-    @NodeInput
-    private final NodeInputList<GuardNode> guards = new NodeInputList<GuardNode>(this);
+    @Input    private final NodeInputList<GuardNode> guards = new NodeInputList<GuardNode>(this);
 
     /**
      * Constructs a new Anchor instruction.
diff -r faf60b7be40d -r 82480cb4a51e graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/ArrayLength.java
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/ArrayLength.java	Sun Aug 07 16:11:40 2011 +0200
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/ArrayLength.java	Sun Aug 07 16:28:10 2011 +0200
@@ -38,8 +38,7 @@
 public final class ArrayLength extends FloatingNode {
     private static final ArrayLengthCanonicalizerOp CANONICALIZER = new ArrayLengthCanonicalizerOp();
 
-    @NodeInput
-    private Value array;
+    @Input    private Value array;
 
     public Value array() {
         return array;
diff -r faf60b7be40d -r 82480cb4a51e graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/Binary.java
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/Binary.java	Sun Aug 07 16:11:40 2011 +0200
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/Binary.java	Sun Aug 07 16:28:10 2011 +0200
@@ -32,11 +32,9 @@
  */
 public abstract class Binary extends FloatingNode {
 
-    @NodeInput
-    private Value x;
+    @Input    private Value x;
 
-    @NodeInput
-    private Value y;
+    @Input    private Value y;
 
     public Value x() {
         return x;
diff -r faf60b7be40d -r 82480cb4a51e graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/CastNode.java
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/CastNode.java	Sun Aug 07 16:11:40 2011 +0200
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/CastNode.java	Sun Aug 07 16:28:10 2011 +0200
@@ -29,9 +29,7 @@
 
 
 public final class CastNode extends FloatingNode {
-
-    @NodeInput
-    private Value value;
+    @Input private Value value;
 
     public Value value() {
         return value;
diff -r faf60b7be40d -r 82480cb4a51e graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/Compare.java
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/Compare.java	Sun Aug 07 16:11:40 2011 +0200
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/Compare.java	Sun Aug 07 16:28:10 2011 +0200
@@ -40,12 +40,8 @@
  *
  */
 public final class Compare extends BooleanNode {
-
-    @NodeInput
-    private Value x;
-
-    @NodeInput
-    private Value y;
+    @Input private Value x;
+    @Input private Value y;
 
     public Value x() {
         return x;
diff -r faf60b7be40d -r 82480cb4a51e graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/Conditional.java
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/Conditional.java	Sun Aug 07 16:11:40 2011 +0200
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/Conditional.java	Sun Aug 07 16:28:10 2011 +0200
@@ -40,8 +40,8 @@
  * by conditional expression elimination.
  */
 public class Conditional extends Binary {
-    @NodeInput private BooleanNode condition;
-    @NodeInput private FrameState stateDuring;
+    @Input private BooleanNode condition;
+    @Input private FrameState stateDuring;
 
     public BooleanNode condition() {
         return condition;
diff -r faf60b7be40d -r 82480cb4a51e graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/ControlSplit.java
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/ControlSplit.java	Sun Aug 07 16:11:40 2011 +0200
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/ControlSplit.java	Sun Aug 07 16:28:10 2011 +0200
@@ -33,8 +33,7 @@
  */
 public abstract class ControlSplit extends FixedNode {
 
-    @NodeSuccessor
-    private final NodeSuccessorList<FixedNode> blockSuccessors;
+    @Successor    private final NodeSuccessorList<FixedNode> blockSuccessors;
 
     public FixedNode blockSuccessor(int index) {
         return blockSuccessors.get(index);
diff -r faf60b7be40d -r 82480cb4a51e graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/Convert.java
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/Convert.java	Sun Aug 07 16:11:40 2011 +0200
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/Convert.java	Sun Aug 07 16:28:10 2011 +0200
@@ -33,8 +33,7 @@
  */
 public final class Convert extends FloatingNode {
 
-    @NodeInput
-    private Value value;
+    @Input    private Value value;
 
     public Value value() {
         return value;
diff -r faf60b7be40d -r 82480cb4a51e graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/CreateVectorNode.java
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/CreateVectorNode.java	Sun Aug 07 16:11:40 2011 +0200
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/CreateVectorNode.java	Sun Aug 07 16:28:10 2011 +0200
@@ -33,9 +33,7 @@
 
 
 public final class CreateVectorNode extends AbstractVectorNode {
-
-    @NodeInput
-    private Value length;
+    @Input private Value length;
 
     public Value length() {
         return length;
diff -r faf60b7be40d -r 82480cb4a51e graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/FixedGuard.java
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/FixedGuard.java	Sun Aug 07 16:11:40 2011 +0200
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/FixedGuard.java	Sun Aug 07 16:28:10 2011 +0200
@@ -32,9 +32,7 @@
 
 
 public final class FixedGuard extends FixedNodeWithNext {
-
-    @NodeInput
-    private final NodeInputList<BooleanNode> conditions = new NodeInputList<BooleanNode>(this);
+    @Input private final NodeInputList<BooleanNode> conditions = new NodeInputList<BooleanNode>(this);
 
     public FixedGuard(BooleanNode node, Graph graph) {
         this(graph);
diff -r faf60b7be40d -r 82480cb4a51e graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/FixedNodeWithNext.java
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/FixedNodeWithNext.java	Sun Aug 07 16:11:40 2011 +0200
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/FixedNodeWithNext.java	Sun Aug 07 16:28:10 2011 +0200
@@ -27,8 +27,7 @@
 
 public abstract class FixedNodeWithNext extends FixedNode {
 
-    @NodeSuccessor
-    private FixedNode next;
+    @Successor    private FixedNode next;
 
     public FixedNode next() {
         return next;
diff -r faf60b7be40d -r 82480cb4a51e graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/GuardNode.java
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/GuardNode.java	Sun Aug 07 16:11:40 2011 +0200
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/GuardNode.java	Sun Aug 07 16:28:10 2011 +0200
@@ -31,12 +31,8 @@
 
 
 public final class GuardNode extends FloatingNode {
-
-    @NodeInput
-    private FixedNode anchor;
-
-    @NodeInput
-    private BooleanNode node;
+    @Input private FixedNode anchor;
+    @Input private BooleanNode node;
 
     public FixedNode anchor() {
         return anchor;
diff -r faf60b7be40d -r 82480cb4a51e 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	Sun Aug 07 16:11:40 2011 +0200
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/If.java	Sun Aug 07 16:28:10 2011 +0200
@@ -35,8 +35,7 @@
  */
 public final class If extends ControlSplit {
 
-    @NodeInput
-    private BooleanNode compare;
+    @Input    private BooleanNode compare;
 
     public BooleanNode compare() {
         return compare;
diff -r faf60b7be40d -r 82480cb4a51e graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/IntegerAddVectorNode.java
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/IntegerAddVectorNode.java	Sun Aug 07 16:11:40 2011 +0200
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/IntegerAddVectorNode.java	Sun Aug 07 16:28:10 2011 +0200
@@ -30,9 +30,7 @@
 
 
 public final class IntegerAddVectorNode extends AbstractVectorNode {
-
-    @NodeInput
-    private Value value;
+    @Input private Value value;
 
     public Value value() {
         return value;
diff -r faf60b7be40d -r 82480cb4a51e graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/Invoke.java
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/Invoke.java	Sun Aug 07 16:11:40 2011 +0200
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/Invoke.java	Sun Aug 07 16:28:10 2011 +0200
@@ -36,11 +36,9 @@
  */
 public final class Invoke extends AbstractMemoryCheckpointNode implements ExceptionEdgeInstruction {
 
-    @NodeSuccessor
-    private FixedNode exceptionEdge;
+    @Successor    private FixedNode exceptionEdge;
 
-    @NodeInput
-    private final NodeInputList<Value> arguments;
+    @Input    private final NodeInputList<Value> arguments;
 
     @Override
     public FixedNode exceptionEdge() {
diff -r faf60b7be40d -r 82480cb4a51e graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/IsNonNull.java
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/IsNonNull.java	Sun Aug 07 16:11:40 2011 +0200
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/IsNonNull.java	Sun Aug 07 16:28:10 2011 +0200
@@ -36,8 +36,7 @@
  */
 public final class IsNonNull extends BooleanNode {
 
-    @NodeInput
-    private Value object;
+    @Input    private Value object;
 
     public Value object() {
         return object;
diff -r faf60b7be40d -r 82480cb4a51e graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/IsType.java
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/IsType.java	Sun Aug 07 16:11:40 2011 +0200
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/IsType.java	Sun Aug 07 16:28:10 2011 +0200
@@ -38,8 +38,7 @@
  */
 public final class IsType extends BooleanNode {
 
-    @NodeInput
-    private Value object;
+    @Input    private Value object;
 
     public Value object() {
         return object;
diff -r faf60b7be40d -r 82480cb4a51e graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/Local.java
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/Local.java	Sun Aug 07 16:11:40 2011 +0200
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/Local.java	Sun Aug 07 16:28:10 2011 +0200
@@ -35,8 +35,7 @@
  */
 public final class Local extends FloatingNode {
 
-    @NodeInput
-    private StartNode start;
+    @Input    private StartNode start;
 
     public StartNode start() {
         return start;
diff -r faf60b7be40d -r 82480cb4a51e 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	Sun Aug 07 16:11:40 2011 +0200
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/LocationNode.java	Sun Aug 07 16:28:10 2011 +0200
@@ -30,9 +30,7 @@
 
 
 public final class LocationNode extends FloatingNode {
-
-    @NodeInput
-    private Value index;
+    @Input private Value index;
 
     public Value index() {
         return index;
diff -r faf60b7be40d -r 82480cb4a51e graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/LoopCounter.java
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/LoopCounter.java	Sun Aug 07 16:11:40 2011 +0200
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/LoopCounter.java	Sun Aug 07 16:28:10 2011 +0200
@@ -29,14 +29,11 @@
 
 public final class LoopCounter extends FloatingNode {
 
-    @NodeInput
-    private Value init;
+    @Input    private Value init;
 
-    @NodeInput
-    private Value stride;
+    @Input    private Value stride;
 
-    @NodeInput
-    private LoopBegin loopBegin;
+    @Input    private LoopBegin loopBegin;
 
     public Value init() {
         return init;
diff -r faf60b7be40d -r 82480cb4a51e 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	Sun Aug 07 16:11:40 2011 +0200
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/LoopEnd.java	Sun Aug 07 16:28:10 2011 +0200
@@ -31,8 +31,7 @@
 
 public class LoopEnd extends FixedNode {
 
-    @NodeInput
-    private LoopBegin loopBegin;
+    @Input    private LoopBegin loopBegin;
 
     public LoopBegin loopBegin() {
         return loopBegin;
diff -r faf60b7be40d -r 82480cb4a51e 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	Sun Aug 07 16:11:40 2011 +0200
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/Merge.java	Sun Aug 07 16:28:10 2011 +0200
@@ -37,8 +37,7 @@
  */
 public class Merge extends StateSplit{
 
-    @NodeInput
-    private final NodeInputList<Node> ends = new NodeInputList<Node>(this);
+    @Input    private final NodeInputList<Node> ends = new NodeInputList<Node>(this);
 
     public Merge(Graph graph) {
         super(CiKind.Illegal, graph);
diff -r faf60b7be40d -r 82480cb4a51e graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/Negate.java
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/Negate.java	Sun Aug 07 16:11:40 2011 +0200
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/Negate.java	Sun Aug 07 16:28:10 2011 +0200
@@ -36,8 +36,7 @@
 public final class Negate extends FloatingNode {
     private static final NegateCanonicalizerOp CANONICALIZER = new NegateCanonicalizerOp();
 
-    @NodeInput
-    private Value x;
+    @Input    private Value x;
 
     public Value x() {
         return x;
diff -r faf60b7be40d -r 82480cb4a51e graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/NegateBooleanNode.java
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/NegateBooleanNode.java	Sun Aug 07 16:11:40 2011 +0200
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/NegateBooleanNode.java	Sun Aug 07 16:28:10 2011 +0200
@@ -30,8 +30,7 @@
 
 public final class NegateBooleanNode extends BooleanNode {
 
-    @NodeInput
-    private BooleanNode value;
+    @Input    private BooleanNode value;
 
     public BooleanNode value() {
         return value;
diff -r faf60b7be40d -r 82480cb4a51e graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/NewArray.java
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/NewArray.java	Sun Aug 07 16:11:40 2011 +0200
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/NewArray.java	Sun Aug 07 16:28:10 2011 +0200
@@ -35,8 +35,7 @@
  */
 public abstract class NewArray extends FixedNodeWithNext {
 
-    @NodeInput
-    private Value length;
+    @Input    private Value length;
 
     public Value length() {
         return length;
diff -r faf60b7be40d -r 82480cb4a51e graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/NewMultiArray.java
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/NewMultiArray.java	Sun Aug 07 16:11:40 2011 +0200
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/NewMultiArray.java	Sun Aug 07 16:28:10 2011 +0200
@@ -33,8 +33,7 @@
  */
 public final class NewMultiArray extends NewArray {
 
-    @NodeInput
-    private final NodeInputList<Value> dimensions;
+    @Input    private final NodeInputList<Value> dimensions;
 
     @Override
     public Value dimension(int index) {
diff -r faf60b7be40d -r 82480cb4a51e graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/Phi.java
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/Phi.java	Sun Aug 07 16:11:40 2011 +0200
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/Phi.java	Sun Aug 07 16:28:10 2011 +0200
@@ -38,11 +38,9 @@
  */
 public final class Phi extends FloatingNode {
 
-    @NodeInput
-    private Merge merge;
+    @Input    private Merge merge;
 
-    @NodeInput
-    private final NodeInputList<Value> values = new NodeInputList<Value>(this);
+    @Input    private final NodeInputList<Value> values = new NodeInputList<Value>(this);
 
     public Merge merge() {
         return merge;
diff -r faf60b7be40d -r 82480cb4a51e graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/RegisterFinalizer.java
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/RegisterFinalizer.java	Sun Aug 07 16:11:40 2011 +0200
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/RegisterFinalizer.java	Sun Aug 07 16:28:10 2011 +0200
@@ -35,9 +35,7 @@
  * This instruction is used to perform the finalizer registration at the end of the java.lang.Object constructor.
  */
 public final class RegisterFinalizer extends StateSplit {
-
-    @NodeInput
-    private Value object;
+    @Input private Value object;
 
     public Value object() {
         return object;
diff -r faf60b7be40d -r 82480cb4a51e graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/Return.java
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/Return.java	Sun Aug 07 16:11:40 2011 +0200
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/Return.java	Sun Aug 07 16:28:10 2011 +0200
@@ -31,8 +31,7 @@
  */
 public final class Return extends FixedNode {
 
-    @NodeInput
-    private Value result;
+    @Input    private Value result;
 
     public Value result() {
         return result;
diff -r faf60b7be40d -r 82480cb4a51e graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/StateSplit.java
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/StateSplit.java	Sun Aug 07 16:11:40 2011 +0200
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/StateSplit.java	Sun Aug 07 16:28:10 2011 +0200
@@ -34,8 +34,7 @@
  */
 public abstract class StateSplit extends FixedNodeWithNext {
 
-    @NodeInput
-    private FrameState stateAfter;
+    @Input    private FrameState stateAfter;
 
     public FrameState stateAfter() {
         return stateAfter;
diff -r faf60b7be40d -r 82480cb4a51e graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/StoreField.java
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/StoreField.java	Sun Aug 07 16:11:40 2011 +0200
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/StoreField.java	Sun Aug 07 16:28:10 2011 +0200
@@ -34,8 +34,7 @@
  */
 public final class StoreField extends AccessField {
 
-    @NodeInput
-    private Value value;
+    @Input    private Value value;
 
     public Value value() {
         return value;
diff -r faf60b7be40d -r 82480cb4a51e graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/StoreIndexed.java
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/StoreIndexed.java	Sun Aug 07 16:11:40 2011 +0200
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/StoreIndexed.java	Sun Aug 07 16:28:10 2011 +0200
@@ -33,8 +33,7 @@
  */
 public final class StoreIndexed extends AccessIndexed {
 
-    @NodeInput
-    private Value value;
+    @Input    private Value value;
 
     public Value value() {
         return value;
diff -r faf60b7be40d -r 82480cb4a51e graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/Switch.java
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/Switch.java	Sun Aug 07 16:11:40 2011 +0200
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/Switch.java	Sun Aug 07 16:28:10 2011 +0200
@@ -32,8 +32,7 @@
  */
 public abstract class Switch extends ControlSplit {
 
-    @NodeInput
-    private Value value;
+    @Input    private Value value;
 
     public Value value() {
         return value;
diff -r faf60b7be40d -r 82480cb4a51e graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/TypeCheck.java
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/TypeCheck.java	Sun Aug 07 16:11:40 2011 +0200
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/TypeCheck.java	Sun Aug 07 16:28:10 2011 +0200
@@ -31,11 +31,9 @@
  */
 public abstract class TypeCheck extends BooleanNode {
 
-    @NodeInput
-    private Value object;
+    @Input    private Value object;
 
-    @NodeInput
-    private Value targetClassInstruction;
+    @Input    private Value targetClassInstruction;
 
     public Value object() {
         return object;
diff -r faf60b7be40d -r 82480cb4a51e graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/Unwind.java
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/Unwind.java	Sun Aug 07 16:11:40 2011 +0200
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/Unwind.java	Sun Aug 07 16:28:10 2011 +0200
@@ -31,8 +31,7 @@
  */
 public final class Unwind extends FixedNode {
 
-    @NodeInput
-    private Value exception;
+    @Input    private Value exception;
 
     public Value exception() {
         return exception;
diff -r faf60b7be40d -r 82480cb4a51e graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/ValueAnchor.java
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/ValueAnchor.java	Sun Aug 07 16:11:40 2011 +0200
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/ValueAnchor.java	Sun Aug 07 16:28:10 2011 +0200
@@ -31,8 +31,7 @@
  */
 public final class ValueAnchor extends FixedNodeWithNext {
 
-    @NodeInput
-    private Value object;
+    @Input    private Value object;
 
     public Value object() {
         return object;
diff -r faf60b7be40d -r 82480cb4a51e graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/VirtualObjectField.java
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/VirtualObjectField.java	Sun Aug 07 16:11:40 2011 +0200
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/VirtualObjectField.java	Sun Aug 07 16:28:10 2011 +0200
@@ -31,14 +31,11 @@
 
 public class VirtualObjectField extends FloatingNode {
 
-    @NodeInput
-    private VirtualObject object;
+    @Input    private VirtualObject object;
 
-    @NodeInput
-    private FloatingNode lastState;
+    @Input    private FloatingNode lastState;
 
-    @NodeInput
-    private Value input;
+    @Input    private Value input;
 
     public VirtualObject object() {
         return object;
diff -r faf60b7be40d -r 82480cb4a51e graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/WriteNode.java
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/WriteNode.java	Sun Aug 07 16:11:40 2011 +0200
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/WriteNode.java	Sun Aug 07 16:28:10 2011 +0200
@@ -28,9 +28,7 @@
 
 
 public final class WriteNode extends AccessNode {
-
-    @NodeInput
-    private Value value;
+    @Input private Value value;
 
     public Value value() {
         return value;
diff -r faf60b7be40d -r 82480cb4a51e graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/WriteVectorNode.java
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/WriteVectorNode.java	Sun Aug 07 16:11:40 2011 +0200
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/WriteVectorNode.java	Sun Aug 07 16:28:10 2011 +0200
@@ -31,9 +31,7 @@
 
 
 public final class WriteVectorNode extends AccessVectorNode {
-
-    @NodeInput
-    private AbstractVectorNode values;
+    @Input private AbstractVectorNode values;
 
     public AbstractVectorNode values() {
         return values;
diff -r faf60b7be40d -r 82480cb4a51e graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/value/FrameState.java
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/value/FrameState.java	Sun Aug 07 16:11:40 2011 +0200
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/value/FrameState.java	Sun Aug 07 16:28:10 2011 +0200
@@ -51,14 +51,11 @@
     public static final int BEFORE_BCI = -2;
     public static final int AFTER_BCI = -3;
 
-    @NodeInput
-    private FrameState outerFrameState;
+    @Input    private FrameState outerFrameState;
 
-    @NodeInput
-    private final NodeInputList<Value> values;
+    @Input    private final NodeInputList<Value> values;
 
-    @NodeInput
-    private final NodeInputList<Node> virtualObjectMappings;
+    @Input    private final NodeInputList<Node> virtualObjectMappings;
 
     public FrameState outerFrameState() {
         return outerFrameState;
diff -r faf60b7be40d -r 82480cb4a51e graal/com.oracle.max.graal.graphviz/test/com/oracle/graal/graph/vis/GraphvizTest.java
--- a/graal/com.oracle.max.graal.graphviz/test/com/oracle/graal/graph/vis/GraphvizTest.java	Sun Aug 07 16:11:40 2011 +0200
+++ b/graal/com.oracle.max.graal.graphviz/test/com/oracle/graal/graph/vis/GraphvizTest.java	Sun Aug 07 16:28:10 2011 +0200
@@ -33,9 +33,7 @@
 
 import com.oracle.max.graal.graph.Graph;
 import com.oracle.max.graal.graph.Node;
-import com.oracle.max.graal.graph.NodeInput;
 import com.oracle.max.graal.graph.NodeInputList;
-import com.oracle.max.graal.graph.NodeSuccessor;
 import com.oracle.max.graal.graph.NodeSuccessorList;
 import com.oracle.max.graal.graphviz.GraphvizPrinter;
 import com.oracle.max.graal.graphviz.GraphvizRunner;
@@ -82,11 +80,9 @@
 
     private static class DummyNode extends Node {
 
-        @NodeInput
-        private final NodeInputList<Node> inputs;
+        @Input        private final NodeInputList<Node> inputs;
 
-        @NodeSuccessor
-        private final NodeSuccessorList<Node> successors;
+        @Successor        private final NodeSuccessorList<Node> successors;
 
         public DummyNode(String name, int inputCount, int successorCount, Graph graph) {
             super(graph);
diff -r faf60b7be40d -r 82480cb4a51e graal/com.oracle.max.graal.runtime/src/com/oracle/max/graal/runtime/nodes/ArrayWriteBarrier.java
--- a/graal/com.oracle.max.graal.runtime/src/com/oracle/max/graal/runtime/nodes/ArrayWriteBarrier.java	Sun Aug 07 16:11:40 2011 +0200
+++ b/graal/com.oracle.max.graal.runtime/src/com/oracle/max/graal/runtime/nodes/ArrayWriteBarrier.java	Sun Aug 07 16:28:10 2011 +0200
@@ -31,10 +31,8 @@
 
 public final class ArrayWriteBarrier extends WriteBarrier {
 
-    @NodeInput
-    private Value object;
-    @NodeInput
-    private LocationNode location;
+    @Input private Value object;
+    @Input private LocationNode location;
 
     public Value object() {
         return object;
diff -r faf60b7be40d -r 82480cb4a51e graal/com.oracle.max.graal.runtime/src/com/oracle/max/graal/runtime/nodes/FPConversionNode.java
--- a/graal/com.oracle.max.graal.runtime/src/com/oracle/max/graal/runtime/nodes/FPConversionNode.java	Sun Aug 07 16:11:40 2011 +0200
+++ b/graal/com.oracle.max.graal.runtime/src/com/oracle/max/graal/runtime/nodes/FPConversionNode.java	Sun Aug 07 16:28:10 2011 +0200
@@ -32,9 +32,7 @@
 
 
 public final class FPConversionNode extends FloatingNode {
-
-    @NodeInput
-    private Value value;
+    @Input private Value value;
 
     public Value value() {
         return value;
diff -r faf60b7be40d -r 82480cb4a51e graal/com.oracle.max.graal.runtime/src/com/oracle/max/graal/runtime/nodes/FieldWriteBarrier.java
--- a/graal/com.oracle.max.graal.runtime/src/com/oracle/max/graal/runtime/nodes/FieldWriteBarrier.java	Sun Aug 07 16:11:40 2011 +0200
+++ b/graal/com.oracle.max.graal.runtime/src/com/oracle/max/graal/runtime/nodes/FieldWriteBarrier.java	Sun Aug 07 16:28:10 2011 +0200
@@ -30,9 +30,7 @@
 
 
 public final class FieldWriteBarrier extends WriteBarrier {
-
-    @NodeInput
-    private Value object;
+    @Input private Value object;
 
     public Value object() {
         return object;
diff -r faf60b7be40d -r 82480cb4a51e graal/com.oracle.max.graal.runtime/src/com/oracle/max/graal/runtime/nodes/UnsafeLoad.java
--- a/graal/com.oracle.max.graal.runtime/src/com/oracle/max/graal/runtime/nodes/UnsafeLoad.java	Sun Aug 07 16:11:40 2011 +0200
+++ b/graal/com.oracle.max.graal.runtime/src/com/oracle/max/graal/runtime/nodes/UnsafeLoad.java	Sun Aug 07 16:28:10 2011 +0200
@@ -33,11 +33,9 @@
  */
 public class UnsafeLoad extends StateSplit {
 
-    @NodeInput
-    private Value object;
+    @Input    private Value object;
 
-    @NodeInput
-    private Value offset;
+    @Input    private Value offset;
 
     public Value object() {
         return object;
diff -r faf60b7be40d -r 82480cb4a51e graal/com.oracle.max.graal.runtime/src/com/oracle/max/graal/runtime/nodes/UnsafeStore.java
--- a/graal/com.oracle.max.graal.runtime/src/com/oracle/max/graal/runtime/nodes/UnsafeStore.java	Sun Aug 07 16:11:40 2011 +0200
+++ b/graal/com.oracle.max.graal.runtime/src/com/oracle/max/graal/runtime/nodes/UnsafeStore.java	Sun Aug 07 16:28:10 2011 +0200
@@ -33,14 +33,11 @@
  */
 public class UnsafeStore extends StateSplit {
 
-    @NodeInput
-    private Value object;
+    @Input    private Value object;
 
-    @NodeInput
-    private Value offset;
+    @Input    private Value offset;
 
-    @NodeInput
-    private Value value;
+    @Input    private Value value;
 
     public Value object() {
         return object;