comparison graal/GraalCompiler/src/com/sun/c1x/ir/Phi.java @ 2793:d3fc4fe063bf

Rename BlockBegin to Merge, remove some Block related member from it. Made CFGPrinter work with the Block class from schedule
author Gilles Duboscq <gilles.duboscq@oracle.com>
date Fri, 27 May 2011 11:08:55 +0200
parents 3e3338a1abb9
children e1dad0edd57a
comparison
equal deleted inserted replaced
2792:2f3258e3800e 2793:d3fc4fe063bf
48 48
49 /** 49 /**
50 * The join block for this phi. 50 * The join block for this phi.
51 */ 51 */
52 @Override 52 @Override
53 public BlockBegin block() { 53 public Merge block() {
54 return (BlockBegin) inputs().get(super.inputCount() + INPUT_BLOCK); 54 return (Merge) inputs().get(super.inputCount() + INPUT_BLOCK);
55 } 55 }
56 56
57 public Value setBlock(Value n) { 57 public Value setBlock(Value n) {
58 return (BlockBegin) inputs().set(super.inputCount() + INPUT_BLOCK, n); 58 return (Merge) inputs().set(super.inputCount() + INPUT_BLOCK, n);
59 } 59 }
60 60
61 /** 61 /**
62 * Create a new Phi for the specified join block and local variable (or operand stack) slot. 62 * Create a new Phi for the specified join block and local variable (or operand stack) slot.
63 * @param kind the type of the variable 63 * @param kind the type of the variable
64 * @param block the join point 64 * @param block the join point
65 * @param index the index into the stack (if < 0) or local variables 65 * @param index the index into the stack (if < 0) or local variables
66 * @param graph 66 * @param graph
67 */ 67 */
68 public Phi(CiKind kind, BlockBegin block, Graph graph) { 68 public Phi(CiKind kind, Merge block, Graph graph) {
69 this(kind, block, DEFAULT_MAX_VALUES, graph); 69 this(kind, block, DEFAULT_MAX_VALUES, graph);
70 } 70 }
71 71
72 public Phi(CiKind kind, BlockBegin block, int maxValues, Graph graph) { 72 public Phi(CiKind kind, Merge block, int maxValues, Graph graph) {
73 super(kind, INPUT_COUNT + maxValues, SUCCESSOR_COUNT, graph); 73 super(kind, INPUT_COUNT + maxValues, SUCCESSOR_COUNT, graph);
74 usedInputCount = 1; 74 usedInputCount = 1;
75 setBlock(block); 75 setBlock(block);
76 } 76 }
77 77