#1145 expression simplification to separate config instead of autodeobfuscate

This commit is contained in:
Jindra Petřík
2016-02-13 11:48:55 +01:00
parent df63334d36
commit 2a0ca0b79b
2 changed files with 7 additions and 4 deletions

View File

@@ -1507,7 +1507,7 @@ public class AVM2Code implements Cloneable {
break;
}
if (Configuration.autoDeobfuscate.get()) {
if (Configuration._simplifyExpressions.get()) {
stack.simplify();
}
visited[ip] = true;
@@ -1993,8 +1993,7 @@ public class AVM2Code implements Cloneable {
ins.operands[j] = updater.updateOperandOffset(target, ins.operands[j]);
}
}*/ //Faster, but not so universal
{
if (ins.definition instanceof IfTypeIns) {
if (ins.definition instanceof IfTypeIns) {
long target = ins.getTargetAddress();
try {
ins.operands[0] = updater.updateOperandOffset(ins.getAddress(), target, ins.operands[0]);
@@ -2002,7 +2001,6 @@ public class AVM2Code implements Cloneable {
throw new ConvertException("Invalid offset (" + ins + ")", i);
}
}
}
ins.setAddress(updater.updateInstructionOffset(ins.getAddress()));
}

View File

@@ -588,6 +588,11 @@ public class Configuration {
@ConfigurationInternal
public static final ConfigurationItem<Boolean> _enableFlexExport = null;
@ConfigurationDefaultBoolean(false)
//@ConfigurationCategory("script")
@ConfigurationInternal
public static final ConfigurationItem<Boolean> _simplifyExpressions = null;
private enum OSId {
WINDOWS, OSX, UNIX