/hg/icedtea7-forest/hotspot: 8167200: AArch64: Broken stack poin...

[aph at icedtea.classpath.org]

changeset c7d4a58dc3b6 in /hg/icedtea7-forest/hotspot
details: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot?cmd=changeset;node=c7d4a58dc3b6
author: aph
date: Thu Oct 06 15:11:35 2016 +0000

	8167200: AArch64: Broken stack pointer adjustment in interpreter
	Summary: Always adjust SP unconditionally
	Reviewed-by: dlong, kbarrett


diffstat:

 src/cpu/aarch64/vm/templateTable_aarch64.cpp |  10 +++-------
 1 files changed, 3 insertions(+), 7 deletions(-)

diffs (26 lines):

diff -r 8d4e845ef74b -r c7d4a58dc3b6 src/cpu/aarch64/vm/templateTable_aarch64.cpp
--- a/src/cpu/aarch64/vm/templateTable_aarch64.cpp	Wed Sep 28 07:45:01 2016 +0100
+++ b/src/cpu/aarch64/vm/templateTable_aarch64.cpp	Thu Oct 06 15:11:35 2016 +0000
@@ -3779,19 +3779,15 @@
 
   // allocate one if there's no free slot
   {
-    Label entry, loop, no_adjust;
+    Label entry, loop;
     // 1. compute new pointers            // rsp: old expression stack top
     __ ldr(c_rarg1, monitor_block_bot);   // c_rarg1: old expression stack bottom
-    __ sub(esp, esp, entry_size);           // move expression stack top
+    __ sub(esp, esp, entry_size);         // move expression stack top
     __ sub(c_rarg1, c_rarg1, entry_size); // move expression stack bottom
     __ mov(c_rarg3, esp);                 // set start value for copy loop
     __ str(c_rarg1, monitor_block_bot);   // set new monitor block bottom
 
-    __ cmp(sp, c_rarg3);                  // Check if we need to move sp
-    __ br(Assembler::LO, no_adjust);      // to allow more stack space
-					  // for our new esp
-    __ sub(sp, sp, 2 * wordSize);
-    __ bind(no_adjust);
+    __ sub(sp, sp, entry_size);           // make room for the monitor
 
     __ b(entry);
     // 2. move expression stack contents