Ignore:
Timestamp:
Mar 26, 2011, 8:39:20 PM (14 years ago)
Author:
dmik
Message:

trunk: Merged in openjdk6 b22 from branches/vendor/oracle.

Location:
trunk/openjdk
Files:
71 edited
3 copied

Legend:

Unmodified
Added
Removed

  • trunk/openjdk

  • trunk/openjdk/hotspot/src/cpu/zero/vm/assembler_zero.cpp

    r2 r278  
    11/*
    2  * Copyright 2003-2007 Sun Microsystems, Inc.  All Rights Reserved.
     2 * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2007, 2008, 2009 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    1818 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1919 *
    20  * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    21  * CA 95054 USA or visit www.sun.com if you need additional information or
    22  * have any questions.
     20 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     21 * or visit www.oracle.com if you need additional information or have any
     22 * questions.
    2323 *
    2424 */

  • trunk/openjdk/hotspot/src/cpu/zero/vm/assembler_zero.hpp

    r2 r278  
    11/*
    2  * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
     2 * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2007, 2008, 2009 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    1818 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1919 *
    20  * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    21  * CA 95054 USA or visit www.sun.com if you need additional information or
    22  * have any questions.
     20 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     21 * or visit www.oracle.com if you need additional information or have any
     22 * questions.
    2323 *
    2424 */

  • trunk/openjdk/hotspot/src/cpu/zero/vm/assembler_zero.inline.hpp

    r2 r278  
    11/*
    2  * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
     2 * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2009 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    1818 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1919 *
    20  * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    21  * CA 95054 USA or visit www.sun.com if you need additional information or
    22  * have any questions.
     20 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     21 * or visit www.oracle.com if you need additional information or have any
     22 * questions.
    2323 *
    2424 */

  • trunk/openjdk/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.cpp

    r2 r278  
    11/*
    2  * Copyright 2003-2007 Sun Microsystems, Inc.  All Rights Reserved.
     2 * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2008 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    1818 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1919 *
    20  * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    21  * CA 95054 USA or visit www.sun.com if you need additional information or
    22  * have any questions.
     20 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     21 * or visit www.oracle.com if you need additional information or have any
     22 * questions.
    2323 *
    2424 */

  • trunk/openjdk/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.hpp

    r2 r278  
    11/*
    2  * Copyright 2002 Sun Microsystems, Inc.  All Rights Reserved.
     2 * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2007, 2008 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    1818 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1919 *
    20  * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    21  * CA 95054 USA or visit www.sun.com if you need additional information or
    22  * have any questions.
     20 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     21 * or visit www.oracle.com if you need additional information or have any
     22 * questions.
    2323 *
    2424 */

  • trunk/openjdk/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.inline.hpp

    r2 r278  
    11/*
    2  * Copyright 2002 Sun Microsystems, Inc.  All Rights Reserved.
    3  * Copyright 2007 Red Hat, Inc.
     2 * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
     3 * Copyright 2007, 2010 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    55 *
    … …  
    1818 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1919 *
    20  * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    21  * CA 95054 USA or visit www.sun.com if you need additional information or
    22  * have any questions.
     20 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     21 * or visit www.oracle.com if you need additional information or have any
     22 * questions.
    2323 *
    2424 */
    … …  
    269269}
    270270
    271 inline jint BytecodeInterpreter::VMintUshr(jint op1, jint op2) {
     271inline juint BytecodeInterpreter::VMintUshr(jint op1, jint op2) {
    272272  return ((juint) op1) >> (op2 & 0x1F);
    273273}

  • trunk/openjdk/hotspot/src/cpu/zero/vm/bytecodes_zero.cpp

    r2 r278  
    11/*
    2  * Copyright 2003 Sun Microsystems, Inc.  All Rights Reserved.
     2 * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2007 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    1818 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1919 *
    20  * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    21  * CA 95054 USA or visit www.sun.com if you need additional information or
    22  * have any questions.
     20 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     21 * or visit www.oracle.com if you need additional information or have any
     22 * questions.
    2323 *
    2424 */

  • trunk/openjdk/hotspot/src/cpu/zero/vm/bytecodes_zero.hpp

    r2 r278  
    11/*
    2  * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
     2 * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2009 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    1818 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1919 *
    20  * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    21  * CA 95054 USA or visit www.sun.com if you need additional information or
    22  * have any questions.
     20 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     21 * or visit www.oracle.com if you need additional information or have any
     22 * questions.
    2323 *
    2424 */

  • trunk/openjdk/hotspot/src/cpu/zero/vm/bytes_zero.hpp

    r2 r278  
    11/*
    2  * Copyright 1997-2002 Sun Microsystems, Inc.  All Rights Reserved.
     2 * Copyright (c) 1997, 2002, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2007, 2008, 2009 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    1818 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1919 *
    20  * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    21  * CA 95054 USA or visit www.sun.com if you need additional information or
    22  * have any questions.
     20 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     21 * or visit www.oracle.com if you need additional information or have any
     22 * questions.
    2323 *
    2424 */

  • trunk/openjdk/hotspot/src/cpu/zero/vm/codeBuffer_zero.hpp

    r2 r278  
    11/*
    2  * Copyright 2003-2005 Sun Microsystems, Inc.  All Rights Reserved.
     2 * Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2007 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    1818 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1919 *
    20  * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    21  * CA 95054 USA or visit www.sun.com if you need additional information or
    22  * have any questions.
     20 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     21 * or visit www.oracle.com if you need additional information or have any
     22 * questions.
    2323 *
    2424 */

  • trunk/openjdk/hotspot/src/cpu/zero/vm/copy_zero.hpp

    r2 r278  
    11/*
    2  * Copyright 2003-2004 Sun Microsystems, Inc.  All Rights Reserved.
     2 * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2007 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    1818 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1919 *
    20  * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    21  * CA 95054 USA or visit www.sun.com if you need additional information or
    22  * have any questions.
     20 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     21 * or visit www.oracle.com if you need additional information or have any
     22 * questions.
    2323 *
    2424 */

  • trunk/openjdk/hotspot/src/cpu/zero/vm/cppInterpreterGenerator_zero.hpp

    r2 r278  
    11/*
    2  * Copyright 2003-2007 Sun Microsystems, Inc.  All Rights Reserved.
     2 * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2008, 2009 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    1818 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1919 *
    20  * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    21  * CA 95054 USA or visit www.sun.com if you need additional information or
    22  * have any questions.
     20 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     21 * or visit www.oracle.com if you need additional information or have any
     22 * questions.
    2323 *
    2424 */

  • trunk/openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp

    r2 r278  
    11/*
    2  * Copyright 2003-2007 Sun Microsystems, Inc.  All Rights Reserved.
    3  * Copyright 2007, 2008, 2009 Red Hat, Inc.
     2 * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved.
     3 * Copyright 2007, 2008, 2009, 2010 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    55 *
    … …  
    1818 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1919 *
    20  * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    21  * CA 95054 USA or visit www.sun.com if you need additional information or
    22  * have any questions.
     20 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     21 * or visit www.oracle.com if you need additional information or have any
     22 * questions.
    2323 *
    2424 */
    … …  
    3838  fixup_after_potential_safepoint()
    3939
    40 void CppInterpreter::normal_entry(methodOop method, intptr_t UNUSED, TRAPS) {
     40int CppInterpreter::normal_entry(methodOop method, intptr_t UNUSED, TRAPS) {
    4141  JavaThread *thread = (JavaThread *) THREAD;
    42   ZeroStack *stack = thread->zero_stack();
    43 
    44   // Adjust the caller's stack frame to accomodate any additional
    45   // local variables we have contiguously with our parameters.
    46   int extra_locals = method->max_locals() - method->size_of_parameters();
    47   if (extra_locals > 0) {
    48     if (extra_locals > stack->available_words()) {
    49       Unimplemented();
    50     }
    51     for (int i = 0; i < extra_locals; i++)
    52       stack->push(0);
    53   }
    5442
    5543  // Allocate and initialize our frame.
    56   InterpreterFrame *frame = InterpreterFrame::build(stack, method, thread);
     44  InterpreterFrame *frame = InterpreterFrame::build(method, CHECK_0);
    5745  thread->push_zero_frame(frame);
    5846
    5947  // Execute those bytecodes!
    6048  main_loop(0, THREAD);
     49
     50  // No deoptimized frames on the stack
     51  return 0;
    6152}
    6253
    … …  
    7667  intptr_t *result = NULL;
    7768  int result_slots = 0;
    78 
    79   // Check we're not about to run out of stack
    80   if (stack_overflow_imminent(thread)) {
    81     CALL_VM_NOCHECK(InterpreterRuntime::throw_StackOverflowError(thread));
    82     goto unwind_and_return;
    83   }
    8469
    8570  while (true) {
    … …  
    124109
    125110      // Allocate the space
    126       if (monitor_words > stack->available_words()) {
    127         Unimplemented();
    128       }
     111      stack->overflow_check(monitor_words, THREAD);
     112      if (HAS_PENDING_EXCEPTION)
     113        break;
    129114      stack->alloc(monitor_words * wordSize);
    130115
    … …  
    146131    else if (istate->msg() == BytecodeInterpreter::return_from_method) {
    147132      // Copy the result into the caller's frame
    148       result_slots = type2size[method->result_type()];
     133      result_slots = type2size[result_type_of(method)];
    149134      assert(result_slots >= 0 && result_slots <= 2, "what?");
    150135      result = istate->stack() + result_slots;
    … …  
    173158  }
    174159
    175  unwind_and_return:
    176 
    177160  // Unwind the current frame
    178161  thread->pop_zero_frame();
    … …  
    186169}
    187170
    188 void CppInterpreter::native_entry(methodOop method, intptr_t UNUSED, TRAPS) {
     171int CppInterpreter::native_entry(methodOop method, intptr_t UNUSED, TRAPS) {
    189172  // Make sure method is native and not abstract
    190173  assert(method->is_native() && !method->is_abstract(), "should be");
    … …  
    194177
    195178  // Allocate and initialize our frame
    196   InterpreterFrame *frame = InterpreterFrame::build(stack, method, thread);
     179  InterpreterFrame *frame = InterpreterFrame::build(method, CHECK_0);
    197180  thread->push_zero_frame(frame);
    198181  interpreterState istate = frame->interpreter_state();
    199182  intptr_t *locals = istate->locals();
    200183
    201   // Check we're not about to run out of stack
    202   if (stack_overflow_imminent(thread)) {
    203     CALL_VM_NOCHECK(InterpreterRuntime::throw_StackOverflowError(thread));
    204     goto unwind_and_return;
    205   }
    206 
    207184  // Update the invocation counter
    208185  if ((UseCompiler || CountCompiledCalls) && !method->is_synchronized()) {
    209     thread->set_do_not_unlock();
    210186    InvocationCounter *counter = method->invocation_counter();
    211187    counter->increment();
    … …  
    216192        goto unwind_and_return;
    217193    }
    218     thread->clr_do_not_unlock();
    219194  }
    220195
    … …  
    246221      CALL_VM_NOCHECK(InterpreterRuntime::prepare_native_call(thread, method));
    247222      if (HAS_PENDING_EXCEPTION)
    248         goto unwind_and_return;
     223        goto unlock_unwind_and_return;
    249224
    250225      handlerAddr = method->signature_handler();
    … …  
    255230        InterpreterRuntime::slow_signature_handler(thread, method, NULL,NULL));
    256231      if (HAS_PENDING_EXCEPTION)
    257         goto unwind_and_return;
     232        goto unlock_unwind_and_return;
    258233    }
    259234    handler = \
    … …  
    267242
    268243  // Build the argument list
    269   if (handler->argument_count() * 2 > stack->available_words()) {
    270     Unimplemented();
    271   }
     244  stack->overflow_check(handler->argument_count() * 2, THREAD);
     245  if (HAS_PENDING_EXCEPTION)
     246    goto unlock_unwind_and_return;
     247
    272248  void **arguments;
    273249  void *mirror; {
    … …  
    366342  thread->active_handles()->clear();
    367343
    368   // Unlock if necessary.  It seems totally wrong that this
    369   // is skipped in the event of an exception but apparently
    370   // the template interpreter does this so we do too.
    371   if (monitor && !HAS_PENDING_EXCEPTION) {
     344 unlock_unwind_and_return:
     345
     346  // Unlock if necessary
     347  if (monitor) {
    372348    BasicLock *lock = monitor->lock();
    373349    markOop header = lock->displaced_header();
    … …  
    395371  // Push our result
    396372  if (!HAS_PENDING_EXCEPTION) {
    397     stack->set_sp(stack->sp() - type2size[method->result_type()]);
    398 
    399     switch (method->result_type()) {
     373    BasicType type = result_type_of(method);
     374    stack->set_sp(stack->sp() - type2size[type]);
     375
     376    switch (type) {
    400377    case T_VOID:
    401378      break;
    … …  
    457434    }
    458435  }
    459 }
    460 
    461 void CppInterpreter::accessor_entry(methodOop method, intptr_t UNUSED, TRAPS) {
     436
     437  // No deoptimized frames on the stack
     438  return 0;
     439}
     440
     441int CppInterpreter::accessor_entry(methodOop method, intptr_t UNUSED, TRAPS) {
    462442  JavaThread *thread = (JavaThread *) THREAD;
    463443  ZeroStack *stack = thread->zero_stack();
    … …  
    466446  // Drop into the slow path if we need a safepoint check
    467447  if (SafepointSynchronize::do_call_back()) {
    468     normal_entry(method, 0, THREAD);
    469     return;
     448    return normal_entry(method, 0, THREAD);
    470449  }
    471450
    … …  
    474453  oop object = LOCALS_OBJECT(0);
    475454  if (object == NULL) {
    476     normal_entry(method, 0, THREAD);
    477     return;
     455    return normal_entry(method, 0, THREAD);
    478456  }
    479457
    … …  
    497475  ConstantPoolCacheEntry* entry = cache->entry_at(index);
    498476  if (!entry->is_resolved(Bytecodes::_getfield)) {
    499     normal_entry(method, 0, THREAD);
    500     return;
     477    return normal_entry(method, 0, THREAD);
    501478  }
    502479
    … …  
    505482  case ltos:
    506483  case dtos:
    507     if (stack->available_words() < 1) {
    508       Unimplemented();
    509     }
     484    stack->overflow_check(1, CHECK_0);
    510485    stack->alloc(wordSize);
    511486    break;
    … …  
    587562    }
    588563  }
    589 }
    590 
    591 void CppInterpreter::empty_entry(methodOop method, intptr_t UNUSED, TRAPS) {
     564
     565  // No deoptimized frames on the stack
     566  return 0;
     567}
     568
     569int CppInterpreter::empty_entry(methodOop method, intptr_t UNUSED, TRAPS) {
    592570  JavaThread *thread = (JavaThread *) THREAD;
    593571  ZeroStack *stack = thread->zero_stack();
    … …  
    595573  // Drop into the slow path if we need a safepoint check
    596574  if (SafepointSynchronize::do_call_back()) {
    597     normal_entry(method, 0, THREAD);
    598     return;
     575    return normal_entry(method, 0, THREAD);
    599576  }
    600577
    601578  // Pop our parameters
    602579  stack->set_sp(stack->sp() + method->size_of_parameters());
    603 }
    604 
    605 bool CppInterpreter::stack_overflow_imminent(JavaThread *thread) {
    606   // How is the ABI stack?
    607   address stack_top = thread->stack_base() - thread->stack_size();
    608   int free_stack = os::current_stack_pointer() - stack_top;
    609   if (free_stack < StackShadowPages * os::vm_page_size()) {
    610     return true;
    611   }
    612 
    613   // How is the Zero stack?
    614   // Throwing a StackOverflowError involves a VM call, which means
    615   // we need a frame on the stack.  We should be checking here to
    616   // ensure that methods we call have enough room to install the
    617   // largest possible frame, but that's more than twice the size
    618   // of the entire Zero stack we get by default, so we just check
    619   // we have *some* space instead...
    620   free_stack = thread->zero_stack()->available_words() * wordSize;
    621   if (free_stack < StackShadowPages * os::vm_page_size()) {
    622     return true;
    623   }
    624 
    625   return false;
    626 }
    627 
    628 InterpreterFrame *InterpreterFrame::build(ZeroStack*       stack,
    629                                           const methodOop  method,
    630                                           JavaThread*      thread) {
    631   int monitor_words =
    632     method->is_synchronized() ? frame::interpreter_frame_monitor_size() : 0;
    633   int stack_words = method->is_native() ? 0 : method->max_stack();
    634 
    635   if (header_words + monitor_words + stack_words > stack->available_words()) {
    636     Unimplemented();
    637   }
     580
     581  // No deoptimized frames on the stack
     582  return 0;
     583}
     584
     585InterpreterFrame *InterpreterFrame::build(const methodOop method, TRAPS) {
     586  JavaThread *thread = (JavaThread *) THREAD;
     587  ZeroStack *stack = thread->zero_stack();
     588
     589  // Calculate the size of the frame we'll build, including
     590  // any adjustments to the caller's frame that we'll make.
     591  int extra_locals  = 0;
     592  int monitor_words = 0;
     593  int stack_words   = 0;
     594
     595  if (!method->is_native()) {
     596    extra_locals = method->max_locals() - method->size_of_parameters();
     597    stack_words  = method->max_stack();
     598  }
     599  if (method->is_synchronized()) {
     600    monitor_words = frame::interpreter_frame_monitor_size();
     601  }
     602  stack->overflow_check(
     603    extra_locals + header_words + monitor_words + stack_words, CHECK_NULL);
     604
     605  // Adjust the caller's stack frame to accomodate any additional
     606  // local variables we have contiguously with our parameters.
     607  for (int i = 0; i < extra_locals; i++)
     608    stack->push(0);
    638609
    639610  intptr_t *locals;
    … …  
    708679}
    709680
     681BasicType CppInterpreter::result_type_of(methodOop method) {
     682  BasicType t;
     683  switch (method->result_index()) {
     684    case 0 : t = T_BOOLEAN; break;
     685    case 1 : t = T_CHAR;    break;
     686    case 2 : t = T_BYTE;    break;
     687    case 3 : t = T_SHORT;   break;
     688    case 4 : t = T_INT;     break;
     689    case 5 : t = T_LONG;    break;
     690    case 6 : t = T_VOID;    break;
     691    case 7 : t = T_FLOAT;   break;
     692    case 8 : t = T_DOUBLE;  break;
     693    case 9 : t = T_OBJECT;  break;
     694    default: ShouldNotReachHere();
     695  }
     696  assert(AbstractInterpreter::BasicType_as_index(t) == method->result_index(),
     697         "out of step with AbstractInterpreter::BasicType_as_index");
     698  return t;
     699}
     700
    710701address InterpreterGenerator::generate_empty_entry() {
    711702  if (!UseFastEmptyMethods)
    … …  
    794785// Deoptimization helpers
    795786
    796 InterpreterFrame *InterpreterFrame::build(ZeroStack* stack, int size) {
     787InterpreterFrame *InterpreterFrame::build(int size, TRAPS) {
     788  ZeroStack *stack = ((JavaThread *) THREAD)->zero_stack();
     789
    797790  int size_in_words = size >> LogBytesPerWord;
    798791  assert(size_in_words * wordSize == size, "unaligned");
    799792  assert(size_in_words >= header_words, "too small");
    800 
    801   if (size_in_words > stack->available_words()) {
    802     Unimplemented();
    803   }
     793  stack->overflow_check(size_in_words, CHECK_NULL);
    804794
    805795  stack->push(0); // next_frame, filled in later
    … …  
    831821  assert(popframe_extra_args == 0, "what to do?");
    832822  assert(!is_top_frame || (!callee_locals && !callee_param_count),
    833          "top frame should have no caller")
     823         "top frame should have no caller");
    834824
    835825  // This code must exactly match what InterpreterFrame::build
    … …  
    852842
    853843  if (interpreter_frame) {
    854     intptr_t *locals        = interpreter_frame->sp() + method->max_locals();
     844    intptr_t *locals        = interpreter_frame->fp() + method->max_locals();
    855845    interpreterState istate = interpreter_frame->get_interpreterState();
    856846    intptr_t *monitor_base  = (intptr_t*) istate;

  • trunk/openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_zero.hpp

    r2 r278  
    11/*
    2  * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
    3  * Copyright 2007, 2008 Red Hat, Inc.
     2 * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
     3 * Copyright 2007, 2008, 2010 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    55 *
    … …  
    1818 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1919 *
    20  * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    21  * CA 95054 USA or visit www.sun.com if you need additional information or
    22  * have any questions.
     20 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     21 * or visit www.oracle.com if you need additional information or have any
     22 * questions.
    2323 *
    2424 */
    … …  
    3030 public:
    3131  // Method entries
    32   static void normal_entry(methodOop method, intptr_t UNUSED, TRAPS);
    33   static void native_entry(methodOop method, intptr_t UNUSED, TRAPS);
    34   static void accessor_entry(methodOop method, intptr_t UNUSED, TRAPS);
    35   static void empty_entry(methodOop method, intptr_t UNUSED, TRAPS);
     32  static int normal_entry(methodOop method, intptr_t UNUSED, TRAPS);
     33  static int native_entry(methodOop method, intptr_t UNUSED, TRAPS);
     34  static int accessor_entry(methodOop method, intptr_t UNUSED, TRAPS);
     35  static int empty_entry(methodOop method, intptr_t UNUSED, TRAPS);
    3636
    3737 public:
    … …  
    4040
    4141 private:
    42   // Stack overflow checks
    43   static bool stack_overflow_imminent(JavaThread *thread);
     42  // Fast result type determination
     43  static BasicType result_type_of(methodOop method);

  • trunk/openjdk/hotspot/src/cpu/zero/vm/debug_zero.cpp

    r2 r278  
    11/*
    2  * Copyright 2003-2007 Sun Microsystems, Inc.  All Rights Reserved.
     2 * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2007 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    1818 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1919 *
    20  * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    21  * CA 95054 USA or visit www.sun.com if you need additional information or
    22  * have any questions.
     20 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     21 * or visit www.oracle.com if you need additional information or have any
     22 * questions.
    2323 *
    2424 */

  • trunk/openjdk/hotspot/src/cpu/zero/vm/depChecker_zero.cpp

    r2 r278  
    11/*
    2  * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
     2 * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2009 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    1818 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1919 *
    20  * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    21  * CA 95054 USA or visit www.sun.com if you need additional information or
    22  * have any questions.
     20 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     21 * or visit www.oracle.com if you need additional information or have any
     22 * questions.
    2323 *
    2424 */

  • trunk/openjdk/hotspot/src/cpu/zero/vm/depChecker_zero.hpp

    r2 r278  
    11/*
    2  * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
     2 * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2009 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    1818 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1919 *
    20  * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    21  * CA 95054 USA or visit www.sun.com if you need additional information or
    22  * have any questions.
     20 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     21 * or visit www.oracle.com if you need additional information or have any
     22 * questions.
    2323 *
    2424 */

  • trunk/openjdk/hotspot/src/cpu/zero/vm/disassembler_zero.cpp

    r2 r278  
    11/*
    2  * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
     2 * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2009 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    1818 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1919 *
    20  * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    21  * CA 95054 USA or visit www.sun.com if you need additional information or
    22  * have any questions.
     20 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     21 * or visit www.oracle.com if you need additional information or have any
     22 * questions.
    2323 *
    2424 */

  • trunk/openjdk/hotspot/src/cpu/zero/vm/disassembler_zero.hpp

    r2 r278  
    11/*
    2  * Copyright 2003 Sun Microsystems, Inc.  All Rights Reserved.
    3  * Copyright 2007 Red Hat, Inc.
     2 * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
     3 * Copyright 2007, 2010 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    55 *
    … …  
    1818 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1919 *
    20  * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    21  * CA 95054 USA or visit www.sun.com if you need additional information or
    22  * have any questions.
     20 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     21 * or visit www.oracle.com if you need additional information or have any
     22 * questions.
    2323 *
    2424 */
    2525
    26 // The disassembler prints out zero code annotated
    27 // with Java specific information.
    28 
    2926  static int pd_instruction_alignment() {
    30     ShouldNotCallThis();
     27    return 1;
    3128  }
    3229
    3330  static const char* pd_cpu_opts() {
    34     ShouldNotCallThis();
     31    return "";
    3532  }

  • trunk/openjdk/hotspot/src/cpu/zero/vm/dump_zero.cpp

    r2 r278  
    11/*
    2  * Copyright 2004-2007 Sun Microsystems, Inc.  All Rights Reserved.
     2 * Copyright (c) 2004, 2007, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2007 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    1818 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1919 *
    20  * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    21  * CA 95054 USA or visit www.sun.com if you need additional information or
    22  * have any questions.
     20 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     21 * or visit www.oracle.com if you need additional information or have any
     22 * questions.
    2323 *
    2424 */

  • trunk/openjdk/hotspot/src/cpu/zero/vm/entryFrame_zero.hpp

    r2 r278  
    11/*
    2  * Copyright 2003-2007 Sun Microsystems, Inc.  All Rights Reserved.
    3  * Copyright 2008 Red Hat, Inc.
     2 * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved.
     3 * Copyright 2008, 2010 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    55 *
    … …  
    1818 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1919 *
    20  * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    21  * CA 95054 USA or visit www.sun.com if you need additional information or
    22  * have any questions.
     20 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     21 * or visit www.oracle.com if you need additional information or have any
     22 * questions.
    2323 *
    2424 */
    … …  
    4848
    4949 public:
    50   static EntryFrame *build(ZeroStack*       stack,
    51                            const intptr_t*  parameters,
     50  static EntryFrame *build(const intptr_t*  parameters,
    5251                           int              parameter_words,
    53                            JavaCallWrapper* call_wrapper);
     52                           JavaCallWrapper* call_wrapper,
     53                           TRAPS);
    5454 public:
    5555  JavaCallWrapper *call_wrapper() const {

  • trunk/openjdk/hotspot/src/cpu/zero/vm/entry_zero.hpp

    r2 r278  
    11/*
    2  * Copyright 2003-2007 Sun Microsystems, Inc.  All Rights Reserved.
    3  * Copyright 2008, 2009 Red Hat, Inc.
     2 * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved.
     3 * Copyright 2008, 2009, 2010 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    55 *
    … …  
    1818 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1919 *
    20  * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    21  * CA 95054 USA or visit www.sun.com if you need additional information or
    22  * have any questions.
     20 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     21 * or visit www.oracle.com if you need additional information or have any
     22 * questions.
    2323 *
    2424 */
    … …  
    4242
    4343 private:
    44   typedef void (*NormalEntryFunc)(methodOop method,
    45                                   intptr_t  base_pc,
    46                                   TRAPS);
    47   typedef void (*OSREntryFunc)(methodOop method,
    48                                address   osr_buf,
    49                                intptr_t  base_pc,
    50                                TRAPS);
     44  typedef int (*NormalEntryFunc)(methodOop method,
     45                                 intptr_t  base_pc,
     46                                 TRAPS);
     47  typedef int (*OSREntryFunc)(methodOop method,
     48                              address   osr_buf,
     49                              intptr_t  base_pc,
     50                              TRAPS);
    5151
    5252 public:
    5353  void invoke(methodOop method, TRAPS) const {
    54     ((NormalEntryFunc) entry_point())(method, (intptr_t) this, THREAD);
     54    maybe_deoptimize(
     55      ((NormalEntryFunc) entry_point())(method, (intptr_t) this, THREAD),
     56      THREAD);
    5557  }
    5658  void invoke_osr(methodOop method, address osr_buf, TRAPS) const {
    57     ((OSREntryFunc) entry_point())(method, osr_buf, (intptr_t) this, THREAD);
     59    maybe_deoptimize(
     60      ((OSREntryFunc) entry_point())(method, osr_buf, (intptr_t) this, THREAD),
     61      THREAD);
     62  }
     63
     64 private:
     65  static void maybe_deoptimize(int deoptimized_frames, TRAPS) {
     66    if (deoptimized_frames)
     67      CppInterpreter::main_loop(deoptimized_frames - 1, THREAD);
    5868  }
    5969

  • trunk/openjdk/hotspot/src/cpu/zero/vm/fakeStubFrame_zero.hpp

    r2 r278  
    11/*
    2  * Copyright 2003-2007 Sun Microsystems, Inc.  All Rights Reserved.
    3  * Copyright 2008 Red Hat, Inc.
     2 * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved.
     3 * Copyright 2008, 2010 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    55 *
    … …  
    1818 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1919 *
    20  * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    21  * CA 95054 USA or visit www.sun.com if you need additional information or
    22  * have any questions.
     20 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     21 * or visit www.oracle.com if you need additional information or have any
     22 * questions.
    2323 *
    2424 */
    … …  
    4343
    4444 public:
    45   static FakeStubFrame *build(ZeroStack* stack);
     45  static FakeStubFrame *build(TRAPS);
    4646
    4747 public:

  • trunk/openjdk/hotspot/src/cpu/zero/vm/frame_zero.cpp

    r2 r278  
    11/*
    2  * Copyright 2003-2007 Sun Microsystems, Inc.  All Rights Reserved.
    3  * Copyright 2007, 2008, 2009 Red Hat, Inc.
     2 * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved.
     3 * Copyright 2007, 2008, 2009, 2010 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    55 *
    … …  
    1818 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1919 *
    20  * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    21  * CA 95054 USA or visit www.sun.com if you need additional information or
    22  * have any questions.
     20 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     21 * or visit www.oracle.com if you need additional information or have any
     22 * questions.
    2323 *
    2424 */
    … …  
    3535bool frame::is_interpreted_frame() const {
    3636  return zeroframe()->is_interpreter_frame();
     37}
     38
     39bool frame::is_fake_stub_frame() const {
     40  return zeroframe()->is_fake_stub_frame();
    3741}
    3842
    … …  
    4549  map->clear();
    4650  assert(map->include_argument_oops(), "should be set by clear");
    47   return frame(sender_sp(), sp() + 1);
     51  return frame(zeroframe()->next(), sender_sp());
    4852}
    4953
    … …  
    5256         zeroframe()->is_shark_frame() ||
    5357         zeroframe()->is_fake_stub_frame(), "wrong type of frame");
    54   return frame(sender_sp(), sp() + 1);
     58  return frame(zeroframe()->next(), sender_sp());
    5559}
    5660
    … …  
    173177
    174178  // Print each word of the frame
    175   for (intptr_t *addr = fp(); addr <= sp(); addr++) {
    176     int offset = sp() - addr;
     179  for (intptr_t *addr = sp(); addr <= fp(); addr++) {
     180    int offset = fp() - addr;
    177181
    178182    // Fill in default values, then try and improve them

  • trunk/openjdk/hotspot/src/cpu/zero/vm/frame_zero.hpp

    r2 r278  
    11/*
    2  * Copyright 2003-2007 Sun Microsystems, Inc.  All Rights Reserved.
    3  * Copyright 2007, 2008, 2009 Red Hat, Inc.
     2 * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved.
     3 * Copyright 2007, 2008, 2009, 2010 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    55 *
    … …  
    1818 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1919 *
    20  * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    21  * CA 95054 USA or visit www.sun.com if you need additional information or
    22  * have any questions.
     20 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     21 * or visit www.oracle.com if you need additional information or have any
     22 * questions.
    2323 *
    2424 */
    … …  
    3333  // Constructor
    3434 public:
    35   frame(intptr_t* sp, intptr_t* fp);
     35  frame(ZeroFrame* zeroframe, intptr_t* sp);
    3636
    37   // The sp of a Zero frame is the address of the highest word in
    38   // that frame.  We keep track of the lowest address too, so the
    39   // boundaries of the frame are available for debug printing.
    4037 private:
    41   intptr_t* _fp;
     38  ZeroFrame* _zeroframe;
    4239
    4340 public:
     41  const ZeroFrame *zeroframe() const {
     42    return _zeroframe;
     43  }
     44
    4445  intptr_t* fp() const {
    45     return _fp;
     46    return (intptr_t *) zeroframe();
    4647  }
    4748
    … …  
    5152
    5253 public:
    53   const ZeroFrame *zeroframe() const {
    54     return (ZeroFrame *) sp();
    55   }
    56 
    5754  const EntryFrame *zero_entryframe() const {
    5855    return zeroframe()->as_entry_frame();
    … …  
    6663
    6764 public:
     65  bool is_fake_stub_frame() const;
     66
     67 public:
    6868  frame sender_for_nonentry_frame(RegisterMap* map) const;
    6969

  • trunk/openjdk/hotspot/src/cpu/zero/vm/frame_zero.inline.hpp

    r2 r278  
    11/*
    2  * Copyright 2003-2007 Sun Microsystems, Inc.  All Rights Reserved.
    3  * Copyright 2007, 2008, 2009 Red Hat, Inc.
     2 * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved.
     3 * Copyright 2007, 2008, 2009, 2010 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    55 *
    … …  
    1818 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1919 *
    20  * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    21  * CA 95054 USA or visit www.sun.com if you need additional information or
    22  * have any questions.
     20 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     21 * or visit www.oracle.com if you need additional information or have any
     22 * questions.
    2323 *
    2424 */
    … …  
    2727
    2828inline frame::frame() {
     29  _zeroframe = NULL;
    2930  _sp = NULL;
    30   _fp = NULL;
    3131  _pc = NULL;
    3232  _cb = NULL;
    … …  
    3434}
    3535
    36 inline frame::frame(intptr_t* sp, intptr_t* fp) {
     36inline frame::frame(ZeroFrame* zf, intptr_t* sp) {
     37  _zeroframe = zf;
    3738  _sp = sp;
    38   _fp = fp;
    3939  switch (zeroframe()->type()) {
    4040  case ZeroFrame::ENTRY_FRAME:
    … …  
    6767
    6868inline intptr_t* frame::sender_sp() const {
    69   return (intptr_t *) zeroframe()->next();
     69  return fp() + 1;
    7070}
    7171
    … …  
    121121// represents an invalid (incomparable) frame.
    122122inline intptr_t* frame::id() const {
    123   return sp();
     123  return fp();
    124124}
    125125

  • trunk/openjdk/hotspot/src/cpu/zero/vm/globalDefinitions_zero.hpp

    r2 r278  
    11/*
    2  * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
     2 * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2009 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    1818 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1919 *
    20  * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    21  * CA 95054 USA or visit www.sun.com if you need additional information or
    22  * have any questions.
     20 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     21 * or visit www.oracle.com if you need additional information or have any
     22 * questions.
    2323 *
    2424 */

  • trunk/openjdk/hotspot/src/cpu/zero/vm/globals_zero.hpp

    r2 r278  
    11/*
    2  * Copyright 2000-2006 Sun Microsystems, Inc.  All Rights Reserved.
    3  * Copyright 2007, 2008, 2009 Red Hat, Inc.
     2 * Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved.
     3 * Copyright 2007, 2008, 2009, 2010 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    55 *
    … …  
    1818 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1919 *
    20  * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    21  * CA 95054 USA or visit www.sun.com if you need additional information or
    22  * have any questions.
     20 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     21 * or visit www.oracle.com if you need additional information or have any
     22 * questions.
    2323 *
    2424 */
    2525
    26 //
    2726// Set the default values for platform dependent flags used by the
    2827// runtime system.  See globals.hpp for details of what they do.
    29 //
    3028
    3129define_pd_global(bool,  ConvertSleepToYield,  true);
    … …  
    3836
    3937define_pd_global(intx,  CodeEntryAlignment,   32);
    40 define_pd_global(uintx, TLABSize,             0);
    41 #ifdef _LP64
    42 define_pd_global(uintx, NewSize,              ScaleForWordSize(2048 * K));
    43 #else
    44 define_pd_global(uintx, NewSize,              ScaleForWordSize(1024 * K));
    45 #endif // _LP64
     38define_pd_global(intx,  OptoLoopAlignment,    16);
    4639define_pd_global(intx,  InlineFrequencyCount, 100);
    47 define_pd_global(intx,  InlineSmallCode,      1000);
    4840define_pd_global(intx,  PreInflateSpin,       10);
    4941
    5042define_pd_global(intx,  StackYellowPages,     2);
    5143define_pd_global(intx,  StackRedPages,        1);
    52 define_pd_global(intx,  StackShadowPages,     3 LP64_ONLY(+3) DEBUG_ONLY(+3));
     44define_pd_global(intx,  StackShadowPages,     5 LP64_ONLY(+1) DEBUG_ONLY(+3));
    5345
    5446define_pd_global(bool,  RewriteBytecodes,     true);

  • trunk/openjdk/hotspot/src/cpu/zero/vm/icBuffer_zero.cpp

    r2 r278  
    11/*
    2  * Copyright 2003-2006 Sun Microsystems, Inc.  All Rights Reserved.
     2 * Copyright (c) 2003, 2006, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2007 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    1818 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1919 *
    20  * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    21  * CA 95054 USA or visit www.sun.com if you need additional information or
    22  * have any questions.
     20 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     21 * or visit www.oracle.com if you need additional information or have any
     22 * questions.
    2323 *
    2424 */

  • trunk/openjdk/hotspot/src/cpu/zero/vm/icache_zero.cpp

    r2 r278  
    11/*
    2  * Copyright 2003-2005 Sun Microsystems, Inc.  All Rights Reserved.
     2 * Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2007, 2009 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    1818 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1919 *
    20  * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    21  * CA 95054 USA or visit www.sun.com if you need additional information or
    22  * have any questions.
     20 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     21 * or visit www.oracle.com if you need additional information or have any
     22 * questions.
    2323 *
    2424 */

  • trunk/openjdk/hotspot/src/cpu/zero/vm/icache_zero.hpp

    r2 r278  
    11/*
    2  * Copyright 2003-2004 Sun Microsystems, Inc.  All Rights Reserved.
     2 * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2007, 2009 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    1818 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1919 *
    20  * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    21  * CA 95054 USA or visit www.sun.com if you need additional information or
    22  * have any questions.
     20 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     21 * or visit www.oracle.com if you need additional information or have any
     22 * questions.
    2323 *
    2424 */

  • trunk/openjdk/hotspot/src/cpu/zero/vm/interp_masm_zero.cpp

    r2 r278  
    11/*
    2  * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
     2 * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2009 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    1818 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1919 *
    20  * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    21  * CA 95054 USA or visit www.sun.com if you need additional information or
    22  * have any questions.
     20 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     21 * or visit www.oracle.com if you need additional information or have any
     22 * questions.
    2323 *
    2424 */

  • trunk/openjdk/hotspot/src/cpu/zero/vm/interp_masm_zero.hpp

    r2 r278  
    11/*
    2  * Copyright 2003-2007 Sun Microsystems, Inc.  All Rights Reserved.
     2 * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2007 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    1818 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1919 *
    20  * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    21  * CA 95054 USA or visit www.sun.com if you need additional information or
    22  * have any questions.
     20 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     21 * or visit www.oracle.com if you need additional information or have any
     22 * questions.
    2323 *
    2424 */

  • trunk/openjdk/hotspot/src/cpu/zero/vm/interpreterFrame_zero.hpp

    r2 r278  
    11/*
    2  * Copyright 2003-2007 Sun Microsystems, Inc.  All Rights Reserved.
    3  * Copyright 2008 Red Hat, Inc.
     2 * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved.
     3 * Copyright 2008, 2010 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    55 *
    … …  
    1818 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1919 *
    20  * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    21  * CA 95054 USA or visit www.sun.com if you need additional information or
    22  * have any questions.
     20 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     21 * or visit www.oracle.com if you need additional information or have any
     22 * questions.
    2323 *
    2424 */
    … …  
    5656
    5757 public:
    58   static InterpreterFrame *build(ZeroStack*      stack,
    59                                  const methodOop method,
    60                                  JavaThread*     thread);
    61   static InterpreterFrame *build(ZeroStack* stack, int size);
     58  static InterpreterFrame *build(const methodOop method, TRAPS);
     59  static InterpreterFrame *build(int size, TRAPS);
    6260
    6361 public:

  • trunk/openjdk/hotspot/src/cpu/zero/vm/interpreterGenerator_zero.hpp

    r2 r278  
    11/*
    2  * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
     2 * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2007 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    1818 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1919 *
    20  * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    21  * CA 95054 USA or visit www.sun.com if you need additional information or
    22  * have any questions.
     20 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     21 * or visit www.oracle.com if you need additional information or have any
     22 * questions.
    2323 *
    2424 */

  • trunk/openjdk/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp

    r2 r278  
    11/*
    2  * Copyright 2003-2005 Sun Microsystems, Inc.  All Rights Reserved.
    3  * Copyright 2007, 2008 Red Hat, Inc.
     2 * Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
     3 * Copyright 2007, 2008, 2010 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    55 *
    … …  
    1818 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1919 *
    20  * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    21  * CA 95054 USA or visit www.sun.com if you need additional information or
    22  * have any questions.
     20 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     21 * or visit www.oracle.com if you need additional information or have any
     22 * questions.
    2323 *
    2424 */
    … …  
    141141    (align_size_up(sizeof(ffi_cif), wordSize) >> LogBytesPerWord) +
    142142    (method->is_static() ? 2 : 1) + method->size_of_parameters() + 1;
    143   if (required_words > stack->available_words()) {
    144     Unimplemented();
    145   }
     143
     144  stack->overflow_check(required_words, CHECK_NULL);
    146145
    147146  intptr_t *buf = (intptr_t *) stack->alloc(required_words * wordSize);

  • trunk/openjdk/hotspot/src/cpu/zero/vm/interpreterRT_zero.hpp

    r2 r278  
    11/*
    2  * Copyright 2003-2005 Sun Microsystems, Inc.  All Rights Reserved.
     2 * Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2007, 2008 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    1818 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1919 *
    20  * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    21  * CA 95054 USA or visit www.sun.com if you need additional information or
    22  * have any questions.
     20 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     21 * or visit www.oracle.com if you need additional information or have any
     22 * questions.
    2323 *
    2424 */

  • trunk/openjdk/hotspot/src/cpu/zero/vm/interpreter_zero.cpp

    r2 r278  
    11/*
    2  * Copyright 2003-2007 Sun Microsystems, Inc.  All Rights Reserved.
    3  * Copyright 2007, 2008 Red Hat, Inc.
     2 * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved.
     3 * Copyright 2007, 2008, 2009, 2010 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    55 *
    … …  
    1818 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1919 *
    20  * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    21  * CA 95054 USA or visit www.sun.com if you need additional information or
    22  * have any questions.
     20 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     21 * or visit www.oracle.com if you need additional information or have any
     22 * questions.
    2323 *
    2424 */
    … …  
    4848}
    4949
     50bool AbstractInterpreter::can_be_compiled(methodHandle m) {
     51  return true;
     52}
     53
    5054int AbstractInterpreter::size_activation(methodOop method,
    5155                                         int tempcount,

  • trunk/openjdk/hotspot/src/cpu/zero/vm/interpreter_zero.hpp

    r2 r278  
    11/*
    2  * Copyright 2003-2007 Sun Microsystems, Inc.  All Rights Reserved.
     2 * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2007, 2008 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    1818 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1919 *
    20  * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    21  * CA 95054 USA or visit www.sun.com if you need additional information or
    22  * have any questions.
     20 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     21 * or visit www.oracle.com if you need additional information or have any
     22 * questions.
    2323 *
    2424 */
    … …  
    3737 public:
    3838  static int expr_index_at(int i) {
    39     return stackElementWords() * i;
    40   }
    41   static int expr_tag_index_at(int i) {
    42     assert(TaggedStackInterpreter, "should not call this");
    43     Unimplemented();
     39    return stackElementWords * i;
    4440  }
    4541
    4642  static int expr_offset_in_bytes(int i) {
    47     return stackElementSize() * i;
    48   }
    49   static int expr_tag_offset_in_bytes(int i) {
    50     assert(TaggedStackInterpreter, "should not call this");
    51     Unimplemented();
     43    return stackElementSize * i;
    5244  }
    5345
    5446  static int local_index_at(int i) {
    5547    assert(i <= 0, "local direction already negated");
    56     return stackElementWords() * i + (value_offset_in_bytes() / wordSize);
     48    return stackElementWords * i;
    5749  }
    58   static int local_tag_index_at(int i) {
    59     assert(TaggedStackInterpreter, "should not call this");
    60     Unimplemented();
    61   }

  • trunk/openjdk/hotspot/src/cpu/zero/vm/javaFrameAnchor_zero.hpp

    r2 r278  
    11/*
    2  * Copyright 2003-2005 Sun Microsystems, Inc.  All Rights Reserved.
    3  * Copyright 2007, 2008 Red Hat, Inc.
     2 * Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
     3 * Copyright 2007, 2008, 2010 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    55 *
    … …  
    1818 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1919 *
    20  * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    21  * CA 95054 USA or visit www.sun.com if you need additional information or
    22  * have any questions.
     20 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     21 * or visit www.oracle.com if you need additional information or have any
     22 * questions.
    2323 *
    2424 */
     25
     26 private:
     27  ZeroFrame* volatile _last_Java_fp;
    2528
    2629 public:
    … …  
    3033  //  2 - saving a current state (javaCalls)
    3134  //  3 - restoring an old state (javaCalls)
     35  // Note that whenever _last_Java_sp != NULL other anchor fields
     36  // must be valid.  The profiler apparently depends on this.
    3237
    3338  void clear() {
    … …  
    3540    _last_Java_sp = NULL;
    3641    // fence?
     42    _last_Java_fp = NULL;
    3743    _last_Java_pc = NULL;
    3844  }
    3945
    4046  void copy(JavaFrameAnchor* src) {
     47    set(src->_last_Java_sp, src->_last_Java_pc, src->_last_Java_fp);
     48  }
     49
     50  void set(intptr_t* sp, address pc, ZeroFrame* fp) {
    4151    // In order to make sure the transition state is valid for "this"
    4252    // We must clear _last_Java_sp before copying the rest of the new
    … …  
    4757    // unless the value is changing
    4858    //
    49     if (_last_Java_sp != src->_last_Java_sp)
     59    if (_last_Java_sp != sp)
    5060      _last_Java_sp = NULL;
    5161
    52     _last_Java_pc = src->_last_Java_pc;
     62    _last_Java_fp = fp;
     63    _last_Java_pc = pc;
    5364    // Must be last so profiler will always see valid frame if
    5465    // has_last_frame() is true
    55     _last_Java_sp = src->_last_Java_sp;
     66    _last_Java_sp = sp;
    5667  }
    5768
    … …  
    6879  }
    6980
    70   void set_last_Java_sp(intptr_t* sp) {
    71     _last_Java_sp = sp;
     81  ZeroFrame* last_Java_fp() const {
     82    return _last_Java_fp;
    7283  }
     84
     85  address last_Java_pc() const {
     86    return _last_Java_pc;
     87  }
     88
     89  static ByteSize last_Java_fp_offset() {
     90    return byte_offset_of(JavaFrameAnchor, _last_Java_fp);
     91  }

  • trunk/openjdk/hotspot/src/cpu/zero/vm/jniFastGetField_zero.cpp

    r2 r278  
    11/*
    2  * Copyright 2004-2006 Sun Microsystems, Inc.  All Rights Reserved.
     2 * Copyright (c) 2004, 2006, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2007 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    1818 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1919 *
    20  * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    21  * CA 95054 USA or visit www.sun.com if you need additional information or
    22  * have any questions.
     20 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     21 * or visit www.oracle.com if you need additional information or have any
     22 * questions.
    2323 *
    2424 */

  • trunk/openjdk/hotspot/src/cpu/zero/vm/jniTypes_zero.hpp

    r2 r278  
    11/*
    2  * Copyright 1998-2002 Sun Microsystems, Inc.  All Rights Reserved.
     2 * Copyright (c) 1998, 2002, Oracle and/or its affiliates. All rights reserved.
    33 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44 *
    … …  
    1717 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818 *
    19  * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20  * CA 95054 USA or visit www.sun.com if you need additional information or
    21  * have any questions.
     19 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20 * or visit www.oracle.com if you need additional information or have any
     21 * questions.
    2222 *
    2323 */

  • trunk/openjdk/hotspot/src/cpu/zero/vm/jni_zero.h

    r2 r278  
    11/*
    2  * Copyright 1997-2004 Sun Microsystems, Inc.  All Rights Reserved.
     2 * Copyright (c) 1997, 2004, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2009 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    66 * This code is free software; you can redistribute it and/or modify it
    77 * under the terms of the GNU General Public License version 2 only, as
    8  * published by the Free Software Foundation.  Sun designates this
     8 * published by the Free Software Foundation.  Oracle designates this
    99 * particular file as subject to the "Classpath" exception as provided
    10  * by Sun in the LICENSE file that accompanied this code.
     10 * by Oracle in the LICENSE file that accompanied this code.
    1111 *
    1212 * This code is distributed in the hope that it will be useful, but WITHOUT
    … …  
    2020 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    2121 *
    22  * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    23  * CA 95054 USA or visit www.sun.com if you need additional information or
    24  * have any questions.
     22 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     23 * or visit www.oracle.com if you need additional information or have any
     24 * questions.
    2525 */
    2626

  • trunk/openjdk/hotspot/src/cpu/zero/vm/methodHandles_zero.cpp

    r2 r278  
    11/*
    2  * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
    3  * Copyright 2009 Red Hat, Inc.
     2 * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
     3 * Copyright 2009, 2010 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    55 *
    … …  
    1818 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1919 *
    20  * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    21  * CA 95054 USA or visit www.sun.com if you need additional information or
    22  * have any questions.
     20 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     21 * or visit www.oracle.com if you need additional information or have any
     22 * questions.
    2323 *
    2424 */
    2525
    26 // This file is intentionally empty
     26#include "incls/_precompiled.incl"
     27#include "incls/_methodHandles_zero.cpp.incl"
     28
     29int MethodHandles::adapter_conversion_ops_supported_mask() {
     30  ShouldNotCallThis();
     31}
     32
     33void MethodHandles::generate_method_handle_stub(MacroAssembler*          masm,
     34                                                MethodHandles::EntryKind ek) {
     35  ShouldNotCallThis();
     36}

  • trunk/openjdk/hotspot/src/cpu/zero/vm/nativeInst_zero.cpp

    r2 r278  
    11/*
    2  * Copyright 2003-2007 Sun Microsystems, Inc.  All Rights Reserved.
     2 * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2008 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    1818 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1919 *
    20  * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    21  * CA 95054 USA or visit www.sun.com if you need additional information or
    22  * have any questions.
     20 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     21 * or visit www.oracle.com if you need additional information or have any
     22 * questions.
    2323 *
    2424 */

  • trunk/openjdk/hotspot/src/cpu/zero/vm/nativeInst_zero.hpp

    r2 r278  
    11/*
    2  * Copyright 2003-2006 Sun Microsystems, Inc.  All Rights Reserved.
     2 * Copyright (c) 2003, 2006, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2007 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    1818 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1919 *
    20  * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    21  * CA 95054 USA or visit www.sun.com if you need additional information or
    22  * have any questions.
     20 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     21 * or visit www.oracle.com if you need additional information or have any
     22 * questions.
    2323 *
    2424 */

  • trunk/openjdk/hotspot/src/cpu/zero/vm/registerMap_zero.hpp

    r2 r278  
    11/*
    2  * Copyright 1998-2007 Sun Microsystems, Inc.  All Rights Reserved.
     2 * Copyright (c) 1998, 2007, Oracle and/or its affiliates. All rights reserved.
    33 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44 *
    … …  
    1717 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818 *
    19  * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20  * CA 95054 USA or visit www.sun.com if you need additional information or
    21  * have any questions.
     19 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20 * or visit www.oracle.com if you need additional information or have any
     21 * questions.
    2222 *
    2323 */

  • trunk/openjdk/hotspot/src/cpu/zero/vm/register_definitions_zero.cpp

    r2 r278  
    11/*
    2  * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
     2 * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2009 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    1818 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1919 *
    20  * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    21  * CA 95054 USA or visit www.sun.com if you need additional information or
    22  * have any questions.
     20 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     21 * or visit www.oracle.com if you need additional information or have any
     22 * questions.
    2323 *
    2424 */

  • trunk/openjdk/hotspot/src/cpu/zero/vm/register_zero.cpp

    r2 r278  
    11/*
    2  * Copyright 2000-2007 Sun Microsystems, Inc.  All Rights Reserved.
     2 * Copyright (c) 2000, 2007, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2007 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    1818 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1919 *
    20  * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    21  * CA 95054 USA or visit www.sun.com if you need additional information or
    22  * have any questions.
     20 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     21 * or visit www.oracle.com if you need additional information or have any
     22 * questions.
    2323 *
    2424 */

  • trunk/openjdk/hotspot/src/cpu/zero/vm/register_zero.hpp

    r2 r278  
    11/*
    2  * Copyright 2000-2007 Sun Microsystems, Inc.  All Rights Reserved.
     2 * Copyright (c) 2000, 2007, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2007 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    1818 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1919 *
    20  * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    21  * CA 95054 USA or visit www.sun.com if you need additional information or
    22  * have any questions.
     20 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     21 * or visit www.oracle.com if you need additional information or have any
     22 * questions.
    2323 *
    2424 */

  • trunk/openjdk/hotspot/src/cpu/zero/vm/relocInfo_zero.cpp

    r2 r278  
    11/*
    2  * Copyright 2003-2005 Sun Microsystems, Inc.  All Rights Reserved.
     2 * Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2007, 2009 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    1818 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1919 *
    20  * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    21  * CA 95054 USA or visit www.sun.com if you need additional information or
    22  * have any questions.
     20 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     21 * or visit www.oracle.com if you need additional information or have any
     22 * questions.
    2323 *
    2424 */

  • trunk/openjdk/hotspot/src/cpu/zero/vm/relocInfo_zero.hpp

    r2 r278  
    11/*
    2  * Copyright 2003-2005 Sun Microsystems, Inc.  All Rights Reserved.
     2 * Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2007 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    1818 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1919 *
    20  * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    21  * CA 95054 USA or visit www.sun.com if you need additional information or
    22  * have any questions.
     20 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     21 * or visit www.oracle.com if you need additional information or have any
     22 * questions.
    2323 *
    2424 */

  • trunk/openjdk/hotspot/src/cpu/zero/vm/sharedRuntime_zero.cpp

    r2 r278  
    11/*
    2  * Copyright 2003-2007 Sun Microsystems, Inc.  All Rights Reserved.
    3  * Copyright 2007, 2008, 2009 Red Hat, Inc.
     2 * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved.
     3 * Copyright 2007, 2008, 2009, 2010 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    55 *
    … …  
    1818 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1919 *
    20  * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    21  * CA 95054 USA or visit www.sun.com if you need additional information or
    22  * have any questions.
     20 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     21 * or visit www.oracle.com if you need additional information or have any
     22 * questions.
    2323 *
    2424 */
    … …  
    4848                        int comp_args_on_stack,
    4949                        const BasicType *sig_bt,
    50                         const VMRegPair *regs) {
    51   return new AdapterHandlerEntry(
     50                        const VMRegPair *regs,
     51                        AdapterFingerPrint *fingerprint) {
     52  return AdapterHandlerLibrary::new_entry(
     53    fingerprint,
    5254    ShouldNotCallThisStub(),
    5355    ShouldNotCallThisStub(),

  • trunk/openjdk/hotspot/src/cpu/zero/vm/sharkFrame_zero.hpp

    r2 r278  
    11/*
    2  * Copyright 2003-2007 Sun Microsystems, Inc.  All Rights Reserved.
     2 * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2008, 2009 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    1818 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1919 *
    20  * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    21  * CA 95054 USA or visit www.sun.com if you need additional information or
    22  * have any questions.
     20 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     21 * or visit www.oracle.com if you need additional information or have any
     22 * questions.
    2323 *
    2424 */

  • trunk/openjdk/hotspot/src/cpu/zero/vm/stack_zero.hpp

    r2 r278  
    11/*
    2  * Copyright 2003-2007 Sun Microsystems, Inc.  All Rights Reserved.
    3  * Copyright 2008, 2009 Red Hat, Inc.
     2 * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved.
     3 * Copyright 2008, 2009, 2010 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    55 *
    … …  
    1818 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1919 *
    20  * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    21  * CA 95054 USA or visit www.sun.com if you need additional information or
    22  * have any questions.
     20 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     21 * or visit www.oracle.com if you need additional information or have any
     22 * questions.
    2323 *
    2424 */
    … …  
    3030  intptr_t *_sp;   // the top word on the stack
    3131
     32 private:
     33  int _shadow_pages_size; // how much ABI stack must we keep free?
     34
    3235 public:
    3336  ZeroStack()
    34     : _base(NULL), _top(NULL), _sp(NULL) {}
     37    : _base(NULL), _top(NULL), _sp(NULL) {
     38    _shadow_pages_size = StackShadowPages * os::vm_page_size();
     39  }
    3540
    3641  bool needs_setup() const {
    3742    return _base == NULL;
    3843  }
     44
     45  int suggest_size(Thread *thread) const;
    3946
    4047  void setup(void *mem, size_t size) {
    … …  
    6370  }
    6471
     72  int total_words() const {
     73    return _top - _base;
     74  }
    6575  int available_words() const {
    6676    return _sp - _base;
    … …  
    8191    return _sp -= count;
    8292  }
     93
     94  int shadow_pages_size() const {
     95    return _shadow_pages_size;
     96  }
     97  int abi_stack_available(Thread *thread) const;
     98
     99 public:
     100  void overflow_check(int required_words, TRAPS);
     101  static void handle_overflow(TRAPS);
     102
     103 public:
     104  void zap(int c) PRODUCT_RETURN;
    83105
    84106 public:

  • trunk/openjdk/hotspot/src/cpu/zero/vm/stubGenerator_zero.cpp

    r2 r278  
    11/*
    2  * Copyright 2003-2007 Sun Microsystems, Inc.  All Rights Reserved.
    3  * Copyright 2007, 2008 Red Hat, Inc.
     2 * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved.
     3 * Copyright 2007, 2008, 2010 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    55 *
    … …  
    1818 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1919 *
    20  * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    21  * CA 95054 USA or visit www.sun.com if you need additional information or
    22  * have any questions.
     20 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     21 * or visit www.oracle.com if you need additional information or have any
     22 * questions.
    2323 *
    2424 */
    … …  
    5252    bool stack_needs_teardown = false;
    5353    if (stack->needs_setup()) {
    54       size_t stack_used = thread->stack_base() - (address) &stack_used;
    55       size_t stack_free = thread->stack_size() - stack_used;
    56       size_t zero_stack_size = align_size_down(stack_free / 2, wordSize);
    57 
     54      size_t zero_stack_size = stack->suggest_size(thread);
    5855      stack->setup(alloca(zero_stack_size), zero_stack_size);
    5956      stack_needs_teardown = true;
    … …  
    6158
    6259    // Allocate and initialize our frame
    63     thread->push_zero_frame(
    64       EntryFrame::build(stack, parameters, parameter_words, call_wrapper));
    65 
    66     // Make the call
    67     Interpreter::invoke_method(method, entry_point, THREAD);
    68 
    69     // Store result depending on type
     60    EntryFrame *frame =
     61      EntryFrame::build(parameters, parameter_words, call_wrapper, THREAD);
     62
    7063    if (!HAS_PENDING_EXCEPTION) {
    71       switch (result_type) {
    72       case T_INT:
    73         *(jint *) result = *(jint *) stack->sp();
    74         break;
    75       case T_LONG:
    76         *(jlong *) result = *(jlong *) stack->sp();
    77         break;
    78       case T_FLOAT:
    79         *(jfloat *) result = *(jfloat *) stack->sp();
    80         break;
    81       case T_DOUBLE:
    82         *(jdouble *) result = *(jdouble *) stack->sp();
    83         break;
    84       case T_OBJECT:
    85         *(oop *) result = *(oop *) stack->sp();
    86         break;
    87       default:
    88         ShouldNotReachHere();
     64      // Push the frame
     65      thread->push_zero_frame(frame);
     66
     67      // Make the call
     68      Interpreter::invoke_method(method, entry_point, THREAD);
     69
     70      // Store the result
     71      if (!HAS_PENDING_EXCEPTION) {
     72        switch (result_type) {
     73        case T_INT:
     74          *(jint *) result = *(jint *) stack->sp();
     75          break;
     76        case T_LONG:
     77          *(jlong *) result = *(jlong *) stack->sp();
     78          break;
     79        case T_FLOAT:
     80          *(jfloat *) result = *(jfloat *) stack->sp();
     81          break;
     82        case T_DOUBLE:
     83          *(jdouble *) result = *(jdouble *) stack->sp();
     84          break;
     85        case T_OBJECT:
     86          *(oop *) result = *(oop *) stack->sp();
     87          break;
     88        default:
     89          ShouldNotReachHere();
     90        }
    8991      }
     92
     93      // Unwind the frame
     94      thread->pop_zero_frame();
    9095    }
    91 
    92     // Unwind our frame
    93     thread->pop_zero_frame();
    9496
    9597    // Tear down the stack if necessary
    … …  
    227229}
    228230
    229 EntryFrame *EntryFrame::build(ZeroStack*       stack,
    230                               const intptr_t*  parameters,
     231EntryFrame *EntryFrame::build(const intptr_t*  parameters,
    231232                              int              parameter_words,
    232                               JavaCallWrapper* call_wrapper) {
    233   if (header_words + parameter_words > stack->available_words()) {
    234     Unimplemented();
    235   }
     233                              JavaCallWrapper* call_wrapper,
     234                              TRAPS) {
     235
     236  ZeroStack *stack = ((JavaThread *) THREAD)->zero_stack();
     237  stack->overflow_check(header_words + parameter_words, CHECK_NULL);
    236238
    237239  stack->push(0); // next_frame, filled in later

  • trunk/openjdk/hotspot/src/cpu/zero/vm/stubRoutines_zero.cpp

    r2 r278  
    11/*
    2  * Copyright 2003-2005 Sun Microsystems, Inc.  All Rights Reserved.
     2 * Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2008, 2009 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    1818 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1919 *
    20  * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    21  * CA 95054 USA or visit www.sun.com if you need additional information or
    22  * have any questions.
     20 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     21 * or visit www.oracle.com if you need additional information or have any
     22 * questions.
    2323 *
    2424 */

  • trunk/openjdk/hotspot/src/cpu/zero/vm/stubRoutines_zero.hpp

    r2 r278  
    11/*
    2  * Copyright 2003-2005 Sun Microsystems, Inc.  All Rights Reserved.
    3  * Copyright 2007, 2008, 2009 Red Hat, Inc.
     2 * Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
     3 * Copyright 2007, 2008, 2009, 2010 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    55 *
    … …  
    1818 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1919 *
    20  * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    21  * CA 95054 USA or visit www.sun.com if you need additional information or
    22  * have any questions.
     20 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     21 * or visit www.oracle.com if you need additional information or have any
     22 * questions.
    2323 *
    2424 */
    … …  
    4242  };                     // them if that happens.
    4343
     44  enum method_handles_platform_dependent_constants {
     45    method_handles_adapters_code_size = 0
     46  };
     47
    4448#ifdef IA32
    4549  class x86 {

  • trunk/openjdk/hotspot/src/cpu/zero/vm/templateInterpreterGenerator_zero.hpp

    r2 r278  
    11/*
    2  * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
     2 * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2009 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    1818 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1919 *
    20  * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    21  * CA 95054 USA or visit www.sun.com if you need additional information or
    22  * have any questions.
     20 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     21 * or visit www.oracle.com if you need additional information or have any
     22 * questions.
    2323 *
    2424 */

  • trunk/openjdk/hotspot/src/cpu/zero/vm/templateInterpreter_zero.cpp

    r2 r278  
    11/*
    2  * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
     2 * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2009 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    1818 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1919 *
    20  * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    21  * CA 95054 USA or visit www.sun.com if you need additional information or
    22  * have any questions.
     20 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     21 * or visit www.oracle.com if you need additional information or have any
     22 * questions.
    2323 *
    2424 */

  • trunk/openjdk/hotspot/src/cpu/zero/vm/templateInterpreter_zero.hpp

    r2 r278  
    11/*
    2  * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
     2 * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2009 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    1818 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1919 *
    20  * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    21  * CA 95054 USA or visit www.sun.com if you need additional information or
    22  * have any questions.
     20 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     21 * or visit www.oracle.com if you need additional information or have any
     22 * questions.
    2323 *
    2424 */

  • trunk/openjdk/hotspot/src/cpu/zero/vm/templateTable_zero.cpp

    r2 r278  
    11/*
    2  * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
     2 * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2009 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    1818 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1919 *
    20  * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    21  * CA 95054 USA or visit www.sun.com if you need additional information or
    22  * have any questions.
     20 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     21 * or visit www.oracle.com if you need additional information or have any
     22 * questions.
    2323 *
    2424 */

  • trunk/openjdk/hotspot/src/cpu/zero/vm/templateTable_zero.hpp

    r2 r278  
    11/*
    2  * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
     2 * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2009 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    1818 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1919 *
    20  * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    21  * CA 95054 USA or visit www.sun.com if you need additional information or
    22  * have any questions.
     20 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     21 * or visit www.oracle.com if you need additional information or have any
     22 * questions.
    2323 *
    2424 */

  • trunk/openjdk/hotspot/src/cpu/zero/vm/vmStructs_zero.hpp

    r2 r278  
    11/*
    2  * Copyright 2003-2007 Sun Microsystems, Inc.  All Rights Reserved.
     2 * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2007 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    1818 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1919 *
    20  * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    21  * CA 95054 USA or visit www.sun.com if you need additional information or
    22  * have any questions.
     20 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     21 * or visit www.oracle.com if you need additional information or have any
     22 * questions.
    2323 *
    2424 */

  • trunk/openjdk/hotspot/src/cpu/zero/vm/vm_version_zero.cpp

    r2 r278  
    11/*
    2  * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
     2 * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2009 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    1818 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1919 *
    20  * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    21  * CA 95054 USA or visit www.sun.com if you need additional information or
    22  * have any questions.
     20 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     21 * or visit www.oracle.com if you need additional information or have any
     22 * questions.
    2323 *
    2424 */

  • trunk/openjdk/hotspot/src/cpu/zero/vm/vm_version_zero.hpp

    r2 r278  
    11/*
    2  * Copyright 2003-2006 Sun Microsystems, Inc.  All Rights Reserved.
     2 * Copyright (c) 2003, 2006, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2007 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    1818 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1919 *
    20  * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    21  * CA 95054 USA or visit www.sun.com if you need additional information or
    22  * have any questions.
     20 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     21 * or visit www.oracle.com if you need additional information or have any
     22 * questions.
    2323 *
    2424 */

  • trunk/openjdk/hotspot/src/cpu/zero/vm/vmreg_zero.cpp

    r2 r278  
    11/*
    2  * Copyright 2006-2007 Sun Microsystems, Inc.  All Rights Reserved.
     2 * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2007 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    1818 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1919 *
    20  * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    21  * CA 95054 USA or visit www.sun.com if you need additional information or
    22  * have any questions.
     20 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     21 * or visit www.oracle.com if you need additional information or have any
     22 * questions.
    2323 *
    2424 */

  • trunk/openjdk/hotspot/src/cpu/zero/vm/vmreg_zero.hpp

    r2 r278  
    11/*
    2  * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
     2 * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
    33 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44 *
    … …  
    1717 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818 *
    19  * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20  * CA 95054 USA or visit www.sun.com if you need additional information or
    21  * have any questions.
     19 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20 * or visit www.oracle.com if you need additional information or have any
     21 * questions.
    2222 *
    2323 */

  • trunk/openjdk/hotspot/src/cpu/zero/vm/vmreg_zero.inline.hpp

    r2 r278  
    11/*
    2  * Copyright 2006-2007 Sun Microsystems, Inc.  All Rights Reserved.
     2 * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2007 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    1818 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1919 *
    20  * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    21  * CA 95054 USA or visit www.sun.com if you need additional information or
    22  * have any questions.
     20 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     21 * or visit www.oracle.com if you need additional information or have any
     22 * questions.
    2323 *
    2424 */

  • trunk/openjdk/hotspot/src/cpu/zero/vm/vtableStubs_zero.cpp

    r2 r278  
    11/*
    2  * Copyright 2003-2006 Sun Microsystems, Inc.  All Rights Reserved.
     2 * Copyright (c) 2003, 2006, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2007 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    1818 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1919 *
    20  * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    21  * CA 95054 USA or visit www.sun.com if you need additional information or
    22  * have any questions.
     20 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     21 * or visit www.oracle.com if you need additional information or have any
     22 * questions.
    2323 *
    2424 */
Note: See TracChangeset for help on using the changeset viewer.