Mercurial > hg > release > icedtea8-forest-3.0 > hotspot
changeset 8919:abb34b2ea83e
PR2853: Remove some AArch64-specific code in share/.
| author | aph |
|---|---|
| date | Wed, 17 Feb 2016 02:47:12 +0000 |
| parents | 53d704419b0c |
| children | c8e92c4b039c |
| files | src/os/linux/vm/os_linux.cpp src/share/vm/code/relocInfo.cpp src/share/vm/interpreter/interpreterRuntime.cpp src/share/vm/memory/binaryTreeDictionary.cpp src/share/vm/opto/c2_globals.hpp src/share/vm/opto/memnode.cpp src/share/vm/opto/memnode.hpp src/share/vm/prims/jvmtiExport.cpp src/share/vm/runtime/globals.hpp src/share/vm/runtime/javaCalls.cpp |
| diffstat | 10 files changed, 19 insertions(+), 34 deletions(-) [+] |
line wrap: on
line diff
--- a/src/os/linux/vm/os_linux.cpp Wed Sep 16 11:12:01 2015 +0000 +++ b/src/os/linux/vm/os_linux.cpp Wed Feb 17 02:47:12 2016 +0000 @@ -1496,8 +1496,6 @@ jio_snprintf(buf, sizeof(buf), UINTX_FORMAT, os::current_thread_id()); out.print_raw_cr(buf); out.print_raw_cr("Dumping core ..."); - out.print_raw_cr("LOOPING..."); - for (;;); #endif ::abort(); // dump core }
--- a/src/share/vm/code/relocInfo.cpp Wed Sep 16 11:12:01 2015 +0000 +++ b/src/share/vm/code/relocInfo.cpp Wed Feb 17 02:47:12 2016 +0000 @@ -147,6 +147,8 @@ _section_end [CodeBuffer::SECT_STUBS ] = nm->stub_end() ; assert(!has_current(), "just checking"); + assert(begin == NULL || begin >= nm->code_begin(), "in bounds"); + assert(limit == NULL || limit <= nm->code_end(), "in bounds"); set_limits(begin, limit); }
--- a/src/share/vm/interpreter/interpreterRuntime.cpp Wed Sep 16 11:12:01 2015 +0000 +++ b/src/share/vm/interpreter/interpreterRuntime.cpp Wed Feb 17 02:47:12 2016 +0000 @@ -388,7 +388,7 @@ // the exception oop (via TLS) and sets the bci/bcp for the continuation. // The exception oop is returned to make sure it is preserved over GC (it // is only on the stack if the exception was thrown explicitly via athrow). -// During this operation, the expression stack contains teh values for the +// During this operation, the expression stack contains the values for the // bci where the exception happened. If the exception was propagated back // from a call, the expression stack contains the values for the bci at the // invoke w/o arguments (i.e., as if one were inside the call).
--- a/src/share/vm/memory/binaryTreeDictionary.cpp Wed Sep 16 11:12:01 2015 +0000 +++ b/src/share/vm/memory/binaryTreeDictionary.cpp Wed Feb 17 02:47:12 2016 +0000 @@ -1044,7 +1044,7 @@ template <class Chunk_t, class FreeList_t> Chunk_t* BinaryTreeDictionary<Chunk_t, FreeList_t>::find_chunk_ends_at(HeapWord* target) const { EndTreeSearchClosure<Chunk_t, FreeList_t> etsc(target); - bool found_target = etsc.do_tree(this->root()); + bool found_target = etsc.do_tree(root()); assert(found_target || etsc.found() == NULL, "Consistency check"); assert(!found_target || etsc.found() != NULL, "Consistency check"); return etsc.found(); @@ -1056,7 +1056,7 @@ BeginSweepClosure<Chunk_t, FreeList_t> bsc(coalSurplusPercent, inter_sweep_current, inter_sweep_estimate, intra_sweep_estimate); - bsc.do_tree(this->root()); + bsc.do_tree(root()); } // Closures and methods for calculating total bytes returned to the
--- a/src/share/vm/opto/c2_globals.hpp Wed Sep 16 11:12:01 2015 +0000 +++ b/src/share/vm/opto/c2_globals.hpp Wed Feb 17 02:47:12 2016 +0000 @@ -659,6 +659,9 @@ product(bool, UseMathExactIntrinsics, true, \ "Enables intrinsification of various java.lang.Math functions") \ \ + product(bool, UseMultiplyToLenIntrinsic, false, \ + "Enables intrinsification of BigInteger.multiplyToLen()") \ + \ product(bool, UseTypeSpeculation, true, \ "Speculatively propagate types from profiles") \ \
--- a/src/share/vm/opto/memnode.cpp Wed Sep 16 11:12:01 2015 +0000 +++ b/src/share/vm/opto/memnode.cpp Wed Feb 17 02:47:12 2016 +0000 @@ -55,17 +55,6 @@ return calculate_adr_type(adr->bottom_type(), cross_check); } -bool MemNode::is_volatile() const { -#ifndef ASSERT - // fake the missing field - const TypePtr* _adr_type = NULL; - if (in(Address) != NULL) - _adr_type = in(Address)->bottom_type()->isa_ptr(); -#endif - Compile* C = Compile::current(); - return C->alias_type(_adr_type)->is_volatile(); -} - #ifndef PRODUCT void MemNode::dump_spec(outputStream *st) const { if (in(Address) == NULL) return; // node is dead
--- a/src/share/vm/opto/memnode.hpp Wed Sep 16 11:12:01 2015 +0000 +++ b/src/share/vm/opto/memnode.hpp Wed Feb 17 02:47:12 2016 +0000 @@ -129,9 +129,6 @@ // the given memory state? (The state may or may not be in(Memory).) Node* can_see_stored_value(Node* st, PhaseTransform* phase) const; - // True if this memory is volatile - bool is_volatile() const; - #ifndef PRODUCT static void dump_adr_type(const Node* mem, const TypePtr* adr_type, outputStream *st); virtual void dump_spec(outputStream *st) const;
--- a/src/share/vm/prims/jvmtiExport.cpp Wed Sep 16 11:12:01 2015 +0000 +++ b/src/share/vm/prims/jvmtiExport.cpp Wed Feb 17 02:47:12 2016 +0000 @@ -1237,11 +1237,14 @@ } } +#ifdef AARCH64 // FIXME: this is just a kludge to get JVMTI going. Compiled // MethodHandle code doesn't call the JVMTI notify routines, so the // stack depth we see here is wrong. state->invalidate_cur_stack_depth(); - // state->decr_cur_stack_depth(); +#else + state->decr_cur_stack_depth(); +#endif }
--- a/src/share/vm/runtime/globals.hpp Wed Sep 16 11:12:01 2015 +0000 +++ b/src/share/vm/runtime/globals.hpp Wed Feb 17 02:47:12 2016 +0000 @@ -732,9 +732,6 @@ product(bool, UseCRC32Intrinsics, false, \ "use intrinsics for java.util.zip.CRC32") \ \ - product(bool, UseMultiplyToLenIntrinsic, false, \ - "Enables intrinsification of BigInteger.multiplyToLen()") \ - \ develop(bool, TraceCallFixup, false, \ "Trace all call fixups") \ \ @@ -1261,8 +1258,6 @@ product(bool, CompactFields, true, \ "Allocate nonstatic fields in gaps between previous fields") \ \ - product(bool, UseBiasedLocking, true, \ - "Enable biased locking in JVM") \ notproduct(bool, PrintFieldLayout, false, \ "Print field layout for each class") \ \ @@ -1275,6 +1270,8 @@ product(bool, RestrictContended, true, \ "Restrict @Contended to trusted classes") \ \ + product(bool, UseBiasedLocking, true, \ + "Enable biased locking in JVM") \ \ product(intx, BiasedLockingStartupDelay, 4000, \ "Number of milliseconds to wait before enabling biased locking") \ @@ -3823,7 +3820,7 @@ product(uintx, SharedMiscDataSize, NOT_LP64(2*M) LP64_ONLY(4*M), \ "Size of the shared miscellaneous data area (in bytes)") \ \ - product(uintx, SharedMiscCodeSize, 192*K, \ + product(uintx, SharedMiscCodeSize, AARCH64_ONLY(192*K) NOT_AARCH64(120*K), \ "Size of the shared miscellaneous code area (in bytes)") \ \ product(uintx, SharedBaseAddress, LP64_ONLY(32*G) \
--- a/src/share/vm/runtime/javaCalls.cpp Wed Sep 16 11:12:01 2015 +0000 +++ b/src/share/vm/runtime/javaCalls.cpp Wed Feb 17 02:47:12 2016 +0000 @@ -394,19 +394,15 @@ { JavaCallWrapper link(method, receiver, result, CHECK); { HandleMark hm(thread); // HandleMark used by HandleMarkCleaner - StubRoutines::CallStub stub = StubRoutines::call_stub(); - int size_of_parameters = args->size_of_parameters(); - intptr_t* parameters = args->parameters(); - Method* meth = method(); - stub( + StubRoutines::call_stub()( (address)&link, // (intptr_t*)&(result->_value), // see NOTE above (compiler problem) result_val_address, // see NOTE above (compiler problem) result_type, - meth, + method(), entry_point, - parameters, - size_of_parameters, + args->parameters(), + args->size_of_parameters(), CHECK );