# HG changeset patch
# User Josef Eisl <josef.eisl@jku.at>
# Date 1413886634 -7200
# Node ID 185bd9096c8881afc7f5b98d73fd276175f64f04
# Parent  9147ad23314bdf589ef81b1f774696e792163574
Remove FrameMap.indexForStackSlot().

diff -r 9147ad23314b -r 185bd9096c88 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotBackend.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotBackend.java	Tue Oct 21 12:10:39 2014 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotBackend.java	Tue Oct 21 12:17:14 2014 +0200
@@ -189,7 +189,7 @@
      * @param destroyedRegisters the registers destroyed by the stub
      * @param calleeSaveInfo a map from debug infos to the operations that provide their
      *            {@linkplain RegisterSaveLayout callee-save information}
-     * @param frameMap used to {@linkplain FrameMap#indexForStackSlot(StackSlot) convert} a virtual
+     * @param frameMap used to {@linkplain FrameMap#offsetForStackSlot(StackSlot) convert} a virtual
      *            slot to a frame slot index
      */
     protected void updateStub(Stub stub, Set<Register> destroyedRegisters, Map<LIRFrameState, SaveRegistersOp> calleeSaveInfo, FrameMap frameMap) {
diff -r 9147ad23314b -r 185bd9096c88 graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64SaveRegistersOp.java
--- a/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64SaveRegistersOp.java	Tue Oct 21 12:10:39 2014 +0200
+++ b/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64SaveRegistersOp.java	Tue Oct 21 12:17:14 2014 +0200
@@ -122,7 +122,8 @@
             for (int i = 0; i < savedRegisters.length; i++) {
                 if (savedRegisters[i] != null) {
                     keys[mapIndex] = savedRegisters[i];
-                    values[mapIndex] = frameMap.indexForStackSlot(slots[i]);
+                    StackSlot slot = slots[i];
+                    values[mapIndex] = indexForStackSlot(frameMap, slot);
                     mapIndex++;
                 }
             }
@@ -130,4 +131,17 @@
         }
         return new RegisterSaveLayout(keys, values);
     }
+
+    /**
+     * Computes the index of a stack slot relative to slot 0. This is also the bit index of stack
+     * slots in the reference map.
+     *
+     * @param slot a stack slot
+     * @return the index of the stack slot
+     */
+    private static int indexForStackSlot(FrameMap frameMap, StackSlot slot) {
+        assert frameMap.offsetForStackSlot(slot) % frameMap.getTarget().wordSize == 0;
+        int value = frameMap.offsetForStackSlot(slot) / frameMap.getTarget().wordSize;
+        return value;
+    }
 }
diff -r 9147ad23314b -r 185bd9096c88 graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCSaveRegistersOp.java
--- a/graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCSaveRegistersOp.java	Tue Oct 21 12:10:39 2014 +0200
+++ b/graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCSaveRegistersOp.java	Tue Oct 21 12:17:14 2014 +0200
@@ -133,7 +133,8 @@
             for (int i = 0; i < savedRegisters.length; i++) {
                 if (savedRegisters[i] != null) {
                     keys[mapIndex] = savedRegisters[i];
-                    values[mapIndex] = frameMap.indexForStackSlot(slots[i]);
+                    StackSlot slot = slots[i];
+                    values[mapIndex] = indexForStackSlot(frameMap, slot);
                     mapIndex++;
                 }
             }
@@ -141,4 +142,17 @@
         }
         return new RegisterSaveLayout(keys, values);
     }
+
+    /**
+     * Computes the index of a stack slot relative to slot 0. This is also the bit index of stack
+     * slots in the reference map.
+     *
+     * @param slot a stack slot
+     * @return the index of the stack slot
+     */
+    private static int indexForStackSlot(FrameMap frameMap, StackSlot slot) {
+        assert frameMap.offsetForStackSlot(slot) % frameMap.getTarget().wordSize == 0;
+        int value = frameMap.offsetForStackSlot(slot) / frameMap.getTarget().wordSize;
+        return value;
+    }
 }
diff -r 9147ad23314b -r 185bd9096c88 graal/com.oracle.graal.lir/src/com/oracle/graal/lir/FrameMap.java
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/FrameMap.java	Tue Oct 21 12:10:39 2014 +0200
+++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/FrameMap.java	Tue Oct 21 12:17:14 2014 +0200
@@ -213,18 +213,6 @@
     }
 
     /**
-     * Computes the index of a stack slot relative to slot 0. This is also the bit index of stack
-     * slots in the reference map.
-     *
-     * @param slot a stack slot
-     * @return the index of the stack slot
-     */
-    public int indexForStackSlot(StackSlot slot) {
-        assert offsetForStackSlot(slot) % getTarget().wordSize == 0;
-        return offsetForStackSlot(slot) / getTarget().wordSize;
-    }
-
-    /**
      * Gets the offset from the stack pointer to the stack area where callee-saved registers are
      * stored.
      *
diff -r 9147ad23314b -r 185bd9096c88 graal/com.oracle.graal.lir/src/com/oracle/graal/lir/StandardOp.java
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/StandardOp.java	Tue Oct 21 12:10:39 2014 +0200
+++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/StandardOp.java	Tue Oct 21 12:17:14 2014 +0200
@@ -166,7 +166,7 @@
          * Gets a map from the saved registers saved by this operation to the frame slots in which
          * they are saved.
          *
-         * @param frameMap used to {@linkplain FrameMap#indexForStackSlot(StackSlot) convert} a
+         * @param frameMap used to {@linkplain FrameMap#offsetForStackSlot(StackSlot) convert} a
          *            virtual slot to a frame slot index
          */
         RegisterSaveLayout getMap(FrameMap frameMap);