Mercurial > hg > graal-compiler
annotate src/cpu/x86/vm/interpreterRT_x86_32.cpp @ 1842:6e0aac35bfa9
6980838: G1: guarantee(false) failed: thread has an unexpected active value in its SATB queue
Summary: Under certain circumstances a safepoint could happen between a JavaThread object being created and that object being added to the Java threads list. This could cause the active field of that thread's SATB queue to get out-of-sync with respect to the other Java threads. The solution is to activate the SATB queue, when necessary, before adding the thread to the Java threads list, not when the JavaThread object is created. The changeset also includes a small fix to rename the surrogate locker thread from "Surrogate Locker Thread (CMS)" to "Surrogate Locker Thread (Concurrent GC)" since it's also used in G1.
Reviewed-by: iveresov, ysr, johnc, jcoomes
| author | tonyp |
|---|---|
| date | Fri, 01 Oct 2010 16:43:05 -0400 |
| parents | 126ea7725993 |
| children | f95d63e2154a |
| rev | line source |
|---|---|
| 0 | 1 /* |
|
1552
c18cbe5936b8
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
1506
diff
changeset
|
2 * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. |
| 0 | 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
| 4 * | |
| 5 * This code is free software; you can redistribute it and/or modify it | |
| 6 * under the terms of the GNU General Public License version 2 only, as | |
| 7 * published by the Free Software Foundation. | |
| 8 * | |
| 9 * This code is distributed in the hope that it will be useful, but WITHOUT | |
| 10 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 11 * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 12 * version 2 for more details (a copy is included in the LICENSE file that | |
| 13 * accompanied this code). | |
| 14 * | |
| 15 * You should have received a copy of the GNU General Public License version | |
| 16 * 2 along with this work; if not, write to the Free Software Foundation, | |
| 17 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | |
| 18 * | |
|
1552
c18cbe5936b8
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
1506
diff
changeset
|
19 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
|
c18cbe5936b8
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
1506
diff
changeset
|
20 * or visit www.oracle.com if you need additional information or have any |
|
c18cbe5936b8
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
1506
diff
changeset
|
21 * questions. |
| 0 | 22 * |
| 23 */ | |
| 24 | |
| 25 #include "incls/_precompiled.incl" | |
| 26 #include "incls/_interpreterRT_x86_32.cpp.incl" | |
| 27 | |
| 28 | |
| 29 #define __ _masm-> | |
| 30 | |
| 31 | |
| 32 // Implementation of SignatureHandlerGenerator | |
| 33 void InterpreterRuntime::SignatureHandlerGenerator::pass_int() { | |
| 34 move(offset(), jni_offset() + 1); | |
| 35 } | |
| 36 | |
|
1681
126ea7725993
6953477: Increase portability and flexibility of building Hotspot
bobv
parents:
1552
diff
changeset
|
37 void InterpreterRuntime::SignatureHandlerGenerator::pass_float() { |
|
126ea7725993
6953477: Increase portability and flexibility of building Hotspot
bobv
parents:
1552
diff
changeset
|
38 move(offset(), jni_offset() + 1); |
|
126ea7725993
6953477: Increase portability and flexibility of building Hotspot
bobv
parents:
1552
diff
changeset
|
39 } |
|
126ea7725993
6953477: Increase portability and flexibility of building Hotspot
bobv
parents:
1552
diff
changeset
|
40 |
| 0 | 41 void InterpreterRuntime::SignatureHandlerGenerator::pass_long() { |
| 42 move(offset(), jni_offset() + 2); | |
| 43 move(offset() + 1, jni_offset() + 1); | |
| 44 } | |
| 45 | |
| 46 void InterpreterRuntime::SignatureHandlerGenerator::pass_object() { | |
| 47 box (offset(), jni_offset() + 1); | |
| 48 } | |
| 49 | |
| 50 void InterpreterRuntime::SignatureHandlerGenerator::move(int from_offset, int to_offset) { | |
| 51 __ movl(temp(), Address(from(), Interpreter::local_offset_in_bytes(from_offset))); | |
| 52 __ movl(Address(to(), to_offset * wordSize), temp()); | |
| 53 } | |
| 54 | |
| 55 | |
| 56 void InterpreterRuntime::SignatureHandlerGenerator::box(int from_offset, int to_offset) { | |
| 304 | 57 __ lea(temp(), Address(from(), Interpreter::local_offset_in_bytes(from_offset))); |
| 58 __ cmpptr(Address(from(), Interpreter::local_offset_in_bytes(from_offset)), (int32_t)NULL_WORD); // do not use temp() to avoid AGI | |
| 0 | 59 Label L; |
| 60 __ jcc(Assembler::notZero, L); | |
|
512
db4caa99ef11
6787106: Hotspot 32 bit build fails on platforms having different definitions for intptr_t & int32_t
xlu
parents:
337
diff
changeset
|
61 __ movptr(temp(), NULL_WORD); |
| 0 | 62 __ bind(L); |
| 304 | 63 __ movptr(Address(to(), to_offset * wordSize), temp()); |
| 0 | 64 } |
| 65 | |
| 66 | |
| 67 void InterpreterRuntime::SignatureHandlerGenerator::generate( uint64_t fingerprint) { | |
| 68 // generate code to handle arguments | |
| 69 iterate(fingerprint); | |
| 70 // return result handler | |
| 71 __ lea(rax, | |
| 72 ExternalAddress((address)Interpreter::result_handler(method()->result_type()))); | |
| 73 // return | |
| 74 __ ret(0); | |
| 75 __ flush(); | |
| 76 } | |
| 77 | |
| 78 | |
| 79 Register InterpreterRuntime::SignatureHandlerGenerator::from() { return rdi; } | |
| 80 Register InterpreterRuntime::SignatureHandlerGenerator::to() { return rsp; } | |
| 81 Register InterpreterRuntime::SignatureHandlerGenerator::temp() { return rcx; } | |
| 82 | |
| 83 | |
| 84 // Implementation of SignatureHandlerLibrary | |
| 85 | |
| 86 void SignatureHandlerLibrary::pd_set_handler(address handler) {} | |
| 87 | |
| 88 class SlowSignatureHandler: public NativeSignatureIterator { | |
| 89 private: | |
| 90 address _from; | |
| 91 intptr_t* _to; | |
| 92 | |
| 93 virtual void pass_int() { | |
| 94 *_to++ = *(jint *)(_from+Interpreter::local_offset_in_bytes(0)); | |
| 1506 | 95 _from -= Interpreter::stackElementSize; |
| 0 | 96 } |
| 97 | |
|
1681
126ea7725993
6953477: Increase portability and flexibility of building Hotspot
bobv
parents:
1552
diff
changeset
|
98 virtual void pass_float() { |
|
126ea7725993
6953477: Increase portability and flexibility of building Hotspot
bobv
parents:
1552
diff
changeset
|
99 *_to++ = *(jint *)(_from+Interpreter::local_offset_in_bytes(0)); |
|
126ea7725993
6953477: Increase portability and flexibility of building Hotspot
bobv
parents:
1552
diff
changeset
|
100 _from -= Interpreter::stackElementSize; |
|
126ea7725993
6953477: Increase portability and flexibility of building Hotspot
bobv
parents:
1552
diff
changeset
|
101 } |
|
126ea7725993
6953477: Increase portability and flexibility of building Hotspot
bobv
parents:
1552
diff
changeset
|
102 |
| 0 | 103 virtual void pass_long() { |
| 104 _to[0] = *(intptr_t*)(_from+Interpreter::local_offset_in_bytes(1)); | |
| 105 _to[1] = *(intptr_t*)(_from+Interpreter::local_offset_in_bytes(0)); | |
| 106 _to += 2; | |
| 1506 | 107 _from -= 2*Interpreter::stackElementSize; |
| 0 | 108 } |
| 109 | |
| 110 virtual void pass_object() { | |
| 111 // pass address of from | |
| 112 intptr_t from_addr = (intptr_t)(_from + Interpreter::local_offset_in_bytes(0)); | |
|
533
dc3ad84615cf
6795913: A few remaining wrong casts need to be fixed for building hotspot successfully on Mac OS.
xlu
parents:
512
diff
changeset
|
113 *_to++ = (*(intptr_t*)from_addr == 0) ? NULL_WORD : from_addr; |
| 1506 | 114 _from -= Interpreter::stackElementSize; |
| 0 | 115 } |
| 116 | |
| 117 public: | |
| 118 SlowSignatureHandler(methodHandle method, address from, intptr_t* to) : | |
| 119 NativeSignatureIterator(method) { | |
| 120 _from = from; | |
| 121 _to = to + (is_static() ? 2 : 1); | |
| 122 } | |
| 123 }; | |
| 124 | |
| 125 IRT_ENTRY(address, InterpreterRuntime::slow_signature_handler(JavaThread* thread, methodOopDesc* method, intptr_t* from, intptr_t* to)) | |
| 126 methodHandle m(thread, (methodOop)method); | |
| 127 assert(m->is_native(), "sanity check"); | |
| 128 // handle arguments | |
| 129 SlowSignatureHandler(m, (address)from, to + 1).iterate(UCONST64(-1)); | |
| 130 // return result handler | |
| 131 return Interpreter::result_handler(m->result_type()); | |
| 132 IRT_END |