Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

implement 'invokeinterface' and fix some issues about 'invokevirtual' #6

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

implement 'invokeinterface' and fix some issues about 'invokevirtual' #6

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 22 additions & 11 deletions src/intrp.def
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -891,17 +891,25 @@ ENDDEF
DEFOP(INVOKEINTERFACE)
var indexbyte1 = READ_NEXT();
var indexbyte2 = READ_NEXT();
var count = READ_NEXT();
/* expected 0*/ READ_NEXT();
var args = [];

var method = xl.constantPool.get((indexbyte1 << 8) | indexbyte2);
for(var i=0; i<method.descriptor.args.length; i++){
args.push(OPPOP());
var methodDesrc = xl.constantPool.get((indexbyte1 << 8) | indexbyte2);
var cl = xl.jvm.classForName(methodDesrc.class_ref.jvmClassName);
var methodId = "method " + methodDesrc.name_and_type_ref.name_ref.str + methodDesrc.name_and_type_ref.descriptor_ref.str
var method = cl[methodId];
var args = OPSTACK_MULTIPOP(OPSTACK_LENGTH() - method.descriptor.args.length - 1);
var thisObject = args[0];
var thisClass = thisObject.class;
method = thisClass[methodId];
cl = method.dec_class;
var result;
if(method.access_flags & ACC_NATIVE){
PANIC("INVOKEINTERFACE NATIVE CALL")
}else{
result = method.invoke(args,cl);
}
if (result != undefined){
OPPUSH(result.return_object);
}
var objectref = OPPOP();

PANIC("NOT IMPLEMENTED YET");
ENDDEF

DEFOP(INVOKESPECIAL)
Expand Down Expand Up @@ -958,13 +966,16 @@ ENDDEF
DEFOP(INVOKEVIRTUAL)
var indexbyte1 = READ_NEXT();
var indexbyte2 = READ_NEXT();
var args = [];

var methodDesrc = xl.constantPool.get((indexbyte1 << 8) | indexbyte2);
var cl = xl.jvm.classForName(methodDesrc.class_ref.jvmClassName);
var methodId = "method " + methodDesrc.name_and_type_ref.name_ref.str + methodDesrc.name_and_type_ref.descriptor_ref.str
var method = cl[methodId];
var args = OPSTACK_MULTIPOP(OPSTACK_LENGTH() - method.descriptor.args.length - 1);
var thisObject = args[0];
var thisClass = thisObject.class;
method = thisClass[methodId];
cl = method.dec_class;
var result;
if(method.access_flags & ACC_NATIVE){
PANIC("INVOKEVIRTUAL NATIVE CALL")
Expand Down Expand Up @@ -1580,4 +1591,4 @@ DEFOP(WIDE)
LOCAL_VAR((indexbyte1 << 8) | indexbyte2) = OPPOPD();
break;
}
ENDDEF
ENDDEF