1.1 --- a/src/cpu/x86/vm/methodHandles_x86.cpp Sun Jan 22 14:03:20 2012 -0800 1.2 +++ b/src/cpu/x86/vm/methodHandles_x86.cpp Tue Jan 24 15:41:17 2012 +0100 1.3 @@ -1,5 +1,5 @@ 1.4 /* 1.5 - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. 1.6 + * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. 1.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 1.8 * 1.9 * This code is free software; you can redistribute it and/or modify it 1.10 @@ -990,6 +990,26 @@ 1.11 BLOCK_COMMENT("} move_return_value"); 1.12 } 1.13 1.14 +#ifdef ASSERT 1.15 +#define DESCRIBE_RICOCHET_OFFSET(rf, name) \ 1.16 + values.describe(frame_no, (intptr_t *) (((uintptr_t)rf) + MethodHandles::RicochetFrame::name##_offset_in_bytes()), #name) 1.17 + 1.18 +void MethodHandles::RicochetFrame::describe(const frame* fr, FrameValues& values, int frame_no) { 1.19 + address bp = (address) fr->fp(); 1.20 + RicochetFrame* rf = (RicochetFrame*)(bp - sender_link_offset_in_bytes()); 1.21 + 1.22 + // ricochet slots 1.23 + DESCRIBE_RICOCHET_OFFSET(rf, exact_sender_sp); 1.24 + DESCRIBE_RICOCHET_OFFSET(rf, conversion); 1.25 + DESCRIBE_RICOCHET_OFFSET(rf, saved_args_base); 1.26 + DESCRIBE_RICOCHET_OFFSET(rf, saved_args_layout); 1.27 + DESCRIBE_RICOCHET_OFFSET(rf, saved_target); 1.28 + DESCRIBE_RICOCHET_OFFSET(rf, continuation); 1.29 + 1.30 + // relevant ricochet targets (in caller frame) 1.31 + values.describe(-1, rf->saved_args_base(), err_msg("*saved_args_base for #%d", frame_no)); 1.32 +} 1.33 +#endif // ASSERT 1.34 1.35 #ifndef PRODUCT 1.36 extern "C" void print_method_handle(oop mh);