Skip to content

Commit adeb6e7

Browse files
committed
Auto stash before merge of "master" and "origin/master"
1 parent 199b881 commit adeb6e7

File tree

5 files changed

+515
-6
lines changed

5 files changed

+515
-6
lines changed

SSVM

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Subproject commit 0d4fc5417a8a21b58dcd29849dac013aa00b4817

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import dev.skidfuscator.config.DefaultSkidConfig;
1010
import dev.skidfuscator.obfuscator.creator.SkidApplicationClassSource;
1111
import dev.skidfuscator.obfuscator.creator.SkidCache;
12+
import dev.skidfuscator.obfuscator.creator.SkidFlowGraphDumper;
1213
import dev.skidfuscator.obfuscator.dependency.CommonDependency;
1314
import dev.skidfuscator.obfuscator.dependency.DependencyDownloader;
1415
import dev.skidfuscator.obfuscator.directory.SkiddedDirectory;
@@ -682,7 +683,7 @@ protected List<Transformer> _loadTransformer() {
682683
public List<Transformer> getTransformers() {
683684
final List<Transformer> transformers = new ArrayList<>();
684685

685-
if (true) {
686+
if (!SkidFlowGraphDumper.TEST_COMPUTE) {
686687
if (tsConfig.hasPath("stringEncryption.type")) {
687688
switch (tsConfig.getEnum(StringEncryptionType.class, "stringEncryption.type")) {
688689
case STANDARD: transformers.add(new StringTransformerV2(this)); break;

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

+9-2
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import dev.skidfuscator.obfuscator.skidasm.stmt.SkidBogusStmt;
1212
import dev.skidfuscator.obfuscator.util.TypeUtil;
1313
import dev.skidfuscator.obfuscator.util.misc.Parameter;
14+
import dev.skidfuscator.obfuscator.verifier.Verifier;
1415
import org.mapleir.asm.ClassNode;
1516
import org.mapleir.flowgraph.ExceptionRange;
1617
import org.mapleir.flowgraph.edges.*;
@@ -265,18 +266,24 @@ public void dump() {
265266
}
266267

267268
maxLocal = Math.max(maxLocal, frameLocal.length);
269+
maxStack = Math.max(maxStack, stackLength);
268270

269271
lastFrame = frameLocal;
270272
lastStack = stack;
271-
272273
}
273274

274275
for (Stmt stmt : b) {
276+
if (stmt instanceof FrameStmt && TEST_COMPUTE)
277+
continue;
278+
275279
stmt.toCode(m.node, this);
276280
}
277281

278282
last = b;
279283
}
284+
285+
m.node.visitMaxs(32, 32);
286+
280287
terminalLabel = new LabelNode();
281288
m.node.visitLabel(terminalLabel.getLabel());
282289

@@ -290,7 +297,7 @@ public void dump() {
290297

291298
m.node.visitEnd();
292299

293-
//Verifier.verify(m.node);
300+
//Verifier.verify(m);
294301
}
295302

296303
private Object _getFrameType(final Type type) {

0 commit comments

Comments
 (0)