# HG changeset patch
# User Christos Kotselidis <christos.kotselidis@oracle.com>
# Date 1365595451 -7200
# Node ID fee450a118380ac823edbbcd6aac46aa4400d00c
# Parent  16de9b713b4cf36335b24e41543d51e07c7e82ca
Rename abbreviated variables, CR-377

diff -r 16de9b713b4c -r fee450a11838 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/WriteBarrierSnippets.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/WriteBarrierSnippets.java	Wed Apr 10 13:55:59 2013 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/WriteBarrierSnippets.java	Wed Apr 10 14:04:11 2013 +0200
@@ -62,15 +62,15 @@
     }
 
     @Snippet
-    public static void serialArrayRangeWriteBarrier(@Parameter("dstObject") Object destObject, @Parameter("destPos") int destPos, @Parameter("length") int length) {
-        Object dest = FixedValueAnchorNode.getObject(destObject);
+    public static void serialArrayRangeWriteBarrier(@Parameter("dstObject") Object destinationObject, @Parameter("destPos") int destinationStartingIndex, @Parameter("length") int length) {
+        Object dest = FixedValueAnchorNode.getObject(destinationObject);
         int cardShift = cardTableShift();
         long cardStart = cardTableStart();
         final int scale = arrayIndexScale(Kind.Object);
         int header = arrayBaseOffset(Kind.Object);
         long dstAddr = GetObjectAddressNode.get(dest);
-        long start = (dstAddr + header + (long) destPos * scale) >>> cardShift;
-        long end = (dstAddr + header + ((long) destPos + length - 1) * scale) >>> cardShift;
+        long start = (dstAddr + header + (long) destinationStartingIndex * scale) >>> cardShift;
+        long end = (dstAddr + header + ((long) destinationStartingIndex + length - 1) * scale) >>> cardShift;
         long count = end - start + 1;
         while (count-- > 0) {
             DirectStoreNode.store((start + cardStart) + count, false, Kind.Boolean);
@@ -103,8 +103,8 @@
             ResolvedJavaMethod method = serialArrayRangeWriteBarrier;
             Key key = new Key(method);
             Arguments arguments = new Arguments();
-            arguments.add("dstObject", arrayRangeWriteBarrier.getDstObject());
-            arguments.add("destPos", arrayRangeWriteBarrier.getDstPos());
+            arguments.add("dstObject", arrayRangeWriteBarrier.getDestinationObject());
+            arguments.add("destPos", arrayRangeWriteBarrier.getDestinationStartingIndex());
             arguments.add("length", arrayRangeWriteBarrier.getLength());
             SnippetTemplate template = cache.get(key);
             template.instantiate(runtime, arrayRangeWriteBarrier, DEFAULT_REPLACER, arguments);
diff -r 16de9b713b4c -r fee450a11838 graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/SerialArrayRangeWriteBarrier.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/SerialArrayRangeWriteBarrier.java	Wed Apr 10 13:55:59 2013 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/SerialArrayRangeWriteBarrier.java	Wed Apr 10 14:04:11 2013 +0200
@@ -27,26 +27,26 @@
 
 public final class SerialArrayRangeWriteBarrier extends FixedWithNextNode implements Lowerable {
 
-    @Input private ValueNode dstObject;
-    @Input private ValueNode dstPos;
+    @Input private ValueNode destinationObject;
+    @Input private ValueNode destinationStartingIndex;
     @Input private ValueNode length;
 
-    public ValueNode getDstObject() {
-        return dstObject;
+    public ValueNode getDestinationObject() {
+        return destinationObject;
     }
 
-    public ValueNode getDstPos() {
-        return dstPos;
+    public ValueNode getDestinationStartingIndex() {
+        return destinationStartingIndex;
     }
 
     public ValueNode getLength() {
         return length;
     }
 
-    public SerialArrayRangeWriteBarrier(ValueNode dstObject, ValueNode dstPos, ValueNode length) {
+    public SerialArrayRangeWriteBarrier(ValueNode destinationObject, ValueNode destinationStartingIndex, ValueNode length) {
         super(StampFactory.forVoid());
-        this.dstObject = dstObject;
-        this.dstPos = dstPos;
+        this.destinationObject = destinationObject;
+        this.destinationStartingIndex = destinationStartingIndex;
         this.length = length;
 
     }