Mercurial > hg > graal-jvmci-8
diff src/cpu/x86/vm/frame_x86.cpp @ 1513:df736661d0c8
Merge
author | jrose |
---|---|
date | Tue, 11 May 2010 15:19:19 -0700 |
parents | 615a9d95d265 2338d41fbd81 |
children | c18cbe5936b8 |
line wrap: on
line diff
--- a/src/cpu/x86/vm/frame_x86.cpp Mon May 10 14:58:38 2010 -0700 +++ b/src/cpu/x86/vm/frame_x86.cpp Tue May 11 15:19:19 2010 -0700 @@ -502,7 +502,7 @@ // When unpacking an optimized frame the frame pointer is // adjusted with: int diff = (method->max_locals() - method->size_of_parameters()) * - Interpreter::stackElementWords(); + Interpreter::stackElementWords; return _fp == (fp - diff); } @@ -542,7 +542,7 @@ // stack frames shouldn't be much larger than max_stack elements - if (fp() - sp() > 1024 + m->max_stack()*Interpreter::stackElementSize()) { + if (fp() - sp() > 1024 + m->max_stack()*Interpreter::stackElementSize) { return false; } @@ -594,7 +594,7 @@ #ifdef AMD64 // This is times two because we do a push(ltos) after pushing XMM0 // and that takes two interpreter stack slots. - tos_addr += 2 * Interpreter::stackElementWords(); + tos_addr += 2 * Interpreter::stackElementWords; #else tos_addr += 2; #endif // AMD64