Mercurial > hg > aarch64-jdk8u51-b16-hotspot
changeset 4827:31390de29c4b aarch64-20130813
Delete bogus stack pointer adjustment
author | aph |
---|---|
date | Mon, 12 Aug 2013 17:49:56 +0100 |
parents | 64eb1c82b7fe |
children | ce185e108678 |
files | src/cpu/aarch64/vm/sharedRuntime_aarch64.cpp |
diffstat | 1 files changed, 1 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/cpu/aarch64/vm/sharedRuntime_aarch64.cpp Fri Aug 09 14:48:44 2013 +0100 +++ b/src/cpu/aarch64/vm/sharedRuntime_aarch64.cpp Mon Aug 12 17:49:56 2013 +0100 @@ -2132,10 +2132,7 @@ } __ lea(c_rarg1, Address(sp, lock_slot_offset * VMRegImpl::stack_slot_size)); - __ mov(c_rarg0, obj_reg); - __ mov(r20, sp); // remember sp - __ andr(sp, rscratch1, -16); // align stack as required by ABI // Save pending exception around call to VM (which contains an EXCEPTION_MARK) // NOTE that obj_reg == r19 currently @@ -2143,7 +2140,7 @@ __ str(zr, Address(rthread, in_bytes(Thread::pending_exception_offset()))); rt_call(masm, CAST_FROM_FN_PTR(address, SharedRuntime::complete_monitor_unlocking_C), 2, 0, 1); - __ mov(sp, r20); // restore sp + #ifdef ASSERT { Label L;