chore(community): wip on frames

Author: terminalsin

dev.skidfuscator.obfuscator/src/main/java/dev/skidfuscator/obfuscator/Skidfuscator.java

@@ -35,10 +35,12 @@
 import dev.skidfuscator.obfuscator.skidasm.SkidClassNode;
 import dev.skidfuscator.obfuscator.skidasm.SkidGroup;
 import dev.skidfuscator.obfuscator.skidasm.SkidMethodNode;
+import dev.skidfuscator.obfuscator.transform.Transformer;
 import dev.skidfuscator.obfuscator.transform.impl.SwitchTransformer;
 import dev.skidfuscator.obfuscator.transform.impl.flow.*;
 import dev.skidfuscator.obfuscator.transform.impl.misc.AhegaoTransformer;
 import dev.skidfuscator.obfuscator.transform.impl.number.NumberTransformer;
+import dev.skidfuscator.obfuscator.transform.impl.outliner.SimpleOutlinerTransformer;
 import dev.skidfuscator.obfuscator.transform.impl.string.StringTransformer;
 import dev.skidfuscator.obfuscator.util.MapleJarUtil;
 import dev.skidfuscator.obfuscator.util.MiscUtil;
@@ -103,6 +105,7 @@ public class Skidfuscator {
      */
     public Skidfuscator(SkidfuscatorSession session) {
         this.session = session;
+        this.exemptAnalysis = new SimpleExemptAnalysis();
     }
 
     /**
@@ -123,13 +126,11 @@ public void run() {
         SkiddedDirectory.init(null);
 
         /*
-         * Here is initialized both the exempt analysis and the skid cache.
+         * Here is initialized the skid cache.
          *
          * The SkidCache is an extension of MapleIR's IRCache
-         * The ExemptAnalysis is a manager which handles exemptions
          */
         this.irFactory = new SkidCache(this);
-        this.exemptAnalysis = new SimpleExemptAnalysis();
 
         /*
          * Here we initialize our opaque predicate type. As of right now
@@ -514,8 +515,14 @@ protected void _importClasspath() {
     }
 
     protected void _loadTransformer() {
-        for (Listener o : Arrays.asList(
-                new StringTransformer(this),
+        for (Listener o : this.getTransformers()) {
+            EventBus.register(o);
+        }
+    }
+
+    public List<Transformer> getTransformers() {
+        return Arrays.asList(
+                /*new StringTransformer(this),
                 //new NegationTransformer(this),
                 //new FlatteningFlowTransformer(this),
                 new NumberTransformer(this),
@@ -524,11 +531,10 @@ protected void _loadTransformer() {
                 new BasicConditionTransformer(this),
                 new BasicExceptionTransformer(this),
                 new BasicRangeTransformer(this),
-                new AhegaoTransformer(this)
+                new AhegaoTransformer(this)*/
+                //new SimpleOutlinerTransformer()
                 //
-        )) {
-            EventBus.register(o);
-        }
+        );
     }
 
     private void _verify() {

dev.skidfuscator.obfuscator/src/main/java/dev/skidfuscator/obfuscator/creator/SkidFlowGraphDumper.java

@@ -24,7 +24,6 @@
 import org.mapleir.ir.code.stmt.copy.CopyVarStmt;
 import org.mapleir.ir.codegen.BytecodeFrontend;
 import org.mapleir.stdlib.collections.graph.*;
-import org.mapleir.stdlib.collections.graph.algorithms.LT79Dom;
 import org.mapleir.stdlib.collections.graph.algorithms.SimpleDfs;
 import org.mapleir.stdlib.collections.graph.algorithms.TarjanSCC;
 import org.mapleir.stdlib.collections.list.IndexedList;
@@ -56,6 +55,8 @@ public class SkidFlowGraphDumper implements BytecodeFrontend {
 
 	private int beginIndex;
 
+	public static boolean TEST_COMPUTE = true;
+
 	public SkidFlowGraphDumper(Skidfuscator skidfuscator, ControlFlowGraph cfg, MethodNode m) {
 		this.skidfuscator = skidfuscator;
 		this.cfg = cfg;
@@ -90,7 +91,9 @@ public void dump() {
 
 		// Compute frames
 		//computeFrames();
-		//new FrameComputer(skidfuscator).compute(cfg);
+		if (TEST_COMPUTE) {
+			new FrameComputer(skidfuscator).compute(cfg);
+		}
 
 		// Stuff
 		/*
@@ -141,7 +144,7 @@ public void dump() {
 			m.node.visitLabel(getLabel(b));
 
 			iter: {
-				if (b.isEmpty() || cfg.getJumpReverseEdges(b).isEmpty()|| true)
+				if (b.isEmpty() || cfg.getJumpReverseEdges(b).isEmpty() || !TEST_COMPUTE)
 					break iter;
 
 				final SkidExpressionPool frameTypes = (SkidExpressionPool) b.getPool();
@@ -312,6 +315,8 @@ private Object _getFrameType(final Type type) {
 			frameType = Opcodes.NULL;
 		} else if (type.getSort() == Type.ARRAY) {
 			frameType = type.getDescriptor();
+		} else if (type == TypeUtil.UNINITIALIZED_THIS) {
+			frameType = Opcodes.UNINITIALIZED_THIS;
 		} else {
 			frameType = type.getInternalName();
 		}

dev.skidfuscator.obfuscator/src/main/java/dev/skidfuscator/obfuscator/frame_V2/frame/FrameComputer.java

@@ -4,7 +4,9 @@
 import dev.skidfuscator.obfuscator.Skidfuscator;
 import dev.skidfuscator.obfuscator.skidasm.SkidClassNode;
 import dev.skidfuscator.obfuscator.skidasm.SkidExpressionPool;
+import dev.skidfuscator.obfuscator.skidasm.SkidMethodNode;
 import dev.skidfuscator.obfuscator.skidasm.SkidTypeStack;
+import dev.skidfuscator.obfuscator.skidasm.cfg.SkidBlock;
 import dev.skidfuscator.obfuscator.util.TypeUtil;
 import dev.skidfuscator.obfuscator.util.misc.Parameter;
 import org.mapleir.asm.ClassNode;
@@ -50,7 +52,12 @@ public FrameComputer(Skidfuscator skidfuscator) {
     public void compute(final ControlFlowGraph cfg) {
         if (cfg.getEntries().size() != 1)
             throw new IllegalStateException("CFG doesn't have exactly 1 entry");
+
+        
+
         final BasicBlock entry = cfg.getEntries().iterator().next();
+        final boolean isInit = cfg.getMethodNode().isInit();
+
         final FrameGraph frameGraph = new FrameGraph();
 
         final Map<BasicBlock, FrameNode> frameMap = new HashMap<>();
@@ -101,7 +108,18 @@ public void compute(final ControlFlowGraph cfg) {
          * of "this." which is itself
          */
         if (!cfg.getMethodNode().isStatic()) {
-            entryFrame.set(index, Type.getType("L" + cfg.getMethodNode().owner.getName() + ";"));
+            if (isInit) {
+                ((SkidMethodNode) cfg.getMethodNode()).getEntryBlock();
+                frameMap.forEach((block, frame) -> {
+                    entryFrame.set(0,
+                            block.isFlagSet(SkidBlock.FLAG_NO_OPAQUE)
+                            ? TypeUtil.UNINITIALIZED_THIS
+                            : cfg.getMethodNode().getOwnerType()
+                    );
+                });
+            } else {
+                entryFrame.set(index, Type.getType("L" + cfg.getMethodNode().owner.getName() + ";"));
+            }
             protectedIndex = index;
             index++;
         }

dev.skidfuscator.obfuscator/src/main/java/dev/skidfuscator/obfuscator/phantom/jphantom/PhantomResolvingJarDumper.java

@@ -119,7 +119,7 @@ public int dumpClass(JarOutputStream out, JarClassData classData) throws IOExcep
 
 		try {
 			try {
-				ClassWriter writer = this.buildClassWriter(tree, ClassWriter.COMPUTE_FRAMES);
+				ClassWriter writer = this.buildClassWriter(tree, ClassWriter.COMPUTE_MAXS);
 				cn.node.accept(writer); // must use custom writer which overrides getCommonSuperclass
 				out.write(writer.toByteArray());
 			} catch (Exception e) {

dev.skidfuscator.obfuscator/src/main/java/dev/skidfuscator/obfuscator/skidasm/cfg/SkidControlFlowGraph.java

@@ -9,6 +9,7 @@
 import org.mapleir.ir.code.expr.invoke.DynamicInvocationExpr;
 import org.mapleir.ir.code.expr.invoke.Invocation;
 import org.mapleir.ir.code.expr.invoke.Invokable;
+import org.mapleir.ir.locals.Local;
 import org.mapleir.ir.locals.LocalsPool;
 
 import java.util.Collection;
@@ -46,4 +47,14 @@ public Stream<CodeUnit> allExprStream() {
                 .map(Stmt::enumerateWithSelf)
                 .flatMap(Streams::stream);
     }
+
+    public Local getSelfLocal() {
+        assert !getMethodNode().isStatic() : "Trying to get instance local on static method";
+
+        return getLocals().get(0);
+    }
+
+    public BasicBlock getEntry() {
+        return getEntries().iterator().next();
+    }
 }