Mercurial > hg > truffle
diff src/cpu/x86/vm/frame_x86.hpp @ 4852:6d00795f99a1
Merge
author | dsamersoff |
---|---|
date | Wed, 25 Jan 2012 15:03:42 -0800 |
parents | eaa9557116a2 |
children | 33df1aeaebbf da91efe96a93 |
line wrap: on
line diff
--- a/src/cpu/x86/vm/frame_x86.hpp Wed Jan 25 21:10:08 2012 +0400 +++ b/src/cpu/x86/vm/frame_x86.hpp Wed Jan 25 15:03:42 2012 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2012, Oracle and/or its affiliates. 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 @@ -188,6 +188,7 @@ frame(intptr_t* sp, intptr_t* fp); // accessors for the instance variables + // Note: not necessarily the real 'frame pointer' (see real_fp) intptr_t* fp() const { return _fp; } inline address* sender_pc_addr() const;