Skip to content

Commit 12a0e29

Browse files
committed
wip(obfuscator): frame computation v2
1 parent 9d3cf73 commit 12a0e29

11 files changed

Lines changed: 1339 additions & 194 deletions

File tree

dev.skidfuscator.maple-ir/org.mapleir.ir/src/main/java/org/mapleir/ir/locals/type/TypeHeader.java

Lines changed: 0 additions & 111 deletions
This file was deleted.

dev.skidfuscator.maple-ir/org.mapleir.ir/src/main/java/org/mapleir/ir/locals/type/TypePool.java

Lines changed: 0 additions & 78 deletions
This file was deleted.

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,7 @@ public void run() {
377377

378378
/* Register opaque predicate renderer and transformers */
379379
LOGGER.post("Loading transformers...");
380-
EventBus.register(new IntegerBlockPredicateRenderer(this, null));
380+
//EventBus.register(new IntegerBlockPredicateRenderer(this, null));
381381

382382
/*
383383
* VAZIAK
@@ -389,7 +389,7 @@ public void run() {
389389
for (Listener o : Arrays.asList(
390390
new StringTransformer(this),
391391
//new NegationTransformer(this),
392-
new FlatteningFlowTransformer(this),
392+
//new FlatteningFlowTransformer(this),
393393
new NumberTransformer(this),
394394
new SwitchTransformer(this),
395395
new BasicSimplifierTransformer(this),
@@ -400,7 +400,7 @@ public void run() {
400400
//
401401
//new FactoryMakerTransformer()
402402
)) {
403-
EventBus.register(o);
403+
//EventBus.register(o);
404404
}
405405

406406
LOGGER.log("Finished loading transformers...");

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import com.google.common.collect.Streams;
44
import dev.skidfuscator.obfuscator.Skidfuscator;
55
import dev.skidfuscator.obfuscator.frame.Frame;
6-
import dev.skidfuscator.obfuscator.frame.FrameComputer;
6+
import dev.skidfuscator.obfuscator.frame_V2.frame.FrameComputer;
77
import dev.skidfuscator.obfuscator.skidasm.SkidClassNode;
88
import dev.skidfuscator.obfuscator.skidasm.SkidExpressionPool;
99
import dev.skidfuscator.obfuscator.skidasm.SkidTypeStack;
@@ -90,7 +90,7 @@ public void dump() {
9090

9191
// Compute frames
9292
//computeFrames();
93-
//new FrameComputer(skidfuscator).compute(cfg);
93+
new FrameComputer(skidfuscator).compute(cfg);
9494

9595
// Stuff
9696
/*

0 commit comments

Comments
 (0)