1.1 --- a/src/share/vm/opto/callnode.hpp Mon Jul 23 13:04:59 2012 -0700
1.2 +++ b/src/share/vm/opto/callnode.hpp Tue Jul 24 10:51:00 2012 -0700
1.3 @@ -197,7 +197,7 @@
1.4
1.5 private:
1.6 JVMState* _caller; // List pointer for forming scope chains
1.7 - uint _depth; // One mroe than caller depth, or one.
1.8 + uint _depth; // One more than caller depth, or one.
1.9 uint _locoff; // Offset to locals in input edge mapping
1.10 uint _stkoff; // Offset to stack in input edge mapping
1.11 uint _monoff; // Offset to monitors in input edge mapping
1.12 @@ -223,6 +223,8 @@
1.13 JVMState(int stack_size); // root state; has a null method
1.14
1.15 // Access functions for the JVM
1.16 + // ... --|--- loc ---|--- stk ---|--- arg ---|--- mon ---|--- scl ---|
1.17 + // \ locoff \ stkoff \ argoff \ monoff \ scloff \ endoff
1.18 uint locoff() const { return _locoff; }
1.19 uint stkoff() const { return _stkoff; }
1.20 uint argoff() const { return _stkoff + _sp; }
1.21 @@ -231,15 +233,16 @@
1.22 uint endoff() const { return _endoff; }
1.23 uint oopoff() const { return debug_end(); }
1.24
1.25 - int loc_size() const { return _stkoff - _locoff; }
1.26 - int stk_size() const { return _monoff - _stkoff; }
1.27 - int mon_size() const { return _scloff - _monoff; }
1.28 - int scl_size() const { return _endoff - _scloff; }
1.29 + int loc_size() const { return stkoff() - locoff(); }
1.30 + int stk_size() const { return monoff() - stkoff(); }
1.31 + int arg_size() const { return monoff() - argoff(); }
1.32 + int mon_size() const { return scloff() - monoff(); }
1.33 + int scl_size() const { return endoff() - scloff(); }
1.34
1.35 - bool is_loc(uint i) const { return i >= _locoff && i < _stkoff; }
1.36 - bool is_stk(uint i) const { return i >= _stkoff && i < _monoff; }
1.37 - bool is_mon(uint i) const { return i >= _monoff && i < _scloff; }
1.38 - bool is_scl(uint i) const { return i >= _scloff && i < _endoff; }
1.39 + bool is_loc(uint i) const { return locoff() <= i && i < stkoff(); }
1.40 + bool is_stk(uint i) const { return stkoff() <= i && i < monoff(); }
1.41 + bool is_mon(uint i) const { return monoff() <= i && i < scloff(); }
1.42 + bool is_scl(uint i) const { return scloff() <= i && i < endoff(); }
1.43
1.44 uint sp() const { return _sp; }
1.45 int bci() const { return _bci; }
