1.1 --- a/src/cpu/zero/vm/frame_zero.inline.hpp Thu Apr 29 17:53:58 2010 -0700
1.2 +++ b/src/cpu/zero/vm/frame_zero.inline.hpp Fri Apr 30 04:27:25 2010 -0700
1.3 @@ -1,6 +1,6 @@
1.4 /*
1.5 * Copyright 2003-2007 Sun Microsystems, Inc. All Rights Reserved.
1.6 - * Copyright 2007, 2008, 2009 Red Hat, Inc.
1.7 + * Copyright 2007, 2008, 2009, 2010 Red Hat, Inc.
1.8 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.9 *
1.10 * This code is free software; you can redistribute it and/or modify it
1.11 @@ -26,16 +26,16 @@
1.12 // Constructors
1.13
1.14 inline frame::frame() {
1.15 + _zeroframe = NULL;
1.16 _sp = NULL;
1.17 - _fp = NULL;
1.18 _pc = NULL;
1.19 _cb = NULL;
1.20 _deopt_state = unknown;
1.21 }
1.22
1.23 -inline frame::frame(intptr_t* sp, intptr_t* fp) {
1.24 +inline frame::frame(ZeroFrame* zf, intptr_t* sp) {
1.25 + _zeroframe = zf;
1.26 _sp = sp;
1.27 - _fp = fp;
1.28 switch (zeroframe()->type()) {
1.29 case ZeroFrame::ENTRY_FRAME:
1.30 _pc = StubRoutines::call_stub_return_pc();
1.31 @@ -66,7 +66,7 @@
1.32 // Accessors
1.33
1.34 inline intptr_t* frame::sender_sp() const {
1.35 - return (intptr_t *) zeroframe()->next();
1.36 + return fp() + 1;
1.37 }
1.38
1.39 inline intptr_t* frame::link() const {
1.40 @@ -120,7 +120,7 @@
1.41 // we can distinguish identity and younger/older relationship. NULL
1.42 // represents an invalid (incomparable) frame.
1.43 inline intptr_t* frame::id() const {
1.44 - return sp();
1.45 + return fp();
1.46 }
1.47
1.48 inline JavaCallWrapper* frame::entry_frame_call_wrapper() const {
