Mercurial > hg > truffle

changeset 18952:05a56a6d0886

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix compile errors
author Stefan Anzinger <stefan.anzinger@oracle.com>
date Mon, 26 Jan 2015 22:38:44 +0100
parents 568baf3550d3
children fe3a00661c32
files graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/UnsafeStoreNode.java graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/FrameWithoutBoxing.java
diffstat 2 files changed, 45 insertions(+), 34 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/UnsafeStoreNode.java	Mon Jan 26 21:53:57 2015 +0100
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/UnsafeStoreNode.java	Mon Jan 26 22:38:44 2015 +0100
@@ -82,25 +82,22 @@
             ValueNode indexValue = tool.getReplacedValue(offset());
             if (indexValue.isConstant()) {
                 long off = indexValue.asJavaConstant().asLong();
-                int entryIndex = state.getVirtualObject().entryIndexForOffset(off);
+                int entryIndex = state.getVirtualObject().entryIndexForOffset(off, accessKind());
                 if (entryIndex != -1) {
                     Kind entryKind = state.getVirtualObject().entryKind(entryIndex);
                     ValueNode entry = state.getEntry(entryIndex);
-                    boolean isLoadSafe = ByteOrder.nativeOrder() == ByteOrder.LITTLE_ENDIAN || accessKind() == entryKind;
-                    if (isLoadSafe) {
-                        if (entry.getKind() == value.getKind() || entryKind == accessKind()) {
-                            tool.setVirtualEntry(state, entryIndex, value(), true);
-                            tool.delete();
-                        } else {
-                            if ((accessKind() == Kind.Long || accessKind() == Kind.Double) && entryKind == Kind.Int) {
-                                int nextIndex = state.getVirtualObject().entryIndexForOffset(off + 4);
-                                if (nextIndex != -1) {
-                                    Kind nextKind = state.getVirtualObject().entryKind(nextIndex);
-                                    if (nextKind == Kind.Int) {
-                                        tool.setVirtualEntry(state, entryIndex, value(), true);
-                                        tool.setVirtualEntry(state, nextIndex, ConstantNode.forConstant(JavaConstant.forIllegal(), tool.getMetaAccessProvider(), graph()), true);
-                                        tool.delete();
-                                    }
+                    if (entry.getKind() == value.getKind() || entryKind == accessKind()) {
+                        tool.setVirtualEntry(state, entryIndex, value(), true);
+                        tool.delete();
+                    } else {
+                        if ((accessKind() == Kind.Long || accessKind() == Kind.Double) && entryKind == Kind.Int) {
+                            int nextIndex = state.getVirtualObject().entryIndexForOffset(off + 4, entryKind);
+                            if (nextIndex != -1) {
+                                Kind nextKind = state.getVirtualObject().entryKind(nextIndex);
+                                if (nextKind == Kind.Int) {
+                                    tool.setVirtualEntry(state, entryIndex, value(), true);
+                                    tool.setVirtualEntry(state, nextIndex, ConstantNode.forConstant(JavaConstant.forIllegal(), tool.getMetaAccessProvider(), graph()), true);
+                                    tool.delete();
                                 }
                             }
                         }
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/FrameWithoutBoxing.java	Mon Jan 26 21:53:57 2015 +0100
+++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/FrameWithoutBoxing.java	Mon Jan 26 22:38:44 2015 +0100
@@ -22,11 +22,13 @@
  */
 package com.oracle.graal.truffle;
 
+import java.nio.*;
 import java.lang.reflect.*;
 import java.util.*;
 
 import sun.misc.*;
 
+import com.oracle.graal.api.meta.*;
 import com.oracle.truffle.api.*;
 import com.oracle.truffle.api.frame.*;
 
@@ -107,8 +109,9 @@
     }
 
     private byte getByteUnsafe(FrameSlot slot) {
-        int slotIndex = slot.getIndex();
-        return unsafeGetByte(getPrimitiveLocals(), PRIMITIVE_BASE_OFFSET + slotIndex * PRIMITIVE_INDEX_SCALE, this.getTags()[slotIndex] == FrameSlotKind.Byte.ordinal(), slot);
+        long offset = alignPrimitive(slot, Kind.Byte);
+        boolean condition = this.getTags()[slot.getIndex()] == FrameSlotKind.Byte.ordinal();
+        return unsafeGetByte(getPrimitiveLocals(), offset, condition, slot);
     }
 
     @Override
@@ -118,7 +121,8 @@
     }
 
     private void setByteUnsafe(FrameSlot slot, byte value) {
-        unsafePutByte(getPrimitiveLocals(), PRIMITIVE_BASE_OFFSET + slot.getIndex() * PRIMITIVE_INDEX_SCALE, value, slot);
+        long offset = alignPrimitive(slot, Kind.Boolean);
+        unsafePutByte(getPrimitiveLocals(), offset, value, slot);
     }
 
     @Override
@@ -128,8 +132,9 @@
     }
 
     private boolean getBooleanUnsafe(FrameSlot slot) {
-        int slotIndex = slot.getIndex();
-        return unsafeGetBoolean(getPrimitiveLocals(), PRIMITIVE_BASE_OFFSET + slotIndex * PRIMITIVE_INDEX_SCALE, this.getTags()[slotIndex] == FrameSlotKind.Boolean.ordinal(), slot);
+        long offset = alignPrimitive(slot, Kind.Boolean);
+        boolean condition = this.getTags()[slot.getIndex()] == FrameSlotKind.Boolean.ordinal();
+        return unsafeGetBoolean(getPrimitiveLocals(), offset, condition, slot);
     }
 
     @Override
@@ -139,7 +144,8 @@
     }
 
     private void setBooleanUnsafe(FrameSlot slot, boolean value) {
-        unsafePutBoolean(getPrimitiveLocals(), PRIMITIVE_BASE_OFFSET + slot.getIndex() * PRIMITIVE_INDEX_SCALE, value, slot);
+        long offset = alignPrimitive(slot, Kind.Boolean);
+        unsafePutBoolean(getPrimitiveLocals(), offset, value, slot);
     }
 
     @Override
@@ -149,8 +155,9 @@
     }
 
     private float getFloatUnsafe(FrameSlot slot) {
-        int slotIndex = slot.getIndex();
-        return unsafeGetFloat(getPrimitiveLocals(), PRIMITIVE_BASE_OFFSET + slotIndex * PRIMITIVE_INDEX_SCALE, this.getTags()[slotIndex] == FrameSlotKind.Float.ordinal(), slot);
+        long offset = alignPrimitive(slot, Kind.Float);
+        boolean condition = this.getTags()[slot.getIndex()] == FrameSlotKind.Float.ordinal();
+        return unsafeGetFloat(getPrimitiveLocals(), offset, condition, slot);
     }
 
     @Override
@@ -160,7 +167,8 @@
     }
 
     private void setFloatUnsafe(FrameSlot slot, float value) {
-        unsafePutFloat(getPrimitiveLocals(), PRIMITIVE_BASE_OFFSET + slot.getIndex() * PRIMITIVE_INDEX_SCALE, value, slot);
+        long offset = alignPrimitive(slot, Kind.Float);
+        unsafePutFloat(getPrimitiveLocals(), offset, value, slot);
     }
 
     @Override
@@ -170,8 +178,9 @@
     }
 
     private long getLongUnsafe(FrameSlot slot) {
-        int slotIndex = slot.getIndex();
-        return unsafeGetLong(getPrimitiveLocals(), PRIMITIVE_BASE_OFFSET + slotIndex * PRIMITIVE_INDEX_SCALE, this.getTags()[slotIndex] == FrameSlotKind.Long.ordinal(), slot);
+        long offset = alignPrimitive(slot, Kind.Long);
+        boolean condition = this.getTags()[slot.getIndex()] == FrameSlotKind.Long.ordinal();
+        return unsafeGetLong(getPrimitiveLocals(), offset, condition, slot);
     }
 
     @Override
