archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-21 11:34:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

7045515: ARM assembly code for JSR 292 ricochet frames

Browse source 
ARM ricochet port and minor fixes in shared debug code

Reviewed-by: jrose, vladidan
This commit is contained in:
Bertrand Delsart 2011-05-17 16:50:27 +02:00
parent a16e057c0a
commit 4b893d695b
2 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
hotspot/src/share/vm/prims/methodHandleWalk.cpp
View file

@ -423,6 +423,7 @@ MethodHandleWalker::walk(TRAPS) {
arglist[1+i] = arg; arglist[1+i] = arg;
if (!retain_original_args) if (!retain_original_args)
change_argument(arg_type, slot, T_VOID, ArgToken(tt_void)); change_argument(arg_type, slot, T_VOID, ArgToken(tt_void));
i++;
} }
arglist[1+argc] = ArgToken(); // sentinel arglist[1+argc] = ArgToken(); // sentinel
oop invoker = java_lang_invoke_MethodTypeForm::vmlayout( oop invoker = java_lang_invoke_MethodTypeForm::vmlayout(
@ -487,7 +488,7 @@ MethodHandleWalker::walk(TRAPS) {
arglist[1] = length_arg; // length to check arglist[1] = length_arg; // length to check
arglist[2] = ArgToken(); // sentinel arglist[2] = ArgToken(); // sentinel
make_invoke(NULL, vmIntrinsics::_checkSpreadArgument, 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. // Spread out the array elements.
Bytecodes::Code aload_op = Bytecodes::_nop; Bytecodes::Code aload_op = Bytecodes::_nop;

6
hotspot/src/share/vm/prims/methodHandles.hpp
View file

@ -721,12 +721,10 @@ public:
//# include "methodHandles_zero.hpp" //# include "methodHandles_zero.hpp"
#endif #endif
#ifdef TARGET_ARCH_arm #ifdef TARGET_ARCH_arm
#define TARGET_ARCH_NYI_6939861 1 //FIXME # include "methodHandles_arm.hpp"
//# include "methodHandles_arm.hpp"
#endif #endif
#ifdef TARGET_ARCH_ppc #ifdef TARGET_ARCH_ppc
#define TARGET_ARCH_NYI_6939861 1 //FIXME # include "methodHandles_ppc.hpp"
//# include "methodHandles_ppc.hpp"
#endif #endif
#ifdef TARGET_ARCH_NYI_6939861 #ifdef TARGET_ARCH_NYI_6939861