Mercurial > hg > openjdk > jdk7 > hotspot
changeset 2526:33ae33516634
7045515: ARM assembly code for JSR 292 ricochet frames
Summary: ARM ricochet port and minor fixes in shared debug code
Reviewed-by: jrose, vladidan
| author | bdelsart |
|---|---|
| date | Tue, 17 May 2011 16:50:27 +0200 |
| parents | f52ed367b66d |
| children | 231c2b41ea4d a80577f854f9 |
| files | src/share/vm/prims/methodHandleWalk.cpp src/share/vm/prims/methodHandles.hpp |
| diffstat | 2 files changed, 4 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/prims/methodHandleWalk.cpp Mon May 16 22:16:44 2011 -0700 +++ b/src/share/vm/prims/methodHandleWalk.cpp Tue May 17 16:50:27 2011 +0200 @@ -423,6 +423,7 @@ arglist[1+i] = arg; if (!retain_original_args) change_argument(arg_type, slot, T_VOID, ArgToken(tt_void)); + i++; } arglist[1+argc] = ArgToken(); // sentinel oop invoker = java_lang_invoke_MethodTypeForm::vmlayout( @@ -487,7 +488,7 @@ arglist[1] = length_arg; // length to check arglist[2] = ArgToken(); // sentinel make_invoke(NULL, vmIntrinsics::_checkSpreadArgument, - Bytecodes::_invokestatic, false, 3, &arglist[0], CHECK_(empty)); + Bytecodes::_invokestatic, false, 2, &arglist[0], CHECK_(empty)); // Spread out the array elements. Bytecodes::Code aload_op = Bytecodes::_nop;
--- a/src/share/vm/prims/methodHandles.hpp Mon May 16 22:16:44 2011 -0700 +++ b/src/share/vm/prims/methodHandles.hpp Tue May 17 16:50:27 2011 +0200 @@ -721,12 +721,10 @@ //# include "methodHandles_zero.hpp" #endif #ifdef TARGET_ARCH_arm -#define TARGET_ARCH_NYI_6939861 1 //FIXME -//# include "methodHandles_arm.hpp" +# include "methodHandles_arm.hpp" #endif #ifdef TARGET_ARCH_ppc -#define TARGET_ARCH_NYI_6939861 1 //FIXME -//# include "methodHandles_ppc.hpp" +# include "methodHandles_ppc.hpp" #endif #ifdef TARGET_ARCH_NYI_6939861