@@ -181,7 +190,8 @@
     }
 
     private void setLongUnsafe(FrameSlot slot, long value) {
-        unsafePutLong(getPrimitiveLocals(), PRIMITIVE_BASE_OFFSET + slot.getIndex() * PRIMITIVE_INDEX_SCALE, value, slot);
+        long offset = alignPrimitive(slot, Kind.Long);
+        unsafePutLong(getPrimitiveLocals(), offset, value, slot);
     }
 
     @Override
@@ -191,8 +201,9 @@
     }
 
     private int getIntUnsafe(FrameSlot slot) {
-        int slotIndex = slot.getIndex();
-        return unsafeGetInt(getPrimitiveLocals(), PRIMITIVE_BASE_OFFSET + slotIndex * PRIMITIVE_INDEX_SCALE, this.getTags()[slotIndex] == FrameSlotKind.Int.ordinal(), slot);
+        long offset = alignPrimitive(slot, Kind.Int);
+        boolean condition = this.getTags()[slot.getIndex()] == FrameSlotKind.Int.ordinal();
+        return unsafeGetInt(getPrimitiveLocals(), offset, condition, slot);
     }
 
     @Override
@@ -202,7 +213,8 @@
     }
 
     private void setIntUnsafe(FrameSlot slot, int value) {
-        unsafePutInt(getPrimitiveLocals(), PRIMITIVE_BASE_OFFSET + slot.getIndex() * PRIMITIVE_INDEX_SCALE, value, slot);
+        long offset = alignPrimitive(slot, Kind.Int);
+        unsafePutInt(getPrimitiveLocals(), offset, value, slot);
     }
 
     @Override
@@ -212,8 +224,9 @@
     }
 
     private double getDoubleUnsafe(FrameSlot slot) {
-        int slotIndex = slot.getIndex();
-        return unsafeGetDouble(getPrimitiveLocals(), PRIMITIVE_BASE_OFFSET + slotIndex * PRIMITIVE_INDEX_SCALE, this.getTags()[slotIndex] == FrameSlotKind.Double.ordinal(), slot);
+        long offset = alignPrimitive(slot, Kind.Double);
+        boolean condition = this.getTags()[slot.getIndex()] == FrameSlotKind.Double.ordinal();
+        return unsafeGetDouble(getPrimitiveLocals(), offset, condition, slot);
     }
 
     @Override
@@ -223,7 +236,8 @@
     }
 
     private void setDoubleUnsafe(FrameSlot slot, double value) {
-        unsafePutDouble(getPrimitiveLocals(), PRIMITIVE_BASE_OFFSET + slot.getIndex() * PRIMITIVE_INDEX_SCALE, value, slot);
+        long offset = alignPrimitive(slot, Kind.Double);
+        unsafePutDouble(getPrimitiveLocals(), offset, value, slot);
     }
 
     @Override