Auto stash before merge of "master" and "origin/master"

skidfuscatordev · Dec 22, 2024 · adeb6e7 · adeb6e7
1 parent 199b881
commit adeb6e7
Show file tree

Hide file tree

Showing 5 changed files with 515 additions and 6 deletions.
diff --git a/SSVM b/SSVM
diff --git a/dev.skidfuscator.obfuscator/src/main/java/dev/skidfuscator/obfuscator/Skidfuscator.java b/dev.skidfuscator.obfuscator/src/main/java/dev/skidfuscator/obfuscator/Skidfuscator.java
@@ -9,6 +9,7 @@
 import dev.skidfuscator.config.DefaultSkidConfig;
 import dev.skidfuscator.obfuscator.creator.SkidApplicationClassSource;
 import dev.skidfuscator.obfuscator.creator.SkidCache;
+import dev.skidfuscator.obfuscator.creator.SkidFlowGraphDumper;
 import dev.skidfuscator.obfuscator.dependency.CommonDependency;
 import dev.skidfuscator.obfuscator.dependency.DependencyDownloader;
 import dev.skidfuscator.obfuscator.directory.SkiddedDirectory;
@@ -682,7 +683,7 @@ protected List<Transformer> _loadTransformer() {
     public List<Transformer> getTransformers() {
         final List<Transformer> transformers = new ArrayList<>();
 
-        if (true) {
+        if (!SkidFlowGraphDumper.TEST_COMPUTE) {
             if (tsConfig.hasPath("stringEncryption.type")) {
                 switch (tsConfig.getEnum(StringEncryptionType.class, "stringEncryption.type")) {
                     case STANDARD: transformers.add(new StringTransformerV2(this)); break;

diff --git a/...tor.obfuscator/src/main/java/dev/skidfuscator/obfuscator/creator/SkidFlowGraphDumper.java b/...tor.obfuscator/src/main/java/dev/skidfuscator/obfuscator/creator/SkidFlowGraphDumper.java
@@ -11,6 +11,7 @@
 import dev.skidfuscator.obfuscator.skidasm.stmt.SkidBogusStmt;
 import dev.skidfuscator.obfuscator.util.TypeUtil;
 import dev.skidfuscator.obfuscator.util.misc.Parameter;
+import dev.skidfuscator.obfuscator.verifier.Verifier;
 import org.mapleir.asm.ClassNode;
 import org.mapleir.flowgraph.ExceptionRange;
 import org.mapleir.flowgraph.edges.*;
@@ -265,18 +266,24 @@ public void dump() {
 				}
 
 				maxLocal = Math.max(maxLocal, frameLocal.length);
+				maxStack = Math.max(maxStack, stackLength);
 
 				lastFrame = frameLocal;
 				lastStack = stack;
-
 			}
 
 			for (Stmt stmt : b) {
+				if (stmt instanceof FrameStmt && TEST_COMPUTE)
+					continue;
+
 				stmt.toCode(m.node, this);
 			}
 
 			last = b;
 		}
+
+		m.node.visitMaxs(32, 32);
+
 		terminalLabel = new LabelNode();
 		m.node.visitLabel(terminalLabel.getLabel());
 
@@ -290,7 +297,7 @@ public void dump() {
 
 		m.node.visitEnd();
 
-		//Verifier.verify(m.node);
+		//Verifier.verify(m);
 	}
 
 	private Object _getFrameType(final Type type) {