also pass current frames

narumii · Sep 3, 2024 · d7d448b · d7d448b
1 parent d72dd20
commit d7d448b
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 9 deletions.
diff --git a/.../src/main/java/uwu/narumi/deobfuscator/api/transformer/FramedInstructionsTransformer.java b/.../src/main/java/uwu/narumi/deobfuscator/api/transformer/FramedInstructionsTransformer.java
@@ -23,11 +23,19 @@ public abstract class FramedInstructionsTransformer extends FramedMethodsTransfo
    * @param context Current context
    * @param classWrapper Current class
    * @param methodNode Current method
+   * @param frames Frames of the current method
    * @param insn Current instruction
    * @param frame Current frame
    * @return If changed
    */
-  protected abstract boolean transformInstruction(Context context, ClassWrapper classWrapper, MethodNode methodNode, AbstractInsnNode insn, Frame<OriginalSourceValue> frame);
+  protected abstract boolean transformInstruction(
+      Context context,
+      ClassWrapper classWrapper,
+      MethodNode methodNode,
+      Map<AbstractInsnNode, Frame<OriginalSourceValue>> frames,
+      AbstractInsnNode insn,
+      Frame<OriginalSourceValue> frame
+  );
 
   /**
    * Returns instructions stream on which the transformer will be iterating
@@ -45,7 +53,7 @@ protected void transformMethod(Context context, ClassWrapper classWrapper, Metho
       if (frame == null) return;
 
       // Run the instruction transformer
-      boolean transformerChanged = transformInstruction(context, classWrapper, methodNode, insn, frame);
+      boolean transformerChanged = transformInstruction(context, classWrapper, methodNode, frames, insn, frame);
       if (transformerChanged) {
         this.markChange();
       }

diff --git a/...va/uwu/narumi/deobfuscator/core/other/impl/clean/peephole/UselessPopCleanTransformer.java b/...va/uwu/narumi/deobfuscator/core/other/impl/clean/peephole/UselessPopCleanTransformer.java
@@ -8,6 +8,7 @@
 import uwu.narumi.deobfuscator.api.context.Context;
 import uwu.narumi.deobfuscator.api.transformer.FramedInstructionsTransformer;
 
+import java.util.Map;
 import java.util.stream.Stream;
 
 // TODO: Remove pair of DUP and POP
@@ -21,7 +22,7 @@ protected Stream<AbstractInsnNode> buildInstructionsStream(Stream<AbstractInsnNo
   }
 
   @Override
-  protected boolean transformInstruction(Context context, ClassWrapper classWrapper, MethodNode methodNode, AbstractInsnNode insn, Frame<OriginalSourceValue> frame) {
+  protected boolean transformInstruction(Context context, ClassWrapper classWrapper, MethodNode methodNode, Map<AbstractInsnNode, Frame<OriginalSourceValue>> frames, AbstractInsnNode insn, Frame<OriginalSourceValue> frame) {
     boolean shouldRemovePop = false;
 
     OriginalSourceValue firstValue = frame.getStack(frame.getStackSize() - 1);

diff --git a/...in/java/uwu/narumi/deobfuscator/core/other/impl/pool/InlineLocalVariablesTransformer.java b/...in/java/uwu/narumi/deobfuscator/core/other/impl/pool/InlineLocalVariablesTransformer.java
@@ -9,6 +9,7 @@
 import uwu.narumi.deobfuscator.api.context.Context;
 import uwu.narumi.deobfuscator.api.transformer.FramedInstructionsTransformer;
 
+import java.util.Map;
 import java.util.stream.Stream;
 
 /**
@@ -26,7 +27,7 @@ protected Stream<AbstractInsnNode> buildInstructionsStream(Stream<AbstractInsnNo
   }
 
   @Override
-  protected boolean transformInstruction(Context context, ClassWrapper classWrapper, MethodNode methodNode, AbstractInsnNode insn, Frame<OriginalSourceValue> frame) {
+  protected boolean transformInstruction(Context context, ClassWrapper classWrapper, MethodNode methodNode, Map<AbstractInsnNode, Frame<OriginalSourceValue>> frames, AbstractInsnNode insn, Frame<OriginalSourceValue> frame) {
     VarInsnNode varInsn = (VarInsnNode) insn;
 
     // Var store instruction

diff --git a/...wu/narumi/deobfuscator/core/other/impl/universal/flow/CleanRedundantJumpsTransformer.java b/...wu/narumi/deobfuscator/core/other/impl/universal/flow/CleanRedundantJumpsTransformer.java
@@ -11,11 +11,12 @@
 import uwu.narumi.deobfuscator.api.helper.AsmMathHelper;
 import uwu.narumi.deobfuscator.api.transformer.FramedInstructionsTransformer;
 
+import java.util.Map;
 import java.util.Optional;
 
 public class CleanRedundantJumpsTransformer extends FramedInstructionsTransformer {
   @Override
-  protected boolean transformInstruction(Context context, ClassWrapper classWrapper, MethodNode methodNode, AbstractInsnNode insn, Frame<OriginalSourceValue> frame) {
+  protected boolean transformInstruction(Context context, ClassWrapper classWrapper, MethodNode methodNode, Map<AbstractInsnNode, Frame<OriginalSourceValue>> frames, AbstractInsnNode insn, Frame<OriginalSourceValue> frame) {
     if (!(insn instanceof JumpInsnNode jumpInsn)) return false;
 
     Optional<Boolean> optIfResult = AsmMathHelper.predictIf(jumpInsn, frame);

diff --git a/...narumi/deobfuscator/core/other/impl/universal/flow/CleanRedundantSwitchesTransformer.java b/...narumi/deobfuscator/core/other/impl/universal/flow/CleanRedundantSwitchesTransformer.java
@@ -14,6 +14,7 @@
 import uwu.narumi.deobfuscator.api.helper.AsmMathHelper;
 import uwu.narumi.deobfuscator.api.transformer.FramedInstructionsTransformer;
 
+import java.util.Map;
 import java.util.Optional;
 
 /**
@@ -22,7 +23,7 @@
 public class CleanRedundantSwitchesTransformer extends FramedInstructionsTransformer {
 
   @Override
-  protected boolean transformInstruction(Context context, ClassWrapper classWrapper, MethodNode methodNode, AbstractInsnNode insn, Frame<OriginalSourceValue> frame) {
+  protected boolean transformInstruction(Context context, ClassWrapper classWrapper, MethodNode methodNode, Map<AbstractInsnNode, Frame<OriginalSourceValue>> frames, AbstractInsnNode insn, Frame<OriginalSourceValue> frame) {
     if (insn.getOpcode() == LOOKUPSWITCH) {
       LookupSwitchInsnNode lookupSwitchInsn = (LookupSwitchInsnNode) insn;
 

diff --git a/...narumi/deobfuscator/core/other/impl/universal/number/MathBinaryOperationsTransformer.java b/...narumi/deobfuscator/core/other/impl/universal/number/MathBinaryOperationsTransformer.java
@@ -10,6 +10,7 @@
 import uwu.narumi.deobfuscator.api.helper.AsmMathHelper;
 import uwu.narumi.deobfuscator.api.transformer.FramedInstructionsTransformer;
 
+import java.util.Map;
 import java.util.stream.Stream;
 
 /**
@@ -24,7 +25,7 @@ protected Stream<AbstractInsnNode> buildInstructionsStream(Stream<AbstractInsnNo
   }
 
   @Override
-  protected boolean transformInstruction(Context context, ClassWrapper classWrapper, MethodNode methodNode, AbstractInsnNode insn, Frame<OriginalSourceValue> frame) {
+  protected boolean transformInstruction(Context context, ClassWrapper classWrapper, MethodNode methodNode, Map<AbstractInsnNode, Frame<OriginalSourceValue>> frames, AbstractInsnNode insn, Frame<OriginalSourceValue> frame) {
     // Get instructions from stack that are passed
     OriginalSourceValue value1SourceValue = frame.getStack(frame.getStackSize() - 2);
     OriginalSourceValue value2SourceValue = frame.getStack(frame.getStackSize() - 1);

diff --git a/.../narumi/deobfuscator/core/other/impl/universal/number/MathUnaryOperationsTransformer.java b/.../narumi/deobfuscator/core/other/impl/universal/number/MathUnaryOperationsTransformer.java
@@ -10,6 +10,7 @@
 import uwu.narumi.deobfuscator.api.helper.AsmMathHelper;
 import uwu.narumi.deobfuscator.api.transformer.FramedInstructionsTransformer;
 
+import java.util.Map;
 import java.util.stream.Stream;
 
 /**
@@ -23,7 +24,7 @@ protected Stream<AbstractInsnNode> buildInstructionsStream(Stream<AbstractInsnNo
   }
 
   @Override
-  protected boolean transformInstruction(Context context, ClassWrapper classWrapper, MethodNode methodNode, AbstractInsnNode insn, Frame<OriginalSourceValue> frame) {
+  protected boolean transformInstruction(Context context, ClassWrapper classWrapper, MethodNode methodNode, Map<AbstractInsnNode, Frame<OriginalSourceValue>> frames, AbstractInsnNode insn, Frame<OriginalSourceValue> frame) {
     // Get instructions from stack that are passed
     OriginalSourceValue sourceValue = frame.getStack(frame.getStackSize() - 1);
     OriginalSourceValue originalSource = sourceValue.originalSource;

diff --git a/...arumi/deobfuscator/core/other/impl/universal/number/MethodCallsOnLiteralsTransformer.java b/...arumi/deobfuscator/core/other/impl/universal/number/MethodCallsOnLiteralsTransformer.java
@@ -10,13 +10,15 @@
 import uwu.narumi.deobfuscator.api.helper.AsmMathHelper;
 import uwu.narumi.deobfuscator.api.transformer.FramedInstructionsTransformer;
 
+import java.util.Map;
+
 /**
  * Simplifies method calls on constant literals.
  */
 public class MethodCallsOnLiteralsTransformer extends FramedInstructionsTransformer {
 
   @Override
-  protected boolean transformInstruction(Context context, ClassWrapper classWrapper, MethodNode methodNode, AbstractInsnNode insn, Frame<OriginalSourceValue> frame) {
+  protected boolean transformInstruction(Context context, ClassWrapper classWrapper, MethodNode methodNode, Map<AbstractInsnNode, Frame<OriginalSourceValue>> frames, AbstractInsnNode insn, Frame<OriginalSourceValue> frame) {
     // Transform method calls on literals
     for (Match mathMatch : AsmMathHelper.METHOD_CALLS_ON_LITERALS) {
       if (mathMatch.test(insn)) {