backup/BicaVM
1
0
Fork 0
Code Issues Projects Releases Activity

INVOKESTATIC correction

Browse Source
This commit is contained in:
Artur Ventura 2011-11-17 03:09:48 +00:00
parent 7dbc651a51
commit cd53e4023e
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/intrp.def
View File

@ -940,9 +940,9 @@ DEFOP(INVOKESTATIC)
LOG("Calling " + className + " " + method.name_ref.str + method.descriptor_ref.str) LOG("Calling " + className + " " + method.name_ref.str + method.descriptor_ref.str)
LOG("!! NATIVE !!") LOG("!! NATIVE !!")
if (xl.jvm.internalJNITable[className] && methodId in xl.jvm.internalJNITable[className]){ if (xl.jvm.internalJNITable[className] && methodId in xl.jvm.internalJNITable[className]){
result = xl.jvm.internalJNITable[className][methodId].apply(cl,args); result = {return_object: xl.jvm.internalJNITable[className][methodId].apply(cl,args)};
}else if (xl.jvm.JNITable[className] && methodId in xl.jvm.JNITable[className]){ }else if (xl.jvm.JNITable[className] && methodId in xl.jvm.JNITable[className]){
result = xl.jvm.JNITable[className][methodId].apply(cl,args) result = {return_object: xl.jvm.JNITable[className][methodId].apply(cl,args)};s
}else{ }else{
PANIC(methodId + " declared as native but not mapped"); PANIC(methodId + " declared as native but not mapped");
} }
@ -950,8 +950,8 @@ DEFOP(INVOKESTATIC)
}else{ }else{
result = method.invoke(args,cl); result = method.invoke(args,cl);
} }
if (result != undefined){ if (result != undefined && result.return_object!= undefined){
OPPUSH(result); OPPUSH(result.return_object);
} }
ENDDEF ENDDEF