# HG changeset patch
# User poonam
# Date 1416343915 0
# Node ID d1e2e443e43a430d8bf4612b1d35b07919e2e140
# Parent  e86850ef14cf43ec70fc223323d8c384053066e8# Parent  c2c526bc1a1886bc33a1dc576b6dc5031ca7172b
Merge

diff -r e86850ef14cf -r d1e2e443e43a hotspot/src/cpu/zero/vm/stack_zero.cpp
--- a/hotspot/src/cpu/zero/vm/stack_zero.cpp	Tue Nov 18 10:19:04 2014 -0800
+++ b/hotspot/src/cpu/zero/vm/stack_zero.cpp	Tue Nov 18 20:51:55 2014 +0000
@@ -30,7 +30,9 @@
 
 int ZeroStack::suggest_size(Thread *thread) const {
   assert(needs_setup(), "already set up");
-  return align_size_down(abi_stack_available(thread) / 2, wordSize);
+  int abi_available = abi_stack_available(thread);
+  assert(abi_available >= 0, "available abi stack must be >= 0");
+  return align_size_down(abi_available / 2, wordSize);
 }
 
 void ZeroStack::handle_overflow(TRAPS) {
diff -r e86850ef14cf -r d1e2e443e43a hotspot/src/cpu/zero/vm/stack_zero.inline.hpp
--- a/hotspot/src/cpu/zero/vm/stack_zero.inline.hpp	Tue Nov 18 10:19:04 2014 -0800
+++ b/hotspot/src/cpu/zero/vm/stack_zero.inline.hpp	Tue Nov 18 20:51:55 2014 +0000
@@ -48,9 +48,11 @@
 // to use under normal circumstances.  Note that the returned
 // value can be negative.
 inline int ZeroStack::abi_stack_available(Thread *thread) const {
-  int stack_used = thread->stack_base() - (address) &stack_used;
+  guarantee(Thread::current() == thread, "should run in the same thread");
+  int stack_used = thread->stack_base() - (address) &stack_used
+    + (StackYellowPages+StackRedPages+StackShadowPages) * os::vm_page_size();
   int stack_free = thread->stack_size() - stack_used;
-  return stack_free - shadow_pages_size();
+  return stack_free;
 }
 
 #endif // CPU_ZERO_VM_STACK_ZERO_INLINE_HPP