# HG changeset patch
# User Christian Haeubl <haeubl@ssw.jku.at>
# Date 1371546092 -7200
# Node ID 77772d794ffdacfbdf9abbabc4b545bd257b3cc3
# Parent  7bcc4bf839fe13bcb21b9829693763b7267e975e# Parent  9c4e6767ab7811d7a0e9f7c974aad94a497514f7
Merge.

diff -r 7bcc4bf839fe -r 77772d794ffd graal/com.oracle.graal.compiler.sparc/src/com/oracle/graal/compiler/sparc/SPARCLIRGenerator.java
--- a/graal/com.oracle.graal.compiler.sparc/src/com/oracle/graal/compiler/sparc/SPARCLIRGenerator.java	Tue Jun 18 10:43:00 2013 +0200
+++ b/graal/com.oracle.graal.compiler.sparc/src/com/oracle/graal/compiler/sparc/SPARCLIRGenerator.java	Tue Jun 18 11:01:32 2013 +0200
@@ -419,7 +419,7 @@
             baseRegister = asAllocatable(base);
         }
 
-        if (index != Value.ILLEGAL && scale != 0) {
+        if (!Value.ILLEGAL.equals(index) && scale != 0) {
             if (isConstant(index)) {
                 finalDisp += asConstant(index).asLong() * scale;
             } else {
@@ -430,7 +430,7 @@
                     indexRegister = index;
                 }
 
-                if (baseRegister == Value.ILLEGAL) {
+                if (Value.ILLEGAL.equals(baseRegister)) {
                     baseRegister = asAllocatable(indexRegister);
                 } else {
                     Variable newBase = newVariable(Kind.Int);
diff -r 7bcc4bf839fe -r 77772d794ffd graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64Move.java
--- a/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64Move.java	Tue Jun 18 10:43:00 2013 +0200
+++ b/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64Move.java	Tue Jun 18 11:01:32 2013 +0200
@@ -644,7 +644,7 @@
 
     protected static void compareAndSwapCompressed(TargetMethodAssembler tasm, AMD64MacroAssembler masm, AllocatableValue result, AMD64AddressValue address, AllocatableValue cmpValue,
                     AllocatableValue newValue, AllocatableValue scratch, long narrowOopBase, int narrowOopShift, int logMinObjAlignment) {
-        assert asRegister(cmpValue) == AMD64.rax && asRegister(result) == AMD64.rax;
+        assert AMD64.rax.equals(asRegister(cmpValue)) && AMD64.rax.equals(asRegister(result));
         final Register scratchRegister = asRegister(scratch);
         final Register cmpRegister = asRegister(cmpValue);
         final Register newRegister = asRegister(newValue);