--- old/src/os_cpu/linux_x86/vm/threadLS_linux_x86.hpp 2015-11-11 15:17:41.544730965 -0500 +++ /dev/null 2015-09-28 11:47:54.419050997 -0400 @@ -1,58 +0,0 @@ -/* - * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - * - */ - -#ifndef OS_CPU_LINUX_X86_VM_THREADLS_LINUX_X86_HPP -#define OS_CPU_LINUX_X86_VM_THREADLS_LINUX_X86_HPP - - // Processor dependent parts of ThreadLocalStorage - -#if !defined(AMD64) && !defined(MINIMIZE_RAM_USAGE) - - // map stack pointer to thread pointer - see notes in threadLS_linux_x86.cpp - #define SP_BITLENGTH 32 - #define PAGE_SHIFT 12 - #define PAGE_SIZE (1UL << PAGE_SHIFT) - static Thread* _sp_map[1UL << (SP_BITLENGTH - PAGE_SHIFT)]; - -public: - - static Thread** sp_map_addr() { return _sp_map; } - - static Thread* thread() { - uintptr_t sp; - __asm__ volatile ("movl %%esp, %0" : "=r" (sp)); - return _sp_map[sp >> PAGE_SHIFT]; - } - -#else - -public: - - static Thread* thread() { - return (Thread*) os::thread_local_storage_at(thread_index()); - } - -#endif // AMD64 || MINIMIZE_RAM_USAGE - -#endif // OS_CPU_LINUX_X86_VM_THREADLS_LINUX_X86_HPP