# HG changeset patch
# User Christos Kotselidis <christos.kotselidis@oracle.com>
# Date 1371666267 -7200
# Node ID ff3c23a329ed9b9da66073f0e1a7bcb409fa22b6
# Parent  acc1c61ba4088ecce326f895d60ef28149272232# Parent  72034f38f95391ee75d2e5b4172cb185b5e6f7ec
Merge

diff -r 72034f38f953 -r ff3c23a329ed 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	Wed Jun 19 18:20:40 2013 +0200
+++ b/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64Move.java	Wed Jun 19 20:24:27 2013 +0200
@@ -669,6 +669,8 @@
             // Otherwise the narrow heap base, which resides always in register 12, is subtracted
             // followed by right shift.
             masm.testq(scratchRegister, scratchRegister);
+            // If the stored reference is null, move the heap to scratch
+            // register and then calculate the compressed oop value.
             masm.cmovq(ConditionFlag.Equal, scratchRegister, AMD64.r12);
             masm.subq(scratchRegister, AMD64.r12);
             masm.shrq(scratchRegister, logMinObjAlignment);
diff -r 72034f38f953 -r ff3c23a329ed mx/commands.py
--- a/mx/commands.py	Wed Jun 19 18:20:40 2013 +0200
+++ b/mx/commands.py	Wed Jun 19 20:24:27 2013 +0200
@@ -932,7 +932,7 @@
 
         _vmbuild = 'product'
         t = Task('BootstrapWithRegisterPressure:product')
-        vm(['-G:RegisterPressure=rbx,r11,r14,xmm3,xmm11,xmm14', '-esa', '-version'])
+        vm(['-G:RegisterPressure=rbx,r11,r10,r14,xmm3,xmm11,xmm14', '-esa', '-version'])
         tasks.append(t.stop())
 
         _vmbuild = 'product'
diff -r 72034f38f953 -r ff3c23a329ed src/share/vm/runtime/arguments.cpp
--- a/src/share/vm/runtime/arguments.cpp	Wed Jun 19 18:20:40 2013 +0200
+++ b/src/share/vm/runtime/arguments.cpp	Wed Jun 19 20:24:27 2013 +0200
@@ -2206,19 +2206,6 @@
 #endif
   }
 #ifdef GRAAL
-  if (UseCompressedOops) {
-    if (IgnoreUnrecognizedVMOptions) {
-      warning("UseCompressedOops is disabled, because it is not supported by Graal");
-      FLAG_SET_CMDLINE(bool, UseCompressedOops, false);
-    } else {
-      status = true;
-      FLAG_SET_CMDLINE(bool, UseCompressedOops, true);
-    }
-  } else {
-    // This prevents the flag being set to true by set_ergonomics_flags()
-    FLAG_SET_CMDLINE(bool, UseCompressedOops, false);
-  }
-
   if (UseCompressedKlassPointers) {
     if (IgnoreUnrecognizedVMOptions) {
       warning("UseCompressedKlassPointers is disabled, because it is not supported by Graal");