hotspot/src/share/vm/c1/c1_FrameMap.cpp

rev 611 : Merge

*** 1,10 ****
  #ifdef USE_PRAGMA_IDENT_SRC
  #pragma ident "@(#)c1_FrameMap.cpp      1.38 07/06/18 14:25:23 JVM"
  #endif
  /*
!  * Copyright 2000-2006 Sun Microsystems, Inc.  All Rights Reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,10 ----
  #ifdef USE_PRAGMA_IDENT_SRC
  #pragma ident "@(#)c1_FrameMap.cpp      1.38 07/06/18 14:25:23 JVM"
  #endif
  /*
!  * Copyright 2000-2008 Sun Microsystems, Inc.  All Rights Reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 279,289 ****
  }
  
  ByteSize FrameMap::sp_offset_for_monitor_base(const int index) const {
    int end_of_spills = round_to(first_available_sp_in_frame + _reserved_argument_area_size, sizeof(double)) +
      _num_spills * spill_slot_size_in_bytes;
!   int offset = round_to(end_of_spills, HeapWordSize) + index * sizeof(BasicObjectLock);
    return in_ByteSize(offset);
  }
  
  ByteSize FrameMap::sp_offset_for_monitor_lock(int index) const {
    check_monitor_index(index);
--- 279,289 ----
  }
  
  ByteSize FrameMap::sp_offset_for_monitor_base(const int index) const {
    int end_of_spills = round_to(first_available_sp_in_frame + _reserved_argument_area_size, sizeof(double)) +
      _num_spills * spill_slot_size_in_bytes;
!   int offset = (int) round_to(end_of_spills, HeapWordSize) + index * sizeof(BasicObjectLock);
    return in_ByteSize(offset);
  }
  
  ByteSize FrameMap::sp_offset_for_monitor_lock(int index) const {
    check_monitor_index(index);