There are a number of macros:


  71 #define NSK_CPP_STUB1(Func,env) env->Func()
  72 #define NSK_CPP_STUB2(Func,env,a) env->Func(a)
  73 #define NSK_CPP_STUB3(Func,env,a,b) env->Func(a,b)
  74 #define NSK_CPP_STUB4(Func,env,a,b,c) env->Func(a,b,c)
  75 #define NSK_CPP_STUB5(Func,env,a,b,c,d) env->Func(a,b,c,d)
  76 #define NSK_CPP_STUB6(Func,env,a,b,c,d,e) env->Func(a,b,c,d,e)
  77 #define NSK_CPP_STUB7(Func,env,a,b,c,d,e,f) env->Func(a,b,c,d,e,f)
  78 #define NSK_CPP_STUB8(Func,env,a,b,c,d,e,f,g) env->Func(a,b,c,d,e,f,g)
  79 #define NSK_CPP_STUB9(Func,env,a,b,c,d,e,f,g,h) env->Func(a,b,c,d,e,f,g,h)

That need to also get replaced in the vmTestbase. There are 4000+ instances of them, so another big refactoring