Mercurial > hg > truffle
changeset 10418:ff3c23a329ed
Merge
| author | Christos Kotselidis <christos.kotselidis@oracle.com> |
|---|---|
| date | Wed, 19 Jun 2013 20:24:27 +0200 |
| parents | acc1c61ba408 (diff) 72034f38f953 (current diff) |
| children | ac79c138e734 a6697eaddebd |
| files | agent/doc/c2replay.html agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/amd64/AMD64CFrame.java agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/x86/X86CFrame.java make/bsd/makefiles/launcher.make make/linux/makefiles/launcher.make make/solaris/makefiles/launcher.make make/windows/makefiles/launcher.make src/cpu/sparc/vm/codeInstaller_sparc.hpp src/cpu/x86/vm/codeInstaller_x86.hpp src/os/bsd/vm/chaitin_bsd.cpp src/os/linux/vm/chaitin_linux.cpp src/os/posix/launcher/java_md.c src/os/posix/launcher/java_md.h src/os/posix/launcher/launcher.script src/os/solaris/vm/chaitin_solaris.cpp src/os/windows/launcher/java_md.c src/os/windows/launcher/java_md.h src/os/windows/vm/chaitin_windows.cpp src/share/tools/launcher/java.c src/share/tools/launcher/java.h src/share/tools/launcher/jli_util.c src/share/tools/launcher/jli_util.h src/share/tools/launcher/wildcard.c src/share/tools/launcher/wildcard.h src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.inline.hpp src/share/vm/runtime/arguments.cpp src/share/vm/trace/traceEventTypes.hpp test/runtime/7158804/Test7158804.sh test/runtime/8003985/Test8003985.java |
| diffstat | 3 files changed, 3 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- 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);
--- 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'
--- 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");