OpenJDK / bsd-port / bsd-port / hotspot
changeset 5859:502c24b2ffae jdk7u80-b10
Merge
| author | asaha |
|---|---|
| date | Mon, 16 Feb 2015 10:52:53 -0800 |
| parents | 8e13e38e5249 5cef060f38ca |
| children | 5b0f798ecd41 |
| files | .hgtags make/hotspot_version |
| diffstat | 4 files changed, 12 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Mon Feb 09 15:29:19 2015 -0800 +++ b/.hgtags Mon Feb 16 10:52:53 2015 -0800 @@ -797,6 +797,7 @@ 5439057a4c7fd26de2fe129eb5d695dda7f42dcf jdk7u79-b07 e65e02cf3523bf5c5ea4df6d17a7b60b456c53b5 jdk7u79-b08 641e2adae9d455ef8a41b319e86c4ed8148735b9 jdk7u79-b09 +e5512513c35ccd3f3552039b0cf6352cce0af9f2 jdk7u79-b10 b92f390febd01615af4a736b4f830f6052aa1d09 hs24.80-b00 1448ebfef4f1aae0174eca983ad05507730ca6fd hs24.80-b01 b1d29549dca7e36a4d050af5a54f8f56963a5c7d hs24.80-b02
--- a/make/hotspot_version Mon Feb 09 15:29:19 2015 -0800 +++ b/make/hotspot_version Mon Feb 16 10:52:53 2015 -0800 @@ -35,7 +35,7 @@ HS_MAJOR_VER=24 HS_MINOR_VER=80 -HS_BUILD_NUMBER=10 +HS_BUILD_NUMBER=11 JDK_MAJOR_VER=1 JDK_MINOR_VER=7
--- a/src/cpu/sparc/vm/assembler_sparc.inline.hpp Mon Feb 09 15:29:19 2015 -0800 +++ b/src/cpu/sparc/vm/assembler_sparc.inline.hpp Mon Feb 16 10:52:53 2015 -0800 @@ -119,7 +119,15 @@ inline void Assembler::ldf(FloatRegisterImpl::Width w, Register s1, Register s2, FloatRegister d) { emit_long( op(ldst_op) | fd(d, w) | alt_op3(ldf_op3, w) | rs1(s1) | rs2(s2) ); } inline void Assembler::ldf(FloatRegisterImpl::Width w, Register s1, int simm13a, FloatRegister d, RelocationHolder const& rspec) { emit_data( op(ldst_op) | fd(d, w) | alt_op3(ldf_op3, w) | rs1(s1) | immed(true) | simm(simm13a, 13), rspec); } -inline void Assembler::ldf(FloatRegisterImpl::Width w, const Address& a, FloatRegister d, int offset) { relocate(a.rspec(offset)); ldf( w, a.base(), a.disp() + offset, d); } +inline void Assembler::ldf(FloatRegisterImpl::Width w, const Address& a, FloatRegister d, int offset) { + relocate(a.rspec(offset)); + if (a.has_index()) { + assert(offset == 0, ""); + ldf(w, a.base(), a.index(), d); + } else { + ldf(w, a.base(), a.disp() + offset, d); + } +} inline void Assembler::ldfsr( Register s1, Register s2) { v9_dep(); emit_long( op(ldst_op) | op3(ldfsr_op3) | rs1(s1) | rs2(s2) ); } inline void Assembler::ldfsr( Register s1, int simm13a) { v9_dep(); emit_data( op(ldst_op) | op3(ldfsr_op3) | rs1(s1) | immed(true) | simm(simm13a, 13)); }
--- a/src/share/vm/memory/referenceProcessor.cpp Mon Feb 09 15:29:19 2015 -0800 +++ b/src/share/vm/memory/referenceProcessor.cpp Mon Feb 16 10:52:53 2015 -0800 @@ -256,7 +256,7 @@ // Cleaner references to be temporary, and don't want to deal with // possible incompatibilities arising from making it more visible. phantom_count += - process_discovered_reflist(_discoveredCleanerRefs, NULL, false, + process_discovered_reflist(_discoveredCleanerRefs, NULL, true, is_alive, keep_alive, complete_gc, task_executor); }