update libs, refactor

Author: EpicPlayerA10

deobfuscator-api/pom.xml

@@ -16,16 +16,11 @@
         <maven.compiler.target>17</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-        <!--
-        We need to use a snapshot version of asm lib as there are some recent important changes to it
-         that are not in a release version yet:
-          - https://gitlab.ow2.org/asm/asm/-/merge_requests/418
-        -->
-        <asm.version>9.8-SNAPSHOT</asm.version>
+        <asm.version>9.8</asm.version>
 
         <log4j.version>2.23.1</log4j.version>
         <slf4j.version>2.0.13</slf4j.version>
-        <cafedude.version>2.1.4</cafedude.version>
+        <cafedude.version>2.2.0</cafedude.version>
         <ssvm.version>ca3c3ab713</ssvm.version>
         <jlinker.version>205d8eaa1f</jlinker.version>
     </properties>
@@ -35,11 +30,6 @@
             <id>jitpack.io</id>
             <url>https://jitpack.io</url>
         </repository>
-
-        <repository>
-            <id>ow2-repo</id>
-            <url>https://repository.ow2.org/nexus/content/repositories/snapshots</url>
-        </repository>
     </repositories>
 
     <dependencies>

deobfuscator-api/src/main/java/org/objectweb/asm/tree/AbstractInsnNode.java

@@ -37,10 +37,7 @@
 
 import org.jetbrains.annotations.Nullable;
 import org.objectweb.asm.MethodVisitor;
-import org.objectweb.asm.Opcodes;
 import org.objectweb.asm.tree.analysis.Frame;
-import org.objectweb.asm.tree.analysis.OriginalSourceValue;
-import org.objectweb.asm.tree.analysis.SourceValue;
 import org.objectweb.asm.tree.analysis.Value;
 import uwu.narumi.deobfuscator.api.asm.NamedOpcodes;
 import org.objectweb.asm.Type;
@@ -451,13 +448,9 @@ public boolean isVarStore() {
     return this.getOpcode() >= ISTORE && this.getOpcode() <= ASTORE;
   }
 
