1.1 --- a/src/cpu/x86/vm/methodHandles_x86.cpp Thu Jun 02 13:36:11 2011 -0700
1.2 +++ b/src/cpu/x86/vm/methodHandles_x86.cpp Fri Jun 03 22:31:43 2011 -0700
1.3 @@ -139,9 +139,9 @@
1.4
1.5 void MethodHandles::RicochetFrame::generate_ricochet_blob(MacroAssembler* _masm,
1.6 // output params:
1.7 - int* frame_size_in_words,
1.8 int* bounce_offset,
1.9 - int* exception_offset) {
1.10 + int* exception_offset,
1.11 + int* frame_size_in_words) {
1.12 (*frame_size_in_words) = RicochetFrame::frame_size_in_bytes() / wordSize;
1.13
1.14 address start = __ pc();
1.15 @@ -366,7 +366,7 @@
1.16 Register rdi_stack_move,
1.17 Register rcx_amh,
1.18 bool might_be_negative) {
1.19 - BLOCK_COMMENT("load_stack_move");
1.20 + BLOCK_COMMENT("load_stack_move {");
1.21 Address rcx_amh_conversion(rcx_amh, java_lang_invoke_AdapterMethodHandle::conversion_offset_in_bytes());
1.22 __ movl(rdi_stack_move, rcx_amh_conversion);
1.23 __ sarl(rdi_stack_move, CONV_STACK_MOVE_SHIFT);
1.24 @@ -387,6 +387,7 @@
1.25 __ stop("load_stack_move of garbage value");
1.26 __ BIND(L_ok);
1.27 }
1.28 + BLOCK_COMMENT("} load_stack_move");
1.29 }
1.30
1.31 #ifdef ASSERT
1.32 @@ -1147,7 +1148,7 @@
1.33
1.34 trace_method_handle(_masm, entry_name(ek));
1.35
1.36 - BLOCK_COMMENT(entry_name(ek));
1.37 + BLOCK_COMMENT(err_msg("Entry %s {", entry_name(ek)));
1.38
1.39 switch ((int) ek) {
1.40 case _raise_exception:
1.41 @@ -1292,7 +1293,7 @@
1.42 case _bound_int_direct_mh:
1.43 case _bound_long_direct_mh:
1.44 {
1.45 - bool direct_to_method = (ek >= _bound_ref_direct_mh);
1.46 + const bool direct_to_method = (ek >= _bound_ref_direct_mh);
1.47 BasicType arg_type = ek_bound_mh_arg_type(ek);
1.48 int arg_slots = type2size[arg_type];
1.49
1.50 @@ -1929,7 +1930,7 @@
1.51 // In the non-retaining case, this might move keep2 either up or down.
1.52 // We don't have to copy the whole | RF... collect | complex,
1.53 // but we must adjust RF.saved_args_base.
1.54 - // Also, from now on, we will forget about the origial copy of |collect|.
1.55 + // Also, from now on, we will forget about the original copy of |collect|.
1.56 // If we are retaining it, we will treat it as part of |keep2|.
1.57 // For clarity we will define |keep3| = |collect|keep2| or |keep2|.
1.58
1.59 @@ -1986,7 +1987,7 @@
1.60 // Net shift (&new_argv - &old_argv) is (close_count - open_count).
1.61 bool zero_open_count = (open_count == 0); // remember this bit of info
1.62 if (move_keep3 && fix_arg_base) {
1.63 - // It will be easier t have everything in one register:
1.64 + // It will be easier to have everything in one register:
1.65 if (close_count.is_register()) {
1.66 // Deduct open_count from close_count register to get a clean +/- value.
1.67 __ subptr(close_count.as_register(), open_count);
1.68 @@ -2396,6 +2397,7 @@
1.69 __ nop();
1.70 return;
1.71 }
1.72 + BLOCK_COMMENT(err_msg("} Entry %s", entry_name(ek)));
1.73 __ hlt();
1.74
1.75 address me_cookie = MethodHandleEntry::start_compiled_entry(_masm, interp_entry);
