Fri, 08 Feb 2013 12:48:24 +0100
8006423: SA: NullPointerException in sun.jvm.hotspot.debugger.bsd.BsdThread.getContext(BsdThread.java:67)
Summary: Do not rely on mach thread port names to identify threads from SA
Reviewed-by: dholmes, minqi, rbackman
never@3156 | 1 | /* |
never@3156 | 2 | * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. |
never@3156 | 3 | * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
never@3156 | 4 | * |
never@3156 | 5 | * This code is free software; you can redistribute it and/or modify it |
never@3156 | 6 | * under the terms of the GNU General Public License version 2 only, as |
never@3156 | 7 | * published by the Free Software Foundation. |
never@3156 | 8 | * |
never@3156 | 9 | * This code is distributed in the hope that it will be useful, but WITHOUT |
never@3156 | 10 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
never@3156 | 11 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
never@3156 | 12 | * version 2 for more details (a copy is included in the LICENSE file that |
never@3156 | 13 | * accompanied this code). |
never@3156 | 14 | * |
never@3156 | 15 | * You should have received a copy of the GNU General Public License version |
never@3156 | 16 | * 2 along with this work; if not, write to the Free Software Foundation, |
never@3156 | 17 | * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
never@3156 | 18 | * |
never@3156 | 19 | * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
never@3156 | 20 | * or visit www.oracle.com if you need additional information or have any |
never@3156 | 21 | * questions. |
never@3156 | 22 | * |
never@3156 | 23 | */ |
never@3156 | 24 | |
never@3156 | 25 | #include "precompiled.hpp" |
twisti@4318 | 26 | #include "asm/macroAssembler.hpp" |
twisti@4318 | 27 | #include "asm/macroAssembler.inline.hpp" |
never@3156 | 28 | #include "runtime/os.hpp" |
never@3156 | 29 | #include "runtime/threadLocalStorage.hpp" |
never@3156 | 30 | |
never@3156 | 31 | #ifndef _LP64 |
never@3156 | 32 | void MacroAssembler::int3() { |
never@3156 | 33 | call(RuntimeAddress(CAST_FROM_FN_PTR(address, os::breakpoint))); |
never@3156 | 34 | } |
never@3156 | 35 | |
never@3156 | 36 | void MacroAssembler::get_thread(Register thread) { |
never@3156 | 37 | movl(thread, rsp); |
never@3156 | 38 | shrl(thread, PAGE_SHIFT); |
never@3156 | 39 | |
never@3156 | 40 | ExternalAddress tls_base((address)ThreadLocalStorage::sp_map_addr()); |
never@3156 | 41 | Address index(noreg, thread, Address::times_4); |
never@3156 | 42 | ArrayAddress tls(tls_base, index); |
never@3156 | 43 | |
never@3156 | 44 | movptr(thread, tls); |
never@3156 | 45 | } |
never@3156 | 46 | #else |
never@3156 | 47 | void MacroAssembler::int3() { |
never@3156 | 48 | call(RuntimeAddress(CAST_FROM_FN_PTR(address, os::breakpoint))); |
never@3156 | 49 | } |
never@3156 | 50 | |
never@3156 | 51 | void MacroAssembler::get_thread(Register thread) { |
never@3156 | 52 | // call pthread_getspecific |
never@3156 | 53 | // void * pthread_getspecific(pthread_key_t key); |
never@3156 | 54 | if (thread != rax) { |
never@3156 | 55 | push(rax); |
never@3156 | 56 | } |
never@3156 | 57 | push(rdi); |
never@3156 | 58 | push(rsi); |
never@3156 | 59 | push(rdx); |
never@3156 | 60 | push(rcx); |
never@3156 | 61 | push(r8); |
never@3156 | 62 | push(r9); |
never@3156 | 63 | push(r10); |
never@3156 | 64 | // XXX |
never@3156 | 65 | mov(r10, rsp); |
never@3156 | 66 | andq(rsp, -16); |
never@3156 | 67 | push(r10); |
never@3156 | 68 | push(r11); |
never@3156 | 69 | |
never@3156 | 70 | movl(rdi, ThreadLocalStorage::thread_index()); |
never@3156 | 71 | call(RuntimeAddress(CAST_FROM_FN_PTR(address, pthread_getspecific))); |
never@3156 | 72 | |
never@3156 | 73 | pop(r11); |
never@3156 | 74 | pop(rsp); |
never@3156 | 75 | pop(r10); |
never@3156 | 76 | pop(r9); |
never@3156 | 77 | pop(r8); |
never@3156 | 78 | pop(rcx); |
never@3156 | 79 | pop(rdx); |
never@3156 | 80 | pop(rsi); |
never@3156 | 81 | pop(rdi); |
never@3156 | 82 | if (thread != rax) { |
never@3156 | 83 | mov(thread, rax); |
never@3156 | 84 | pop(rax); |
never@3156 | 85 | } |
never@3156 | 86 | } |
never@3156 | 87 | #endif |