# HG changeset patch # User Thomas Wuerthinger # Date 1330377537 -3600 # Node ID 38012b8c29b139af3f8c42fe3e289216289c6bbd # Parent 1b8d02e10ee8e7804b7a0af9525de896eb5df2f5 create separate RUNTIME1_STUBS definition for non-graal build. diff -r 1b8d02e10ee8 -r 38012b8c29b1 src/share/vm/c1/c1_Runtime1.hpp --- a/src/share/vm/c1/c1_Runtime1.hpp Mon Feb 27 22:15:05 2012 +0100 +++ b/src/share/vm/c1/c1_Runtime1.hpp Mon Feb 27 22:18:57 2012 +0100 @@ -36,7 +36,7 @@ // The Runtime1 holds all assembly stubs and VM // runtime routines needed by code code generated // by the Compiler1. - +#ifdef GRAAL #define RUNTIME1_STUBS(stub, last_entry) \ stub(dtrace_object_alloc) \ stub(unwind_exception) \ @@ -82,6 +82,42 @@ stub(graal_create_out_of_bounds_exception) \ stub(graal_generic_callback) \ last_entry(number_of_ids) +#else +#define RUNTIME1_STUBS(stub, last_entry) \ + stub(dtrace_object_alloc) \ + stub(unwind_exception) \ + stub(forward_exception) \ + stub(throw_range_check_failed) /* throws ArrayIndexOutOfBoundsException */ \ + stub(throw_index_exception) /* throws IndexOutOfBoundsException */ \ + stub(throw_div0_exception) \ + stub(throw_null_pointer_exception) \ + stub(register_finalizer) \ + stub(new_instance) \ + stub(fast_new_instance) \ + stub(fast_new_instance_init_check) \ + stub(new_type_array) \ + stub(new_object_array) \ + stub(new_multi_array) \ + stub(handle_exception_nofpu) /* optimized version that does not preserve fpu registers */ \ + stub(handle_exception) \ + stub(handle_exception_from_callee) \ + stub(throw_array_store_exception) \ + stub(throw_class_cast_exception) \ + stub(throw_incompatible_class_change_error) \ + stub(slow_subtype_check) \ + stub(monitorenter) \ + stub(monitorenter_nofpu) /* optimized version that does not preserve fpu registers */ \ + stub(monitorexit) \ + stub(monitorexit_nofpu) /* optimized version that does not preserve fpu registers */ \ + stub(deoptimize) \ + stub(access_field_patching) \ + stub(load_klass_patching) \ + stub(g1_pre_barrier_slow) \ + stub(g1_post_barrier_slow) \ + stub(fpu2long_stub) \ + stub(counter_overflow) \ + last_entry(number_of_ids) +#endif #define DECLARE_STUB_ID(x) x ## _id , #define DECLARE_LAST_STUB_ID(x) x