--- a/.hgtags	Wed Jan 28 19:12:57 2015 +0100
+++ b/.hgtags	Wed Jan 28 19:32:47 2015 +0100
@@ -524,3 +524,4 @@
 7d4f630172a16e983212d46c0f1ad6cdb826dfce graal-0.4
 ae5b662550836e851c39e4fbb5c80517fc62488f graal-0.5
 3b60f720b955c466d913abb0113af9b38962950b graal-0.6
+1b0ef9634252c422b6f9839fc62eebc112545486 gpu-0.1

--- a/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/BytecodeFrame.java	Wed Jan 28 19:12:57 2015 +0100
+++ b/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/BytecodeFrame.java	Wed Jan 28 19:32:47 2015 +0100
@@ -168,7 +168,7 @@
         for (int i = 0; i < numLocals + numStack; i++) {
             if (values[i] != null) {
                 Kind kind = values[i].getKind();
-                if (kind == Kind.Long || kind == Kind.Double) {
+                if (kind.needsTwoSlots()) {
                     assert values.length > i + 1 : String.format("missing second word %s", this);
                     assert values[i + 1] == null || values[i + 1].getKind() == Kind.Illegal;
                 }

--- a/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/CompilationResult.java	Wed Jan 28 19:12:57 2015 +0100
+++ b/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/CompilationResult.java	Wed Jan 28 19:32:47 2015 +0100
@@ -234,6 +234,7 @@
 
         private static final long serialVersionUID = 9011681879878139182L;
 
+        private boolean initialized;
         private int offset;
 
         public DataSectionReference() {
@@ -242,10 +243,15 @@
         }
 
         public int getOffset() {
+            assert initialized;
+
             return offset;
         }
 
         public void setOffset(int offset) {
+            assert !initialized;
+            initialized = true;
+
             this.offset = offset;
         }
 

--- a/graal/com.oracle.graal.api.meta.test/src/com/oracle/graal/api/meta/test/TestResolvedJavaType.java	Wed Jan 28 19:12:57 2015 +0100
+++ b/graal/com.oracle.graal.api.meta.test/src/com/oracle/graal/api/meta/test/TestResolvedJavaType.java	Wed Jan 28 19:32:47 2015 +0100
@@ -54,7 +54,7 @@
                 ResolvedJavaField rf = lookupField(type.getInstanceFields(true), f);
                 assertNotNull(rf);
                 long offset = isStatic(f.getModifiers()) ? unsafe.staticFieldOffset(f) : unsafe.objectFieldOffset(f);
-                ResolvedJavaField result = type.findInstanceFieldWithOffset(offset);
+                ResolvedJavaField result = type.findInstanceFieldWithOffset(offset, rf.getKind());
                 assertNotNull(result);
                 assertTrue(fieldsEqual(f, result));
             }

--- a/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/Kind.java	Wed Jan 28 19:12:57 2015 +0100
+++ b/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/Kind.java	Wed Jan 28 19:32:47 2015 +0100
@@ -33,47 +33,50 @@
  */
 public enum Kind implements PlatformKind {
     /** The primitive boolean kind, represented as an int on the stack. */
-    Boolean('z', "boolean", true, java.lang.Boolean.TYPE, java.lang.Boolean.class),
+    Boolean('z', "boolean", 1, true, java.lang.Boolean.TYPE, java.lang.Boolean.class),
 
     /** The primitive byte kind, represented as an int on the stack. */
-    Byte('b', "byte", true, java.lang.Byte.TYPE, java.lang.Byte.class),
+    Byte('b', "byte", 1, true, java.lang.Byte.TYPE, java.lang.Byte.class),
 
     /** The primitive short kind, represented as an int on the stack. */
-    Short('s', "short", true, java.lang.Short.TYPE, java.lang.Short.class),
+    Short('s', "short", 1, true, java.lang.Short.TYPE, java.lang.Short.class),
 
     /** The primitive char kind, represented as an int on the stack. */
-    Char('c', "char", true, java.lang.Character.TYPE, java.lang.Character.class),
+    Char('c', "char", 1, true, java.lang.Character.TYPE, java.lang.Character.class),
 
     /** The primitive int kind, represented as an int on the stack. */
-    Int('i', "int", true, java.lang.Integer.TYPE, java.lang.Integer.class),
+    Int('i', "int", 1, true, java.lang.Integer.TYPE, java.lang.Integer.class),
 
     /** The primitive float kind. */
-    Float('f', "float", false, java.lang.Float.TYPE, java.lang.Float.class),
+    Float('f', "float", 1, false, java.lang.Float.TYPE, java.lang.Float.class),
 
     /** The primitive long kind. */
-    Long('j', "long", false, java.lang.Long.TYPE, java.lang.Long.class),
+    Long('j', "long", 2, false, java.lang.Long.TYPE, java.lang.Long.class),
 
     /** The primitive double kind. */
-    Double('d', "double", false, java.lang.Double.TYPE, java.lang.Double.class),
+    Double('d', "double", 2, false, java.lang.Double.TYPE, java.lang.Double.class),
 
     /** The Object kind, also used for arrays. */
-    Object('a', "Object", false, null, null),
+    Object('a', "Object", 1, false, null, null),
 
     /** The void float kind. */
-    Void('v', "void", false, java.lang.Void.TYPE, java.lang.Void.class),
+    Void('v', "void", 0, false, java.lang.Void.TYPE, java.lang.Void.class),
 
     /** The non-type. */
-    Illegal('-', "illegal", false, null, null);
+    Illegal('-', "illegal", 0, false, null, null);
 
     private final char typeChar;
     private final String javaName;
     private final boolean isStackInt;
     private final Class<?> primitiveJavaClass;
     private final Class<?> boxedJavaClass;
+    private final EnumKey key = new EnumKey(this);
+    private final int slotCount;
 
-    private Kind(char typeChar, String javaName, boolean isStackInt, Class<?> primitiveJavaClass, Class<?> boxedJavaClass) {
+    private Kind(char typeChar, String javaName, int slotCount, boolean isStackInt, Class<?> primitiveJavaClass, Class<?> boxedJavaClass) {
         this.typeChar = typeChar;
         this.javaName = javaName;
+        this.slotCount = slotCount;
         this.isStackInt = isStackInt;
         this.primitiveJavaClass = primitiveJavaClass;
         this.boxedJavaClass = boxedJavaClass;
@@ -81,6 +84,21 @@
     }
 
     /**
+     * Returns the number of stack slots occupied by this kind according to the Java bytecodes
+     * specification.
+     */
+    public int getSlotCount() {
+        return this.slotCount;
+    }
+
+    /**
+     * Returns whether this kind occupied two stack slots.
+     */
+    public boolean needsTwoSlots() {
+        return this.slotCount == 2;
+    }
+
+    /**
      * Returns the name of the kind as a single character.
      */
     public char getTypeChar() {
@@ -95,6 +113,10 @@
         return javaName;
     }
 
+    public Key getKey() {
+        return key;
+    }
+
     /**
      * Checks whether this type is a Java primitive type.
      *

--- a/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/NullConstant.java	Wed Jan 28 19:12:57 2015 +0100
+++ b/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/NullConstant.java	Wed Jan 28 19:32:47 2015 +0100
@@ -85,7 +85,7 @@
 
     @Override
     public int hashCode() {
-        return System.identityHashCode(this);
+        return 13;
     }
 
     @Override

--- a/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/PlatformKind.java	Wed Jan 28 19:12:57 2015 +0100
+++ b/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/PlatformKind.java	Wed Jan 28 19:32:47 2015 +0100
@@ -31,6 +31,43 @@
 
     JavaConstant getDefaultValue();
 
+    public interface Key {
+
+    }
+
+    public class EnumKey implements Key {
+        @SuppressWarnings("rawtypes") private final Enum e;
+
+        @SuppressWarnings("rawtypes")
+        public EnumKey(Enum e) {
+            this.e = e;
+        }
+
+        @Override
+        public int hashCode() {
+            return e.ordinal() ^ e.name().hashCode();
+        }
+
+        @Override
+        public boolean equals(Object obj) {
+            if (obj == this) {
+                return true;
+            }
+            if (obj instanceof EnumKey) {
+                EnumKey that = (EnumKey) obj;
+                return this.e == that.e;
+            }
+            return false;
+        }
+    }
+
+    /**
+     * Gets a value associated with this object that can be used as a stable key in a map. The
+     * {@link Object#hashCode()} implementation of the returned value should be stable between VM
+     * executions.
+     */
+    Key getKey();
+
     default int getVectorLength() {
         return 1;
     }

--- a/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/Remote.java	Wed Jan 28 19:12:57 2015 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package com.oracle.graal.api.meta;
-
-/**
- * Marker interface for classes whose values are proxied during replay compilation capture or remote
- * compilation.
- */
-public interface Remote {
-}

--- a/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/ResolvedJavaType.java	Wed Jan 28 19:12:57 2015 +0100
+++ b/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/ResolvedJavaType.java	Wed Jan 28 19:32:47 2015 +0100
@@ -298,7 +298,7 @@
      * @param offset the offset of the field to look for
      * @return the field with the given offset, or {@code null} if there is no such field.
      */
-    ResolvedJavaField findInstanceFieldWithOffset(long offset);
+    ResolvedJavaField findInstanceFieldWithOffset(long offset, Kind expectedKind);
 
     /**
      * Returns name of source file of this type.

--- a/graal/com.oracle.graal.asm.hsail/src/com/oracle/graal/asm/hsail/AbstractHSAILAssembler.java	Wed Jan 28 19:12:57 2015 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,67 +0,0 @@
-/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package com.oracle.graal.asm.hsail;
-
-import com.oracle.graal.api.code.*;
-import com.oracle.graal.asm.*;
-
-/**
- * The platform-dependent base class for the HSAIL assembler.
- */
-public abstract class AbstractHSAILAssembler extends Assembler {
-
-    public AbstractHSAILAssembler(TargetDescription target) {
-        super(target);
-    }
-
-    @Override
-    public final void bind(Label l) {
-        super.bind(l);
-        emitString0(nameOf(l) + ":\n");
-    }
-
-    @Override
-    public void align(int modulus) {
-        // Nothing to do
-    }
-
-    @Override
-    public void jmp(Label l) {
-        emitJumpToLabelName(nameOf(l));
-    }
-
-    public void emitJumpToLabelName(String labelName) {
-        emitString("brn " + labelName + ";");
-    }
-
-    @Override
-    protected void patchJumpTarget(int branch, int jumpTarget) {
-        // Nothing to do
-    }
-
-    @Override
-    protected String createLabelName(Label l, int id) {
-        int blockId = l.getBlockId();
-        return "@L" + (blockId == -1 ? id : blockId);
-    }
-}

--- a/graal/com.oracle.graal.asm.hsail/src/com/oracle/graal/asm/hsail/HSAILAddress.java	Wed Jan 28 19:12:57 2015 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,74 +0,0 @@
-/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package com.oracle.graal.asm.hsail;
-
-import com.oracle.graal.api.code.*;
-import com.oracle.graal.api.meta.*;
-
-/**
- * Represents an address in target machine memory, specified via some combination of a base register
- * and a displacement.
- */
-public final class HSAILAddress extends AbstractAddress {
-
-    private final Register base;
-    private final long displacement;
-
-    /**
-     * Creates an {@link HSAILAddress} with given base register and no displacement.
-     * 
-     * 
-     * @param base the base register
-     */
-    public HSAILAddress(Register base) {
-        this(base, 0);
-    }
-
-    /**
-     * Creates an {@link HSAILAddress} with given base register and a displacement. This is the most
-     * general constructor.
-     * 
-     * @param base the base register
-     * @param displacement the displacement
-     */
-    public HSAILAddress(Register base, long displacement) {
-        this.base = base;
-        this.displacement = displacement;
-    }
-
-    /**
-     * @return Base register that defines the start of the address computation. If not present, is
-     *         denoted by {@link Value#ILLEGAL}.
-     */
-    public Register getBase() {
-        return base;
-    }
-
-    /**
-     * @return Optional additive displacement.
-     */
-    public long getDisplacement() {
-        return displacement;
-    }
-
-}

--- a/graal/com.oracle.graal.asm.hsail/src/com/oracle/graal/asm/hsail/HSAILAssembler.java	Wed Jan 28 19:12:57 2015 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,661 +0,0 @@
-/*
- * Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package com.oracle.graal.asm.hsail;
-
-import static com.oracle.graal.api.code.MemoryBarriers.*;
-import static com.oracle.graal.api.code.ValueUtil.*;
-
-import com.oracle.graal.api.code.*;
-import com.oracle.graal.api.meta.*;
-import com.oracle.graal.compiler.common.*;
-import com.oracle.graal.hsail.*;
-
-/**
- * This class contains routines to emit HSAIL assembly code.
- */
-public abstract class HSAILAssembler extends AbstractHSAILAssembler {
-
-    /**
-     * Stack size in bytes (used to keep track of spilling).
-     */
-    private int maxDataTypeSize;
-
-    /**
-     * Maximum stack offset used by a store operation.
-     */
-    private long maxStackOffset = 0;
-
-    public long upperBoundStackSize() {
-        return maxStackOffset + maxDataTypeSize;
-    }
-
-    public HSAILAssembler(TargetDescription target) {
-        super(target);
-    }
-
-    @Override
-    public HSAILAddress makeAddress(Register base, int displacement) {
-        return new HSAILAddress(base, displacement);
-    }
-
-    @Override
-    public HSAILAddress getPlaceholder() {
-        return null;
-    }
-
-    @Override
-    public final void ensureUniquePC() {
-        throw GraalInternalError.unimplemented();
-    }
-
-    public final void undefined(String str) {
-        emitString("undefined operation " + str);
-    }
-
-    public final void exit() {
-        emitString("ret;" + "");
-    }
-
-    /**
-     * Moves an Object into a register.
-     *
-     * Because Object references become stale after Garbage collection (GC) the technique used here
-     * is to load a JNI global reference to that Object into the register. These JNI global
-     * references get updated by the GC whenever the GC moves an Object.
-     *
-     * @param a the destination register
-     * @param src the Object Constant being moved
-     */
-    public abstract void mov(Register a, JavaConstant src);
-
-    private static String getBitTypeFromKind(Kind kind) {
-        switch (kind) {
-            case Boolean:
-            case Byte:
-            case Short:
-            case Char:
-            case Int:
-            case Float:
-                return "b32";
-            case Long:
-            case Double:
-            case Object:
-                return "b64";
-            default:
-                throw GraalInternalError.shouldNotReachHere();
-        }
-    }
-
-    public final void emitMov(Kind kind, Value dst, Value src) {
-        if (isRegister(dst) && isConstant(src) && kind.getStackKind() == Kind.Object) {
-            mov(asRegister(dst), asConstant(src));
-        } else {
-            String argtype = getBitTypeFromKind(kind);
-            emitString("mov_" + argtype + " " + mapRegOrConstToString(dst) + ", " + mapRegOrConstToString(src) + ";");
-        }
-    }
-
-    private void emitAddrOp(String instr, Value reg, HSAILAddress addr) {
-        String storeValue = mapRegOrConstToString(reg);
-        emitString(instr + " " + storeValue + ", " + mapAddress(addr) + ";");
-    }
-
-    /**
-     * Emits a memory barrier instruction.
-     *
-     * @param barriers the kind of barrier to emit
-     */
-    public final void emitMembar(int barriers) {
-        if (barriers == 0) {
-            emitString("// no barrier before volatile read");
-        } else if (barriers == JMM_POST_VOLATILE_READ) {
-            emitString("sync; // barriers=" + MemoryBarriers.barriersString(barriers));
-        } else if (barriers == JMM_PRE_VOLATILE_WRITE) {
-            emitString("sync; // barriers=" + MemoryBarriers.barriersString(barriers));
-        } else if (barriers == JMM_POST_VOLATILE_WRITE) {
-            emitString("sync; // barriers=" + MemoryBarriers.barriersString(barriers));
-        }
-    }
-
-    public final void emitLoad(Kind kind, Value dest, HSAILAddress addr) {
-        emitLoad(dest, addr, getArgTypeFromKind(kind));
-    }
-
-    public final void emitLoad(Value dest, HSAILAddress addr, String argTypeStr) {
-        emitAddrOp("ld_global_" + argTypeStr, dest, addr);
-    }
-
-    public final void emitLda(Value dest, HSAILAddress addr) {
-        emitAddrOp("lda_global_u64", dest, addr);
-    }
-
-    public final void emitLea(Value dest, HSAILAddress addr) {
-        String prefix = getArgType(dest);
-        emitString(String.format("add_%s %s, $%s, 0x%s;", prefix, HSAIL.mapRegister(dest), addr.getBase().name, Long.toHexString(addr.getDisplacement())));
-    }
-
-    public final void emitLoadKernelArg(Value dest, String kernArgName, String argTypeStr) {
-        emitString("ld_kernarg_" + argTypeStr + " " + HSAIL.mapRegister(dest) + ", [" + kernArgName + "];");
-    }
-
-    public final void emitStore(Kind kind, Value src, HSAILAddress addr) {
-        emitStore(src, addr, getArgTypeFromKind(kind));
-    }
-
-    public final void emitStore(Value dest, HSAILAddress addr, String argTypeStr) {
-        emitAddrOp("st_global_" + argTypeStr, dest, addr);
-    }
-
-    private void storeImmediateImpl(String storeType, String value, HSAILAddress addr) {
-        emitString("st_global_" + storeType + " " + value + ", " + mapAddress(addr) + ";");
-    }
-
-    public final void emitStoreImmediate(Kind kind, long src, HSAILAddress addr) {
-        assert (kind != Kind.Float && kind != Kind.Double);
-        storeImmediateImpl(getArgTypeFromKind(kind), Long.toString(src), addr);
-    }
-
-    public final void emitStoreImmediate(float src, HSAILAddress addr) {
-        storeImmediateImpl("f32", floatToString(src), addr);
-    }
-
-    public final void emitStoreImmediate(double src, HSAILAddress addr) {
-        storeImmediateImpl("f64", doubleToString(src), addr);
-    }
-
-    public final void emitSpillLoad(Kind kind, Value dest, Value src) {
-        emitString("ld_spill_" + getArgTypeFromKind(kind) + " " + HSAIL.mapRegister(dest) + ", " + mapStackSlot(src, getArgSizeFromKind(kind)) + ";");
-    }
-
-    public final void emitStore(Value src, HSAILAddress addr) {
-        emitString("st_global_" + getArgType(src) + " " + HSAIL.mapRegister(src) + ", " + mapAddress(addr) + ";");
-    }
-
-    public final void emitSpillStore(Kind kind, Value src, Value dest) {
-        int sizestored = getArgSizeFromKind(kind);
-        if (maxDataTypeSize < sizestored) {
-            maxDataTypeSize = sizestored;
-        }
-        int stackoffset = HSAIL.getStackOffset(dest);
-        if (maxStackOffset < stackoffset) {
-            maxStackOffset = stackoffset;
-        }
-        emitString("st_spill_" + getArgTypeFromKind(kind) + " " + HSAIL.mapRegister(src) + ", " + mapStackSlot(dest, getArgSizeFromKind(kind)) + ";");
-    }
-
-    public static String mapStackSlot(Value reg, int argSize) {
-        long startOffset = HSAIL.getStackOffsetStart(reg, argSize);
-        return "[%spillseg]" + "[" + startOffset + "]";
-    }
-
-    public void cbr(String target1) {
-        emitString("cbr " + "$c0" + ", " + target1 + ";");
-    }
-
-    public int getArgSize(Value src) {
-        return getArgSizeFromKind(src.getKind());
-    }
-
-    private static int getArgSizeFromKind(Kind kind) {
-        switch (kind) {
-            case Int:
-            case Float:
-                return 32;
-            case Double:
-            case Long:
-            case Object:
-                return 64;
-            default:
-                throw GraalInternalError.shouldNotReachHere();
-        }
-    }
-
-    private static String getArgType(Value src) {
-        return getArgTypeFromKind(src.getKind());
-    }
-
-    private static String getArgTypeFromKind(Kind kind) {
-        String prefix = "";
-        switch (kind) {
-            case Float:
-                prefix = "f32";
-                break;
-            case Double:
-                prefix = "f64";
-                break;
-            case Int:
-                prefix = "s32";
-                break;
-            case Long:
-                prefix = "s64";
-                break;
-            case Object:
-                prefix = "u64";
-                break;
-            case Char:
-                prefix = "u16";
-                break;
-            case Short:
-                prefix = "s16";
-                break;
-            case Byte:
-                prefix = "s8";
-                break;
-            case Boolean:
-                prefix = "u8";
-                break;
-            default:
-                throw GraalInternalError.shouldNotReachHere();
-        }
-        return prefix;
-    }
-
-    public static final String getArgTypeForceUnsigned(Value src) {
-        return getArgTypeForceUnsignedKind(src.getKind());
-    }
-
-    public static final String getArgTypeForceUnsignedKind(Kind kind) {
-        switch (kind) {
-            case Int:
-                return "u32";
-            case Long:
-            case Object:
-                return "u64";
-            default:
-                throw GraalInternalError.shouldNotReachHere();
-        }
-    }
-
-    public static final String getArgTypeBitwiseLogical(Value src) {
-        String length = getArgType(src);
-        String prefix = "_b" + (length.endsWith("64") ? "64" : "32");
-        return prefix;
-    }
-
-    /**
-     * Emits a compare instruction.
-     *
-     * @param src0 - the first source register
-     * @param src1 - the second source register
-     * @param condition - the compare condition i.e., eq, ne, lt, gt
-     * @param unordered - flag specifying if this is an unordered compare. This only applies to
-     *            float compares.
-     * @param isUnsignedCompare - flag specifying if this is a compare of unsigned values.
-     */
-    public void emitCompare(Kind compareKind, Value src0, Value src1, String condition, boolean unordered, boolean isUnsignedCompare) {
-        // Formulate the prefix of the instruction.
-        // if unordered is true, it should be ignored unless the src type is f32 or f64
-        String argType = getArgTypeFromKind(compareKind);
-        String unorderedPrefix = (argType.startsWith("f") && unordered ? "u" : "");
-        String prefix = "cmp_" + condition + unorderedPrefix + "_b1_" + (isUnsignedCompare ? getArgTypeForceUnsigned(src1) : argType);
-        // Generate a comment for debugging purposes
-        String comment = (isConstant(src1) && (src1.getKind() == Kind.Object) && (asConstant(src1).isNull()) ? " // null test " : "");
-        // Emit the instruction.
-        emitString(prefix + " $c0, " + mapRegOrConstToString(src0) + ", " + mapRegOrConstToString(src1) + ";" + comment);
-    }
-
-    public void emitConvert(Value dest, Value src, String destType, String srcType) {
-        String prefix = "cvt_";
-        if (destType.equals("f32") && srcType.equals("f64")) {
-            prefix = "cvt_near_";
-        } else if (srcType.startsWith("f") && (destType.startsWith("s") || destType.startsWith("u"))) {
-            prefix = "cvt_zeroi_sat_";
-        }
-        emitString(prefix + destType + "_" + srcType + " " + HSAIL.mapRegister(dest) + ", " + HSAIL.mapRegister(src) + ";");
-    }
-
-    public void emitConvert(Value dest, Value src, Kind destKind, Kind srcKind) {
-        String destType = getArgTypeFromKind(destKind);
-        String srcType = getArgTypeFromKind(srcKind);
-        emitConvert(dest, src, destType, srcType);
-    }
-
-    /**
-     * Emits a convert instruction that uses unsigned prefix, regardless of the type of dest and
-     * src.
-     *
-     * @param dest the destination operand
-     * @param src the source operand
-     */
-    public void emitConvertForceUnsigned(Value dest, Value src) {
-        emitString("cvt_" + getArgTypeForceUnsigned(dest) + "_" + getArgTypeForceUnsigned(src) + " " + HSAIL.mapRegister(dest) + ", " + HSAIL.mapRegister(src) + ";");
-    }
-
-    public static String mapAddress(HSAILAddress addr) {
-        if (addr.getBase().encoding() < 0) {
-            return "[0x" + Long.toHexString(addr.getDisplacement()) + "]";
-        } else {
-            return "[$d" + addr.getBase().encoding() + " + " + addr.getDisplacement() + "]";
-        }
-    }
-
-    private static String doubleToString(double dval) {
-        long lval = Double.doubleToRawLongBits(dval);
-        long lvalIgnoreSign = lval & 0x7fffffffffffffffL;
-        if (lvalIgnoreSign >= 0x7ff0000000000000L) {
-            return "0D" + String.format("%16x", lval);
-        } else {
-            return Double.toString(dval);
-        }
-    }
-
-    private static String floatToString(float fval) {
-        int ival = Float.floatToRawIntBits(fval);
-        int ivalIgnoreSign = ival & 0x7fffffff;
-        if (ivalIgnoreSign >= 0x7f800000) {
-            return "0F" + String.format("%8x", ival);
-        } else {
-            return Float.toString(fval) + "f";
-        }
-    }
-
-    private static String mapRegOrConstToString(Value src) {
-        if (!isConstant(src)) {
-            return HSAIL.mapRegister(src);
-        } else {
-            JavaConstant consrc = asConstant(src);
-            switch (src.getKind()) {
-                case Boolean:
-                case Int:
-                    return Integer.toString(consrc.asInt());
-                case Float:
-                    return floatToString(consrc.asFloat());
-                case Double:
-                    return doubleToString(consrc.asDouble());
-                case Long:
-                    return "0x" + Long.toHexString(consrc.asLong());
-                case Object:
-                    if (consrc.isNull()) {
-                        return "0";
-                    } else {
-                        throw GraalInternalError.shouldNotReachHere("unknown type: " + src);
-                    }
-                default:
-                    throw GraalInternalError.shouldNotReachHere("unknown type: " + src);
-            }
-        }
-
-    }
-
-    /**
-     * Emits an instruction.
-     *
-     * @param mnemonic the instruction mnemonic
-     * @param dest the destination operand
-     * @param sources the source operands
-     */
-    public final void emit(String mnemonic, Value dest, Value... sources) {
-        String prefix = getArgType(dest);
-        emitTextFormattedInstruction(mnemonic + "_" + prefix, dest, sources);
-    }
-
-    /**
-     * Emits an unsigned instruction.
-     *
-     * @param mnemonic the instruction mnemonic
-     * @param dest the destination argument
-     * @param sources the source arguments
-     *
-     */
-    public final void emitForceUnsigned(String mnemonic, Value dest, Value... sources) {
-        String prefix = getArgTypeForceUnsigned(dest);
-        emitTextFormattedInstruction(mnemonic + "_" + prefix, dest, sources);
-    }
-
-    public final void emitForceUnsignedKind(String mnemonic, Kind kind, Value dest, Value... sources) {
-        String prefix = getArgTypeForceUnsignedKind(kind);
-        emitTextFormattedInstruction(mnemonic + "_" + prefix, dest, sources);
-    }
-
-    /**
-     * Emits an instruction for a bitwise logical operation.
-     *
-     * @param mnemonic the instruction mnemonic
-     * @param dest the destination
-     * @param sources the source operands
-     */
-    public final void emitForceBitwise(String mnemonic, Value dest, Value... sources) {
-        String prefix = getArgTypeBitwiseLogical(dest);
-        emitTextFormattedInstruction(mnemonic + prefix, dest, sources);
-    }
-
-    /**
-     * Central helper routine that emits a text formatted HSAIL instruction via call to
-     * AbstractAssembler.emitString. All the emit routines in the assembler end up calling this one.
-     *
-     * @param instr the full instruction mnenomics including any prefixes
-     * @param dest the destination operand
-     * @param sources the source operand
-     */
-    private void emitTextFormattedInstruction(String instr, Value dest, Value... sources) {
-        /**
-         * Destination can't be a constant and no instruction has > 3 source operands.
-         */
-        assert (!isConstant(dest) && sources.length <= 3);
-        switch (sources.length) {
-            case 3:
-                // Emit an instruction with three source operands.
-                emitString(String.format("%s %s, %s, %s, %s;", instr, HSAIL.mapRegister(dest), mapRegOrConstToString(sources[0]), mapRegOrConstToString(sources[1]), mapRegOrConstToString(sources[2])));
-                break;
-            case 2:
-                // Emit an instruction with two source operands.
-                emitString(String.format("%s %s, %s, %s;", instr, HSAIL.mapRegister(dest), mapRegOrConstToString(sources[0]), mapRegOrConstToString(sources[1])));
-                break;
-            case 1:
-                // Emit an instruction with one source operand.
-                emitString(String.format("%s %s, %s;", instr, HSAIL.mapRegister(dest), mapRegOrConstToString(sources[0])));
-                break;
-            default:
-                // Emit an instruction with one source operand.
-                emitString(String.format("%s %s;", instr, HSAIL.mapRegister(dest)));
-                break;
-        }
-    }
-
-    /**
-     * Emits a conditional move instruction.
-     *
-     * @param dest the destination operand storing result of the move
-     * @param trueReg the register that should be copied to dest if the condition is true
-     * @param falseReg the register that should be copied to dest if the condition is false
-     * @param width the width of the instruction (32 or 64 bits)
-     */
-    public final void emitConditionalMove(Value dest, Value trueReg, Value falseReg, int width) {
-        assert (!isConstant(dest));
-        String instr = (width == 32 ? "cmov_b32" : "cmov_b64");
-        emitString(String.format("%s %s, %s%s, %s;", instr, HSAIL.mapRegister(dest), "$c0, ", mapRegOrConstToString(trueReg), mapRegOrConstToString(falseReg)));
-    }
-
-    /**
-     * Emits code to build a 64-bit pointer from a compressed value and the associated base and
-     * shift. The compressed value could represent either a normal oop or a klass ptr. If the
-     * compressed value is 0, the uncompressed must also be 0. We only emit this if base and shift
-     * are not both zero.
-     *
-     * @param result the register containing the compressed value on input and the uncompressed ptr
-     *            on output
-     * @param base the amount to be added to the compressed value
-     * @param shift the number of bits to shift left the compressed value
-     * @param testForNull true if the compressed value might be null
-     */
-    public void emitCompressedOopDecode(Value result, long base, int shift, boolean testForNull) {
-        assert (base != 0 || shift != 0);
-        assert (!isConstant(result));
-        if (base == 0) {
-            // we don't have to test for null if shl is the only operation
-            emitForceUnsignedKind("shl", Kind.Long, result, result, JavaConstant.forInt(shift));
-        } else if (shift == 0) {
-            // only use add if result is not starting as null (test only if testForNull is true)
-            emitWithOptionalTestForNull(testForNull, "add", result, result, JavaConstant.forLong(base));
-        } else {
-            // only use mad if result is not starting as null (test only if testForNull is true)
-            emitWithOptionalTestForNull(testForNull, "mad", result, result, JavaConstant.forInt(1 << shift), JavaConstant.forLong(base));
-        }
-    }
-
-    /**
-     * Emits code to build a compressed value from a full 64-bit pointer using the associated base
-     * and shift. The compressed value could represent either a normal oop or a klass ptr. If the
-     * ptr is 0, the compressed value must also be 0. We only emit this if base and shift are not
-     * both zero.
-     *
-     * @param result the register containing the 64-bit pointer on input and the compressed value on
-     *            output
-     * @param base the amount to be subtracted from the 64-bit pointer
-     * @param shift the number of bits to shift right the 64-bit pointer
-     * @param testForNull true if the 64-bit pointer might be null
-     */
-    public void emitCompressedOopEncode(Value result, long base, int shift, boolean testForNull) {
-        assert (base != 0 || shift != 0);
-        assert (!isConstant(result));
-        if (base != 0) {
-            // only use sub if result is not starting as null (test only if testForNull is true)
-            emitWithOptionalTestForNull(testForNull, "sub", result, result, JavaConstant.forLong(base));
-        }
-        if (shift != 0) {
-            // note that the shr can still be done even if the result is null
-            emitForceUnsignedKind("shr", Kind.Long, result, result, JavaConstant.forInt(shift));
-        }
-    }
-
-    /**
-     * Emits code for the requested mnemonic on the result and sources. In addition, if testForNull
-     * is true, surrounds the instruction with code that will guarantee that if the result starts as
-     * 0, it will remain 0.
-     *
-     * @param testForNull true if we want to add the code to check for and preserve null
-     * @param mnemonic the instruction to be applied (without size prefix)
-     * @param result the register which is both an input and the final output
-     * @param sources the sources for the mnemonic instruction
-     */
-    private void emitWithOptionalTestForNull(boolean testForNull, String mnemonic, Value result, Value... sources) {
-        if (testForNull) {
-            emitCompare(Kind.Long, result, JavaConstant.forLong(0), "eq", false, true);
-        }
-        emitForceUnsigned(mnemonic, result, sources);
-        if (testForNull) {
-            emitConditionalMove(result, JavaConstant.forLong(0), result, 64);
-        }
-    }
-
-    /**
-     * Emits an atomic_cas_global instruction.
-     *
-     * @param result result operand that gets the original contents of the memory location
-     * @param address the memory location
-     * @param cmpValue the value that will be compared against the memory location
-     * @param newValue the new value that will be written to the memory location if the cmpValue
-     *            comparison matches
-     */
-    public void emitAtomicCas(Kind accessKind, AllocatableValue result, HSAILAddress address, Value cmpValue, Value newValue) {
-        emitString(String.format("atomic_cas_global_b%d   %s, %s, %s, %s;", getArgSizeFromKind(accessKind), HSAIL.mapRegister(result), mapAddress(address), mapRegOrConstToString(cmpValue),
-                        mapRegOrConstToString(newValue)));
-    }
-
-    /**
-     * Emits an atomic_add_global instruction.
-     *
-     * @param result result operand that gets the original contents of the memory location
-     * @param address the memory location
-     * @param delta the amount to add
-     */
-    public void emitAtomicAdd(AllocatableValue result, HSAILAddress address, Value delta) {
-        // ensure result and delta agree (this should probably be at some higher level)
-        Value mydelta = delta;
-        if (!isConstant(delta) && (getArgSize(result) != getArgSize(delta))) {
-            emitConvert(result, delta, result.getKind(), delta.getKind());
-            mydelta = result;
-        }
-        String prefix = getArgTypeForceUnsigned(result);
-        emitString(String.format("atomic_add_global_%s   %s, %s, %s;", prefix, HSAIL.mapRegister(result), mapAddress(address), mapRegOrConstToString(mydelta)));
-    }
-
-    /**
-     * Emits an atomic_exch_global instruction.
-     *
-     * @param result result operand that gets the original contents of the memory location
-     * @param address the memory location
-     * @param newValue the new value to write to the memory location
-     */
-    public void emitAtomicExch(Kind accessKind, AllocatableValue result, HSAILAddress address, Value newValue) {
-        emitString(String.format("atomic_exch_global_b%d   %s, %s, %s;", getArgSizeFromKind(accessKind), HSAIL.mapRegister(result), mapAddress(address), mapRegOrConstToString(newValue)));
-    }
-
-    /**
-     * Emits a comment. Useful for debugging purposes.
-     *
-     * @param comment
-     */
-    public void emitComment(String comment) {
-        emitString(comment);
-    }
-
-    public String getDeoptInfoName() {
-        return "%_deoptInfo";
-    }
-
-    public String getDeoptLabelName() {
-        return "@L_Deopt";
-    }
-
-    public void emitWorkItemAbsId(Value dest) {
-        emitString(String.format("workitemabsid_u32 %s, 0;", HSAIL.mapRegister(dest)));
-    }
-
-    public void emitCuId(Value dest) {
-        emitString(String.format("cuid_u32 %s;", HSAIL.mapRegister(dest)));
-    }
-
-    public void emitLaneId(Value dest) {
-        emitString(String.format("laneid_u32 %s;", HSAIL.mapRegister(dest)));
-    }
-
-    public void emitWaveId(Value dest) {
-        emitString(String.format("waveid_u32 %s;", HSAIL.mapRegister(dest)));
-    }
-
-    public void emitMaxWaveId(Value dest) {
-        // emitString(String.format("maxwaveid_u32 %s;", HSAIL.mapRegister(dest)));
-        int hardCodedMaxWaveId = 36;
-        emitComment("// Hard-coded maxwaveid=" + hardCodedMaxWaveId + " until it works");
-        emitMov(Kind.Int, dest, JavaConstant.forInt(hardCodedMaxWaveId));
-    }
-
-    public void emitMultiplyByWavesize(Value dest) {
-        String regName = HSAIL.mapRegister(dest);
-        emitString(String.format("mul_u%d %s, %s, WAVESIZE;", getArgSize(dest), regName, regName));
-    }
-
-    public void emitGetWavesize(Value dest) {
-        String regName = HSAIL.mapRegister(dest);
-        emitString(String.format("mov_b%d %s, WAVESIZE;", getArgSize(dest), regName));
-    }
-
-    public void emitLoadAcquire(Value dest, HSAILAddress address) {
-        emitString(String.format("ld_global_acq_u%d %s, %s;", getArgSize(dest), HSAIL.mapRegister(dest), mapAddress(address)));
-    }
-
-    public void emitStoreRelease(Value src, HSAILAddress address) {
-        emitString(String.format("st_global_rel_u%d %s, %s;", getArgSize(src), HSAIL.mapRegister(src), mapAddress(address)));
-    }
-}