jdk7/jdk7/hotspot: aa9c266de52a (original) (raw)

OpenJDK / jdk7 / jdk7 / hotspot

changeset 1383:aa9c266de52a

6944473: 6941224 misses new files Summary: Two new files are missing in the push for 6941224. Reviewed-by: twisti Contributed-by: Gary Benson gbenson@redhat.com

line wrap: on

line diff

--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/cpu/zero/vm/stack_zero.cpp Fri Apr 16 05:05:53 2010 -0700 @@ -0,0 +1,73 @@ +/*

• • Copyright 2003-2007 Sun Microsystems, Inc. All Rights Reserved.
• • Copyright 2010 Red Hat, Inc.
• • 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
• • CA 95054 USA or visit www.sun.com if you need additional information or
• • have any questions.
• *
• */ + +#include "incls/_precompiled.incl" +#include "incls/_stack_zero.cpp.incl" + +void ZeroStack::handle_overflow(TRAPS) {
• JavaThread *thread = (JavaThread *) THREAD; +
• // Set up the frame anchor if it isn't already
• bool has_last_Java_frame = thread->has_last_Java_frame();
• if (!has_last_Java_frame) {
• ZeroFrame *frame = thread->top_zero_frame();
• while (frame) {

•  if (frame->is_shark_frame())[](#l1.40)

•    break;[](#l1.41)

+

•  if (frame->is_interpreter_frame()) {[](#l1.43)

•    interpreterState istate =[](#l1.44)

•      frame->as_interpreter_frame()->interpreter_state();[](#l1.45)

•    if (istate->self_link() == istate)[](#l1.46)

•      break;[](#l1.47)

•  }[](#l1.48)

+

•  frame = frame->next();[](#l1.50)

• }

+

• if (frame == NULL)

•  fatal("unrecoverable stack overflow");[](#l1.54)

+

• thread->set_last_Java_frame(frame);
• } +
• // Throw the exception
• switch (thread->thread_state()) {
• case _thread_in_Java:
• InterpreterRuntime::throw_StackOverflowError(thread);
• break;

+

• case _thread_in_vm:
• Exceptions::throw_stack_overflow_exception(thread, FILE, LINE);
• break;

+

• default:
• ShouldNotReachHere();
• } +
• // Reset the frame anchor if necessary
• if (!has_last_Java_frame)
• thread->reset_last_Java_frame();

+}

--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/cpu/zero/vm/stack_zero.inline.hpp Fri Apr 16 05:05:53 2010 -0700 @@ -0,0 +1,43 @@ +/*

• • Copyright 2003-2007 Sun Microsystems, Inc. All Rights Reserved.
• • Copyright 2010 Red Hat, Inc.
• • 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
• • CA 95054 USA or visit www.sun.com if you need additional information or
• • have any questions.
• *
• */ + +// This function should match SharkStack::CreateStackOverflowCheck +inline void ZeroStack::overflow_check(int required_words, TRAPS) {
• JavaThread *thread = (JavaThread *) THREAD; +
• // Check the Zero stack
• if (required_words > available_words()) {
• handle_overflow(THREAD);
• return;
• } +
• // Check the ABI stack
• address stack_top = thread->stack_base() - thread->stack_size();
• int free_stack = ((address) &stack_top) - stack_top;
• if (free_stack < shadow_pages_size()) {
• handle_overflow(THREAD);
• return;
• } +}