hotspot/src/cpu/zero/vm/frame_zero.inline.hpp

*** 1,8 ****
  /*
   * Copyright 2003-2007 Sun Microsystems, Inc.  All Rights Reserved.
!  * Copyright 2007, 2008, 2009 Red Hat, Inc.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,8 ----
  /*
   * Copyright 2003-2007 Sun Microsystems, Inc.  All Rights Reserved.
!  * Copyright 2007, 2008, 2009, 2010 Red Hat, Inc.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 24,43 ****
   */
  
  // Constructors
  
  inline frame::frame() {
    _sp = NULL;
-   _fp = NULL;
    _pc = NULL;
    _cb = NULL;
    _deopt_state = unknown;
  }
  
! inline frame::frame(intptr_t* sp, intptr_t* fp) {
    _sp = sp;
-   _fp = fp;
    switch (zeroframe()->type()) {
    case ZeroFrame::ENTRY_FRAME:
      _pc = StubRoutines::call_stub_return_pc();
      _cb = NULL;
      break;
--- 24,43 ----
   */
  
  // Constructors
  
  inline frame::frame() {
+   _zeroframe = NULL;
    _sp = NULL;
    _pc = NULL;
    _cb = NULL;
    _deopt_state = unknown;
  }
  
! inline frame::frame(ZeroFrame* zf, intptr_t* sp) {
!   _zeroframe = zf;
    _sp = sp;
    switch (zeroframe()->type()) {
    case ZeroFrame::ENTRY_FRAME:
      _pc = StubRoutines::call_stub_return_pc();
      _cb = NULL;
      break;
*** 64,74 ****
  }
  
  // Accessors
  
  inline intptr_t* frame::sender_sp() const {
!   return (intptr_t *) zeroframe()->next();
  }
  
  inline intptr_t* frame::link() const {
    ShouldNotCallThis();
  }
--- 64,74 ----
  }
  
  // Accessors
  
  inline intptr_t* frame::sender_sp() const {
!   return fp() + 1;
  }
  
  inline intptr_t* frame::link() const {
    ShouldNotCallThis();
  }
*** 118,128 ****
  
  // Return a unique id for this frame. The id must have a value where
  // we can distinguish identity and younger/older relationship. NULL
  // represents an invalid (incomparable) frame.
  inline intptr_t* frame::id() const {
!   return sp();
  }
  
  inline JavaCallWrapper* frame::entry_frame_call_wrapper() const {
    return zero_entryframe()->call_wrapper();
  }
--- 118,128 ----
  
  // Return a unique id for this frame. The id must have a value where
  // we can distinguish identity and younger/older relationship. NULL
  // represents an invalid (incomparable) frame.
  inline intptr_t* frame::id() const {
!   return fp();
  }
  
  inline JavaCallWrapper* frame::entry_frame_call_wrapper() const {
    return zero_entryframe()->call_wrapper();
  }