comparison src/cpu/x86/vm/runtime_x86_32.cpp @ 1579:e9ff18c4ace7

Merge
author jrose
date Wed, 02 Jun 2010 22:45:42 -0700
parents c18cbe5936b8 110501f54a99
children f95d63e2154a
comparison
equal deleted inserted replaced
1562:dfe27f03244a 1579:e9ff18c4ace7
1 /* 1 /*
2 * Copyright (c) 1998, 2009, Oracle and/or its affiliates. All rights reserved. 2 * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4 * 4 *
5 * This code is free software; you can redistribute it and/or modify it 5 * This code is free software; you can redistribute it and/or modify it
6 * under the terms of the GNU General Public License version 2 only, as 6 * under the terms of the GNU General Public License version 2 only, as
7 * published by the Free Software Foundation. 7 * published by the Free Software Foundation.
115 115
116 // rax: exception handler for given <exception oop/exception pc> 116 // rax: exception handler for given <exception oop/exception pc>
117 117
118 // Restore SP from BP if the exception PC is a MethodHandle call site. 118 // Restore SP from BP if the exception PC is a MethodHandle call site.
119 __ cmpl(Address(rcx, JavaThread::is_method_handle_return_offset()), 0); 119 __ cmpl(Address(rcx, JavaThread::is_method_handle_return_offset()), 0);
120 __ cmovptr(Assembler::notEqual, rsp, rbp); 120 __ cmovptr(Assembler::notEqual, rsp, rbp_mh_SP_save);
121 121
122 // We have a handler in rax, (could be deopt blob) 122 // We have a handler in rax, (could be deopt blob)
123 // rdx - throwing pc, deopt blob will need it. 123 // rdx - throwing pc, deopt blob will need it.
124 124
125 __ push(rax); 125 __ push(rax);