-  public int sizeOnStack() {
-    if (this.isLong() || this.isDouble()) {
-      // Only long and double values take up two stack values
-      return 2;
-    } else {
-      return 1;
-    }
+  public boolean isCompare() {
+    return (this.getOpcode() >= IFEQ && this.getOpcode() <= IF_ACMPNE)
+        || (this.getOpcode() >= IFNULL && this.getOpcode() <= IFNONNULL);
   }
 
   public boolean isJump() {
@@ -468,15 +461,6 @@ public JumpInsnNode asJump() {
     return (JumpInsnNode) this;
   }
 
-  public int conditionStackSize() {
-    if (this.getOpcode() >= IF_ICMPEQ && this.getOpcode() <= IF_ICMPLE) return 2;
-
-    if ((this.getOpcode() >= IFEQ && this.getOpcode() <= IFLE)
-        || (this.getOpcode() == IFNULL || this.getOpcode() == IFNONNULL)) return 1;
-
-    return 0;
-  }
-
   public MethodInsnNode asMethodInsn() {
     return (MethodInsnNode) this;
   }
@@ -654,9 +638,9 @@ public String namedOpcode() {
   }
 
   /**
-   * Returns the number of stack values required by this instruction.
+   * Returns the number of stack values consumed by this instruction
    */
-  public int getRequiredStackValuesCount(Frame<? extends Value> frame) {
+  public int sizeOnStack(Frame<? extends Value> frame) {
     return switch (this.getOpcode()) {
       // Unary operations (one value)
       case ISTORE, LSTORE, FSTORE, DSTORE, ASTORE, POP, DUP, DUP_X1, SWAP, INEG,

deobfuscator-api/src/main/java/uwu/narumi/deobfuscator/api/asm/InsnContext.java

@@ -44,16 +44,16 @@ public MethodContext methodContext() {
     return methodContext;
   }
 
-  public int getRequiredStackValuesCount() {
-    return this.insn.getRequiredStackValuesCount(this.frame());
+  public int sizeOnStack() {
+    return this.insn.sizeOnStack(this.frame());
   }
 
   /**
    * Places POPs instructions before current instruction to remove source values from the stack.
    * This method automatically calculates how many stack values to pop.
    */
   public void placePops() {
-    for (int i = 0; i < this.getRequiredStackValuesCount(); i++) {
+    for (int i = 0; i < this.sizeOnStack(); i++) {
       int stackValueIdx = frame().getStackSize() - (i + 1);
       OriginalSourceValue sourceValue = frame().getStack(stackValueIdx);
 

deobfuscator-api/src/main/java/uwu/narumi/deobfuscator/api/context/Context.java

@@ -85,6 +85,9 @@ public void addCompiledClass(String pathInJar, byte[] bytes) {
       // Fix class bytes
       bytes = ClassHelper.fixClass(bytes);
 
+      // Class is always a file, not a directory. Remove last slash if it exists
+      pathInJar = pathInJar.replaceAll("/$", "");
+
       ClassWrapper classWrapper = ClassHelper.loadClass(pathInJar, bytes, ClassReader.SKIP_FRAMES);
       this.classesMap.putIfAbsent(classWrapper.name(), classWrapper);
 

deobfuscator-api/src/main/java/uwu/narumi/deobfuscator/api/helper/MethodHelper.java

@@ -121,7 +121,7 @@ public static Map<AbstractInsnNode, Set<AbstractInsnNode>> computeConsumersMap(M
       if (frame == null) continue;
 
       // Loop through stack values and add consumer to them
-      for (int i = 0; i < consumer.getRequiredStackValuesCount(frame); i++) {
+      for (int i = 0; i < consumer.sizeOnStack(frame); i++) {
         // Get the value from the stack (first consumed value is at the top)
         OriginalSourceValue sourceValue = frame.getStack(frame.getStackSize() - (i + 1));
 

deobfuscator-transformers/src/main/java/uwu/narumi/deobfuscator/core/other/impl/qprotect/qProtectFieldFlowTransformer.java

@@ -18,7 +18,7 @@ public class qProtectFieldFlowTransformer extends Transformer {
       // Compare
       NumberMatch.of(),
       OpcodeMatch.of(GETSTATIC),
-      OpcodeMatch.of(IF_ICMPGT)
+      Match.of(ctx -> ctx.insn().isCompare())
   );
 
   @Override

deobfuscator-transformers/src/main/java/uwu/narumi/deobfuscator/core/other/impl/universal/number/InlineConstantValuesTransformer.java

@@ -20,10 +20,10 @@ protected void transform() throws Exception {
     FramedInstructionsStream.of(this)
         .forceSync()
         .forEach(insnContext -> {
-          int stackCount = insnContext.getRequiredStackValuesCount();
+          int stackSize = insnContext.sizeOnStack();
 
           // Iterate over stack values
-          for (int i = 0; i < stackCount; i++) {
+          for (int i = 0; i < stackSize; i++) {
             // Using "originalSource" ensures that we don't replace DUPs or var loads
             OriginalSourceValue sourceValue = insnContext.frame().getStack(insnContext.frame().getStackSize() - (i + 1)).originalSource;
 

testData/results/custom-classes/qprotect/sample1/XML.dec

@@ -117,9 +117,9 @@ public class XML {
             } else if (var5 == '[') {
                 var10 = var0.nextToken();
                 if ("CDATA".equals(var10) && var0.next() == '[') {
-                    String var16 = var0.nextCDATA();
-                    if (var16.length() > 0) {
-                        var1.accumulate(var3.getcDataTagName(), var16);
+                    String var14 = var0.nextCDATA();
+                    if (var14.length() > 0) {
+                        var1.accumulate(var3.getcDataTagName(), var14);
                     }
 
                     return false;
@@ -212,12 +212,12 @@ public class XML {
                         }
 
                         if (var10 instanceof String) {
-                            String var15 = (String)var10;
-                            if (var15.length() > 0) {
+                            String var13 = (String)var10;
+                            if (var13.length() > 0) {
                                 if (var11 != null) {
-                                    var7.accumulate(var3.getcDataTagName(), stringToValue(var15, var11));
+                                    var7.accumulate(var3.getcDataTagName(), stringToValue(var13, var11));
                                 } else {
-                                    var7.accumulate(var3.getcDataTagName(), var3.isKeepStrings() ? var15 : stringToValue(var15));
+                                    var7.accumulate(var3.getcDataTagName(), var3.isKeepStrings() ? var13 : stringToValue(var13));
                                 }
                             }
                         } else if (var10 == LT) {
@@ -238,10 +238,6 @@ public class XML {
                                     var1.accumulate(var9, "");
                                 } else if (var7.length() == 1 && var7.opt(var3.getcDataTagName()) != null) {
                                     var1.accumulate(var9, var7.opt(var3.getcDataTagName()));
-                                    int var14 = 19118812;
-                                    IIlllllIIIllllIl = var14;
-                                    if (333213067 < IIlllllIIIllllIl) {
-                                    }
                                 } else {
                                     if (!var3.shouldTrimWhiteSpace()) {
                                         removeEmpty(var7, var3);