Mercurial > jdk8-mips64-public > hotspot / changeset

     1.1 --- a/src/share/vm/prims/methodHandleWalk.cpp	Mon May 16 22:16:44 2011 -0700
     1.2 +++ b/src/share/vm/prims/methodHandleWalk.cpp	Tue May 17 16:50:27 2011 +0200
     1.3 @@ -423,6 +423,7 @@
     1.4            arglist[1+i] = arg;
     1.5            if (!retain_original_args)
     1.6              change_argument(arg_type, slot, T_VOID, ArgToken(tt_void));
     1.7 +          i++;
     1.8          }
     1.9          arglist[1+argc] = ArgToken();  // sentinel
    1.10          oop invoker = java_lang_invoke_MethodTypeForm::vmlayout(
    1.11 @@ -487,7 +488,7 @@
    1.12          arglist[1] = length_arg;  // length to check
    1.13          arglist[2] = ArgToken();  // sentinel
    1.14          make_invoke(NULL, vmIntrinsics::_checkSpreadArgument,
    1.15 -                    Bytecodes::_invokestatic, false, 3, &arglist[0], CHECK_(empty));
    1.16 +                    Bytecodes::_invokestatic, false, 2, &arglist[0], CHECK_(empty));
    1.17  
    1.18          // Spread out the array elements.
    1.19          Bytecodes::Code aload_op = Bytecodes::_nop;

     2.1 --- a/src/share/vm/prims/methodHandles.hpp	Mon May 16 22:16:44 2011 -0700
     2.2 +++ b/src/share/vm/prims/methodHandles.hpp	Tue May 17 16:50:27 2011 +0200
     2.3 @@ -721,12 +721,10 @@
     2.4  //# include "methodHandles_zero.hpp"
     2.5  #endif
     2.6  #ifdef TARGET_ARCH_arm
     2.7 -#define TARGET_ARCH_NYI_6939861 1 //FIXME
     2.8 -//# include "methodHandles_arm.hpp"
     2.9 +# include "methodHandles_arm.hpp"
    2.10  #endif
    2.11  #ifdef TARGET_ARCH_ppc
    2.12 -#define TARGET_ARCH_NYI_6939861 1 //FIXME
    2.13 -//# include "methodHandles_ppc.hpp"
    2.14 +# include "methodHandles_ppc.hpp"
    2.15  #endif
    2.16  
    2.17  #ifdef TARGET_ARCH_NYI_6939861