From a6e2928a92859959f0491af3713717841a9b7591 Mon Sep 17 00:00:00 2001
From: youkynet <youky1234@163.com>
Date: Fri, 14 Dec 2012 22:05:03 +0800
Subject: [PATCH] implement 'invokeinterface' and fix some issues about
 'invokevirtual'

---
 src/intrp.def | 33 ++++++++++++++++++++++-----------
 1 file changed, 22 insertions(+), 11 deletions(-)

diff --git a/src/intrp.def b/src/intrp.def
index 499ff71..109bfdf 100644
--- a/src/intrp.def
+++ b/src/intrp.def
@@ -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)
@@ -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")
@@ -1580,4 +1591,4 @@ DEFOP(WIDE)
             LOCAL_VAR((indexbyte1 << 8) | indexbyte2) = OPPOPD();
             break;
     }
-ENDDEF
\ No newline at end of file
+ENDDEF