Mercurial > hg > truffle
changeset 10821:0910c930c66e
Method and variables' renaming
line wrap: on
line diff
--- a/graal/com.oracle.graal.compiler.hsail/src/com/oracle/graal/compiler/hsail/HSAILLIRGenerator.java Fri Jul 19 09:30:49 2013 -0700 +++ b/graal/com.oracle.graal.compiler.hsail/src/com/oracle/graal/compiler/hsail/HSAILLIRGenerator.java Fri Jul 19 22:10:48 2013 +0200 @@ -181,7 +181,7 @@ } private static boolean isCompressCandidate(DeoptimizingNode access) { - return access != null && ((HeapAccess) access).compress(); + return access != null && ((HeapAccess) access).compressible(); } @Override
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotLIRGenerator.java Fri Jul 19 09:30:49 2013 -0700 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotLIRGenerator.java Fri Jul 19 22:10:48 2013 +0200 @@ -405,7 +405,7 @@ } private static boolean isCompressCandidate(DeoptimizingNode access) { - return access != null && ((HeapAccess) access).compress(); + return access != null && ((HeapAccess) access).compressible(); } @Override @@ -488,7 +488,7 @@ RegisterValue raxRes = AMD64.rax.asValue(kind); emitMove(raxRes, expected); - if (runtime().config.useCompressedOops && node.compress()) { + if (runtime().config.useCompressedOops && node.compressible()) { Variable scratch = newVariable(Kind.Long); append(new CompareAndSwapCompressedOp(raxRes, address, raxRes, newValue, scratch, runtime().config.narrowOopBase, runtime().config.narrowOopShift, runtime().config.logMinObjAlignment)); } else {
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotRuntime.java Fri Jul 19 09:30:49 2013 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotRuntime.java Fri Jul 19 22:10:48 2013 +0200 @@ -582,7 +582,7 @@ cas.setLocation(location); cas.setWriteBarrierType(getCompareAndSwapBarrier(cas)); if (cas.expected().kind() == Kind.Object) { - cas.setCompress(); + cas.setCompressible(); } } else if (n instanceof LoadIndexedNode) { LoadIndexedNode loadIndexed = (LoadIndexedNode) n; @@ -628,12 +628,12 @@ } else if (n instanceof UnsafeLoadNode) { UnsafeLoadNode load = (UnsafeLoadNode) n; assert load.kind() != Kind.Illegal; - boolean compress = (!load.object().isNullConstant() && load.accessKind() == Kind.Object); + boolean compressible = (!load.object().isNullConstant() && load.accessKind() == Kind.Object); if (addReadBarrier(load, tool)) { unsafeLoadSnippets.lower(load, tool); } else { IndexedLocationNode location = IndexedLocationNode.create(ANY_LOCATION, load.accessKind(), load.displacement(), load.offset(), graph, 1); - ReadNode memoryRead = graph.add(new ReadNode(load.object(), location, load.stamp(), WriteBarrierType.NONE, compress)); + ReadNode memoryRead = graph.add(new ReadNode(load.object(), location, load.stamp(), WriteBarrierType.NONE, compressible)); // An unsafe read must not float outside its block otherwise // it may float above an explicit null check on its object. memoryRead.setGuard(AbstractBeginNode.prevBegin(load));
--- a/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64Move.java Fri Jul 19 09:30:49 2013 -0700 +++ b/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64Move.java Fri Jul 19 22:10:48 2013 +0200 @@ -270,12 +270,12 @@ public static class StoreConstantOp extends MemOp { protected final Constant input; - private final boolean compress; + private final boolean compressible; - public StoreConstantOp(Kind kind, AMD64AddressValue address, Constant input, LIRFrameState state, boolean compress) { + public StoreConstantOp(Kind kind, AMD64AddressValue address, Constant input, LIRFrameState state, boolean compressible) { super(kind, address, state); this.input = input; - this.compress = compress; + this.compressible = compressible; } @Override @@ -294,7 +294,7 @@ break; case Long: if (NumUtil.isInt(input.asLong())) { - if (compress) { + if (compressible) { masm.movl(address.toAddress(), (int) input.asLong()); } else { masm.movslq(address.toAddress(), (int) input.asLong()); @@ -310,7 +310,7 @@ throw GraalInternalError.shouldNotReachHere("Cannot store 64-bit constants to memory"); case Object: if (input.isNull()) { - if (compress) { + if (compressible) { masm.movl(address.toAddress(), 0); } else { masm.movptr(address.toAddress(), 0);
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/HeapAccess.java Fri Jul 19 09:30:49 2013 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/HeapAccess.java Fri Jul 19 22:10:48 2013 +0200 @@ -54,5 +54,5 @@ /** * Returns whether or not the heap access is a compressed pointer candidate. */ - boolean compress(); + boolean compressible(); }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/AccessNode.java Fri Jul 19 09:30:49 2013 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/AccessNode.java Fri Jul 19 22:10:48 2013 +0200 @@ -38,7 +38,7 @@ @Input private ValueNode location; private boolean nullCheck; private WriteBarrierType barrierType; - private boolean compress; + private boolean compressible; public ValueNode object() { return object; @@ -64,17 +64,17 @@ this(object, location, stamp, null, WriteBarrierType.NONE, false); } - public AccessNode(ValueNode object, ValueNode location, Stamp stamp, WriteBarrierType barrierType, boolean compress) { - this(object, location, stamp, null, barrierType, compress); + public AccessNode(ValueNode object, ValueNode location, Stamp stamp, WriteBarrierType barrierType, boolean compressible) { + this(object, location, stamp, null, barrierType, compressible); } - public AccessNode(ValueNode object, ValueNode location, Stamp stamp, GuardingNode guard, WriteBarrierType barrierType, boolean compress) { + public AccessNode(ValueNode object, ValueNode location, Stamp stamp, GuardingNode guard, WriteBarrierType barrierType, boolean compressible) { super(stamp); this.object = object; this.location = location; this.guard = guard; this.barrierType = barrierType; - this.compress = compress; + this.compressible = compressible; } @Override @@ -109,7 +109,7 @@ } @Override - public boolean compress() { - return compress; + public boolean compressible() { + return compressible; } }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/FloatableAccessNode.java Fri Jul 19 09:30:49 2013 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/FloatableAccessNode.java Fri Jul 19 22:10:48 2013 +0200 @@ -35,12 +35,12 @@ super(object, location, stamp); } - public FloatableAccessNode(ValueNode object, ValueNode location, Stamp stamp, GuardingNode guard, WriteBarrierType barrierType, boolean compress) { - super(object, location, stamp, guard, barrierType, compress); + public FloatableAccessNode(ValueNode object, ValueNode location, Stamp stamp, GuardingNode guard, WriteBarrierType barrierType, boolean compressible) { + super(object, location, stamp, guard, barrierType, compressible); } - public FloatableAccessNode(ValueNode object, ValueNode location, Stamp stamp, WriteBarrierType barrierType, boolean compress) { - super(object, location, stamp, barrierType, compress); + public FloatableAccessNode(ValueNode object, ValueNode location, Stamp stamp, WriteBarrierType barrierType, boolean compressible) { + super(object, location, stamp, barrierType, compressible); } public abstract FloatingAccessNode asFloatingNode(ValueNode lastLocationAccess);
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/FloatingAccessNode.java Fri Jul 19 09:30:49 2013 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/FloatingAccessNode.java Fri Jul 19 22:10:48 2013 +0200 @@ -33,7 +33,7 @@ @Input private FrameState deoptState; private boolean nullCheck; private WriteBarrierType barrierType; - private boolean compress; + private boolean compressible; public ValueNode object() { return object; @@ -61,12 +61,12 @@ this.location = location; } - public FloatingAccessNode(ValueNode object, LocationNode location, Stamp stamp, GuardingNode guard, WriteBarrierType barrierType, boolean compress) { + public FloatingAccessNode(ValueNode object, LocationNode location, Stamp stamp, GuardingNode guard, WriteBarrierType barrierType, boolean compressible) { super(stamp, guard); this.object = object; this.location = location; this.barrierType = barrierType; - this.compress = compress; + this.compressible = compressible; } @Override @@ -101,8 +101,8 @@ } @Override - public boolean compress() { - return compress; + public boolean compressible() { + return compressible; } public abstract Access asFixedNode();
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/FloatingReadNode.java Fri Jul 19 09:30:49 2013 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/FloatingReadNode.java Fri Jul 19 22:10:48 2013 +0200 @@ -40,8 +40,8 @@ this(object, location, lastLocationAccess, stamp, null, WriteBarrierType.NONE, false); } - public FloatingReadNode(ValueNode object, LocationNode location, Node lastLocationAccess, Stamp stamp, GuardingNode guard, WriteBarrierType barrierType, boolean compress) { - super(object, location, stamp, guard, barrierType, compress); + public FloatingReadNode(ValueNode object, LocationNode location, Node lastLocationAccess, Stamp stamp, GuardingNode guard, WriteBarrierType barrierType, boolean compressible) { + super(object, location, stamp, guard, barrierType, compressible); this.lastLocationAccess = lastLocationAccess; } @@ -57,11 +57,11 @@ @Override public ValueNode canonical(CanonicalizerTool tool) { - return ReadNode.canonicalizeRead(this, location(), object(), tool, compress()); + return ReadNode.canonicalizeRead(this, location(), object(), tool, compressible()); } @Override public Access asFixedNode() { - return graph().add(new ReadNode(object(), nullCheckLocation(), stamp(), getGuard(), getWriteBarrierType(), compress())); + return graph().add(new ReadNode(object(), nullCheckLocation(), stamp(), getGuard(), getWriteBarrierType(), compressible())); } }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/ReadNode.java Fri Jul 19 09:30:49 2013 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/ReadNode.java Fri Jul 19 22:10:48 2013 +0200 @@ -34,12 +34,12 @@ */ public final class ReadNode extends FloatableAccessNode implements Node.IterableNodeType, LIRLowerable, Canonicalizable, PiPushable, Virtualizable { - public ReadNode(ValueNode object, ValueNode location, Stamp stamp, WriteBarrierType barrierType, boolean compress) { - super(object, location, stamp, barrierType, compress); + public ReadNode(ValueNode object, ValueNode location, Stamp stamp, WriteBarrierType barrierType, boolean compressible) { + super(object, location, stamp, barrierType, compressible); } - public ReadNode(ValueNode object, ValueNode location, Stamp stamp, GuardingNode guard, WriteBarrierType barrierType, boolean compress) { - super(object, location, stamp, guard, barrierType, compress); + public ReadNode(ValueNode object, ValueNode location, Stamp stamp, GuardingNode guard, WriteBarrierType barrierType, boolean compressible) { + super(object, location, stamp, guard, barrierType, compressible); } public ReadNode(ValueNode object, int displacement, LocationIdentity locationIdentity, Kind kind) { @@ -62,12 +62,12 @@ @Override public ValueNode canonical(CanonicalizerTool tool) { - return canonicalizeRead(this, location(), object(), tool, compress()); + return canonicalizeRead(this, location(), object(), tool, compressible()); } @Override public FloatingAccessNode asFloatingNode(ValueNode lastLocationAccess) { - return graph().unique(new FloatingReadNode(object(), location(), lastLocationAccess, stamp(), getGuard(), getWriteBarrierType(), compress())); + return graph().unique(new FloatingReadNode(object(), location(), lastLocationAccess, stamp(), getGuard(), getWriteBarrierType(), compressible())); } public static ValueNode canonicalizeRead(ValueNode read, LocationNode location, ValueNode object, CanonicalizerTool tool, boolean compressedPointer) {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/WriteNode.java Fri Jul 19 09:30:49 2013 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/WriteNode.java Fri Jul 19 22:10:48 2013 +0200 @@ -65,12 +65,12 @@ return initialized; } - public WriteNode(ValueNode object, ValueNode value, ValueNode location, WriteBarrierType barrierType, boolean compress) { - this(object, value, location, barrierType, compress, true); + public WriteNode(ValueNode object, ValueNode value, ValueNode location, WriteBarrierType barrierType, boolean compressible) { + this(object, value, location, barrierType, compressible, true); } - public WriteNode(ValueNode object, ValueNode value, ValueNode location, WriteBarrierType barrierType, boolean compress, boolean initialized) { - super(object, location, StampFactory.forVoid(), barrierType, compress); + public WriteNode(ValueNode object, ValueNode value, ValueNode location, WriteBarrierType barrierType, boolean compressible, boolean initialized) { + super(object, location, StampFactory.forVoid(), barrierType, compressible); this.value = value; this.initialized = initialized; } @@ -82,7 +82,7 @@ } @NodeIntrinsic - public static native void writeMemory(Object object, Object value, Location location, @ConstantNodeParameter WriteBarrierType barrierType, @ConstantNodeParameter boolean compress); + public static native void writeMemory(Object object, Object value, Location location, @ConstantNodeParameter WriteBarrierType barrierType, @ConstantNodeParameter boolean compressible); @Override public LocationIdentity getLocationIdentity() {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/CompareAndSwapNode.java Fri Jul 19 09:30:49 2013 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/CompareAndSwapNode.java Fri Jul 19 22:10:48 2013 +0200 @@ -44,7 +44,7 @@ @Input private LocationNode location; private final int displacement; private WriteBarrierType barrierType; - private boolean compress; + private boolean compressible; public ValueNode object() { return object; @@ -85,12 +85,12 @@ } @Override - public boolean compress() { - return compress; + public boolean compressible() { + return compressible; } - public void setCompress() { - this.compress = true; + public void setCompressible() { + this.compressible = true; } public CompareAndSwapNode(ValueNode object, int displacement, ValueNode offset, ValueNode expected, ValueNode newValue) { @@ -102,7 +102,7 @@ this.newValue = newValue; this.displacement = displacement; this.barrierType = WriteBarrierType.NONE; - this.compress = false; + this.compressible = false; } @Override
--- a/graal/com.oracle.graal.word/src/com/oracle/graal/word/Pointer.java Fri Jul 19 09:30:49 2013 -0700 +++ b/graal/com.oracle.graal.word/src/com/oracle/graal/word/Pointer.java Fri Jul 19 22:10:48 2013 +0200 @@ -620,10 +620,10 @@ * * @param offset the signed offset for the memory access * @param barrierType the type of the read barrier to be added - * @param compress whether or not the object is a decompression candidate + * @param compressible whether or not the object is a decompression candidate * @return the result of the memory access */ - Object readObject(WordBase offset, WriteBarrierType barrierType, boolean compress); + Object readObject(WordBase offset, WriteBarrierType barrierType, boolean compressible); /** * Reads the memory at address {@code (this + offset)}. Both the base address and offset are in @@ -712,10 +712,10 @@ * * @param offset the signed offset for the memory access * @param barrierType the type of the read barrier to be added - * @param compress whether or not the object is a decompression candidate + * @param compressible whether or not the object is a decompression candidate * @return the result of the memory access */ - Object readObject(int offset, WriteBarrierType barrierType, boolean compress); + Object readObject(int offset, WriteBarrierType barrierType, boolean compressible); /** * Writes the memory at address {@code (this + offset)}. Both the base address and offset are in
--- a/graal/com.oracle.graal.word/src/com/oracle/graal/word/Word.java Fri Jul 19 09:30:49 2013 -0700 +++ b/graal/com.oracle.graal.word/src/com/oracle/graal/word/Word.java Fri Jul 19 22:10:48 2013 +0200 @@ -882,7 +882,7 @@ public native Object readObject(WordBase offset); @Operation(opcode = Opcode.READ_HEAP) - public native Object readObject(WordBase offset, WriteBarrierType barrierType, boolean compress); + public native Object readObject(WordBase offset, WriteBarrierType barrierType, boolean compressible); @Override @Operation(opcode = Opcode.READ) @@ -939,8 +939,8 @@ } @Operation(opcode = Opcode.READ_HEAP) - public Object readObject(int offset, WriteBarrierType barrierType, boolean compress) { - return readObject(signed(offset), barrierType, compress); + public Object readObject(int offset, WriteBarrierType barrierType, boolean compressible) { + return readObject(signed(offset), barrierType, compressible); } @Override
--- a/graal/com.oracle.graal.word/src/com/oracle/graal/word/phases/WordTypeRewriterPhase.java Fri Jul 19 09:30:49 2013 -0700 +++ b/graal/com.oracle.graal.word/src/com/oracle/graal/word/phases/WordTypeRewriterPhase.java Fri Jul 19 22:10:48 2013 +0200 @@ -332,8 +332,8 @@ return IndexedLocationNode.create(locationIdentity, readKind, 0, offset, graph, 1); } - private static ValueNode readOp(StructuredGraph graph, ValueNode base, Invoke invoke, LocationNode location, WriteBarrierType barrierType, boolean compress) { - ReadNode read = graph.add(new ReadNode(base, location, invoke.asNode().stamp(), barrierType, compress)); + private static ValueNode readOp(StructuredGraph graph, ValueNode base, Invoke invoke, LocationNode location, WriteBarrierType barrierType, boolean compressible) { + ReadNode read = graph.add(new ReadNode(base, location, invoke.asNode().stamp(), barrierType, compressible)); graph.addBeforeFixed(invoke.asNode(), read); // The read must not float outside its block otherwise it may float above an explicit zero // check on its base address