1.1 --- a/src/share/vm/c1/c1_LIRAssembler.hpp Wed Apr 14 15:30:13 2010 -0700 1.2 +++ b/src/share/vm/c1/c1_LIRAssembler.hpp Thu Apr 15 18:14:49 2010 -0700 1.3 @@ -39,6 +39,8 @@ 1.4 Instruction* _pending_non_safepoint; 1.5 int _pending_non_safepoint_offset; 1.6 1.7 + Label _unwind_handler_entry; 1.8 + 1.9 #ifdef ASSERT 1.10 BlockList _branch_target_blocks; 1.11 void check_no_unbound_labels(); 1.12 @@ -134,6 +136,7 @@ 1.13 1.14 // code patterns 1.15 int emit_exception_handler(); 1.16 + int emit_unwind_handler(); 1.17 void emit_exception_entries(ExceptionInfoList* info_list); 1.18 int emit_deopt_handler(); 1.19 1.20 @@ -217,7 +220,8 @@ 1.21 1.22 void build_frame(); 1.23 1.24 - void throw_op(LIR_Opr exceptionPC, LIR_Opr exceptionOop, CodeEmitInfo* info, bool unwind); 1.25 + void throw_op(LIR_Opr exceptionPC, LIR_Opr exceptionOop, CodeEmitInfo* info); 1.26 + void unwind_op(LIR_Opr exceptionOop); 1.27 void monitor_address(int monitor_ix, LIR_Opr dst); 1.28 1.29 void align_backward_branch_target();