1.1 --- a/src/share/vm/c1/c1_Runtime1.hpp Sat Feb 26 12:10:54 2011 -0800
1.2 +++ b/src/share/vm/c1/c1_Runtime1.hpp Mon Feb 28 06:07:12 2011 -0800
1.3 @@ -54,6 +54,7 @@
1.4 stub(new_multi_array) \
1.5 stub(handle_exception_nofpu) /* optimized version that does not preserve fpu registers */ \
1.6 stub(handle_exception) \
1.7 + stub(handle_exception_from_callee) \
1.8 stub(throw_array_store_exception) \
1.9 stub(throw_class_cast_exception) \
1.10 stub(throw_incompatible_class_change_error) \
1.11 @@ -116,11 +117,11 @@
1.12 static const char* _blob_names[];
1.13
1.14 // stub generation
1.15 - static void generate_blob_for(BufferBlob* blob, StubID id);
1.16 - static OopMapSet* generate_code_for(StubID id, StubAssembler* masm);
1.17 + static void generate_blob_for(BufferBlob* blob, StubID id);
1.18 + static OopMapSet* generate_code_for(StubID id, StubAssembler* sasm);
1.19 static OopMapSet* generate_exception_throw(StubAssembler* sasm, address target, bool has_argument);
1.20 - static void generate_handle_exception(StubAssembler *sasm, OopMapSet* oop_maps, OopMap* oop_map, bool ignore_fpu_registers = false);
1.21 - static void generate_unwind_exception(StubAssembler *sasm);
1.22 + static OopMapSet* generate_handle_exception(StubID id, StubAssembler* sasm);
1.23 + static void generate_unwind_exception(StubAssembler *sasm);
1.24 static OopMapSet* generate_patching(StubAssembler* sasm, address target);
1.25
1.26 static OopMapSet* generate_stub_call(StubAssembler* sasm, Register result, address entry,
