Added invokespecialinterface and invokestaticinterface

jumanji144 · Aug 26, 2022 · f299d24 · f299d24
1 parent 45b641a
commit f299d24
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 5 deletions.
diff --git a/src/main/java/me/darknet/assembler/instructions/ParseInfo.java b/src/main/java/me/darknet/assembler/instructions/ParseInfo.java
@@ -10,6 +10,8 @@ public class ParseInfo {
     public String[] args;
     public static final int INSTRUCTION_LINE = -1;
     public static final int INSTRUCTION_INVOKEVIRTUALINTERFACE = -2;
+    public static final int INSTRUCTION_INVOKESTATICINTERFACE = -3;
+    public static final int INSTRUCTION_INVOKESPECIALINTERFACE = -4;
 
     public ParseInfo(String name, int opcode, String... args) {
         this.name = name;
@@ -228,6 +230,8 @@ public static boolean has(String instruction) {
         put("tableswitch", TABLESWITCH, "switch");
         put("line", INSTRUCTION_LINE, "label", "const");
         put("invokevirtualinterface", INSTRUCTION_INVOKEVIRTUALINTERFACE, "name", "descriptor");
+        put("invokestaticinterface", INSTRUCTION_INVOKESTATICINTERFACE, "name", "descriptor");
+        put("invokespecialinterface", INSTRUCTION_INVOKESPECIALINTERFACE, "name", "descriptor");
     }
 
 }
diff --git a/src/main/java/me/darknet/assembler/transform/MethodTransformer.java b/src/main/java/me/darknet/assembler/transform/MethodTransformer.java
@@ -101,18 +101,27 @@ public void visitInstruction(InstructionGroup inst) throws AssemblerException {
             case INVOKESTATIC:
             case INVOKEINTERFACE:
             case INVOKESPECIAL:
-            case ParseInfo.INSTRUCTION_INVOKEVIRTUALINTERFACE: {
+            case ParseInfo.INSTRUCTION_INVOKEVIRTUALINTERFACE:
+            case ParseInfo.INSTRUCTION_INVOKESTATICINTERFACE:
+            case ParseInfo.INSTRUCTION_INVOKESPECIALINTERFACE: {
 
                 IdentifierGroup name = (IdentifierGroup) inst.get(0);
                 IdentifierGroup desc = (IdentifierGroup) inst.get(1);
 
+                boolean itf = opcode == INVOKEINTERFACE
+                        || opcode == ParseInfo.INSTRUCTION_INVOKEVIRTUALINTERFACE
+                        || opcode == ParseInfo.INSTRUCTION_INVOKESTATICINTERFACE
+                        || opcode == ParseInfo.INSTRUCTION_INVOKESPECIALINTERFACE;
+
+                if(opcode == ParseInfo.INSTRUCTION_INVOKESTATICINTERFACE) opcode = INVOKESTATIC;
+                if(opcode == ParseInfo.INSTRUCTION_INVOKEVIRTUALINTERFACE) opcode = INVOKEVIRTUAL;
+                if(opcode == ParseInfo.INSTRUCTION_INVOKESPECIALINTERFACE) opcode = INVOKESPECIAL;
+
                 mv.visitMethodInsn(
-                        opcode == ParseInfo.INSTRUCTION_INVOKEVIRTUALINTERFACE
-                         ? INVOKEVIRTUAL
-                         : opcode,
+                        opcode,
                         name,
                         desc,
-                        opcode == INVOKEINTERFACE || opcode == ParseInfo.INSTRUCTION_INVOKEVIRTUALINTERFACE
+                        itf
                 );
                 // INFO: opcode == INVOKEINTERFACE is not always correct because there are some
                 // INVOKEVIRTUAL instructions which have itf=true but for that static analysis is