core: simplify conditions

jadx-core/src/test/java/jadx/tests/functional/TestIfCondition.java

@@ -0,0 +1,105 @@
+package jadx.tests.functional;
+
+import jadx.core.dex.instructions.IfNode;
+import jadx.core.dex.instructions.IfOp;
+import jadx.core.dex.instructions.args.ArgType;
+import jadx.core.dex.instructions.args.InsnArg;
+import jadx.core.dex.instructions.args.LiteralArg;
+import jadx.core.dex.regions.Compare;
+import jadx.core.dex.regions.IfCondition;
+
+import org.junit.Test;
+
+import static jadx.core.dex.regions.IfCondition.Mode;
+import static jadx.core.dex.regions.IfCondition.merge;
+import static jadx.core.dex.regions.IfCondition.not;
+import static jadx.core.dex.regions.IfCondition.simplify;
+import static org.junit.Assert.assertEquals;
+
+public class TestIfCondition {
+
+	private static IfCondition makeCondition(IfOp op, InsnArg a, InsnArg b) {
+		return IfCondition.fromIfNode(new IfNode(op, -1, a, b));
+	}
+
+	private static IfCondition makeSimpleCondition() {
+		return makeCondition(IfOp.EQ, mockArg(), LiteralArg.TRUE);
+	}
+
+	private static IfCondition makeNegCondition() {
+		return makeCondition(IfOp.NE, mockArg(), LiteralArg.TRUE);
+	}
+
+	private static InsnArg mockArg() {
+		return InsnArg.reg(0, ArgType.INT);
+	}
+
+	@Test
+	public void testNormalize() {
+		// 'a != false' => 'a == true'
+		InsnArg a = mockArg();
+		IfCondition c = makeCondition(IfOp.NE, a, LiteralArg.FALSE);
+		IfCondition simp = simplify(c);
+
+		assertEquals(simp.getMode(), Mode.COMPARE);
+		Compare compare = simp.getCompare();
+		assertEquals(compare.getA(), a);
+		assertEquals(compare.getB(), LiteralArg.TRUE);
+	}
+
+	@Test
+	public void testMerge() {
+		IfCondition a = makeSimpleCondition();
+		IfCondition b = makeSimpleCondition();
+		IfCondition c = merge(Mode.OR, a, b);
+
+		assertEquals(c.getMode(), Mode.OR);
+		assertEquals(c.first(), a);
+		assertEquals(c.second(), b);
+	}
+
+	@Test
+	public void testSimplifyNot() {
+		// !(!a) => a
+		IfCondition a = not(not(makeSimpleCondition()));
+		assertEquals(simplify(a), a);
+	}
+
+	@Test
+	public void testSimplifyNot2() {
+		// !(!a) => a
+		IfCondition a = not(makeNegCondition());
+		assertEquals(simplify(a), a);
+	}
+
+	@Test
+	public void testSimplify() {
+		// '!(!a || !b)' => 'a && b'
+		IfCondition a = makeSimpleCondition();
+		IfCondition b = makeSimpleCondition();
+		IfCondition c = not(merge(Mode.OR, not(a), not(b)));
+		IfCondition simp = simplify(c);
+
+		assertEquals(simp.getMode(), Mode.AND);
+		assertEquals(simp.first(), a);
+		assertEquals(simp.second(), b);
+	}
+
+	@Test
+	public void testSimplify2() {
+		// '(!a || !b) && !c' => '!((a && b) || c)'
+		IfCondition a = makeSimpleCondition();
+		IfCondition b = makeSimpleCondition();
+		IfCondition c = makeSimpleCondition();
+		IfCondition cond = merge(Mode.AND, merge(Mode.OR, not(a), not(b)), not(c));
+		IfCondition simp = simplify(cond);
+
+		assertEquals(simp.getMode(), Mode.NOT);
+		IfCondition f = simp.first();
+		assertEquals(f.getMode(), Mode.OR);
+		assertEquals(f.first().getMode(), Mode.AND);
+		assertEquals(f.first().first(), a);
+		assertEquals(f.first().second(), b);
+		assertEquals(f.second(), c);
+	}
+}

jadx-core/src/test/java/jadx/tests/internal/TestConditions.java

@@ -0,0 +1,30 @@
+package jadx.tests.internal;
+
+import jadx.api.InternalJadxTest;
+import jadx.core.dex.nodes.ClassNode;
+
+import org.junit.Test;
+
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.CoreMatchers.not;
+import static org.junit.Assert.assertThat;
+
+public class TestConditions extends InternalJadxTest {
+
+	public static class TestCls {
+		private boolean f1(boolean a, boolean b, boolean c) {
+			return (a && b) || c;
+		}
+	}
+
+	@Test
+	public void test() {
+		ClassNode cls = getClassNode(TestCls.class);
+		String code = cls.getCode().toString();
+		System.out.println(code);
+
+		assertThat(code, not(containsString("(!a || !b) && !c")));
+		assertThat(code, containsString("(a && b) || c"));
+//		assertThat(code, containsString("return (a && b) || c;"));
+	}
+}

jadx-core/src/test/java/jadx/tests/internal/TestConditions2.java

@@ -9,7 +9,7 @@ import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.CoreMatchers.not;
 import static org.junit.Assert.assertThat;
 
-public class TestTmp2 extends InternalJadxTest {
+public class TestConditions2 extends InternalJadxTest {
 
 	public static class TestCls extends Exception {
 		int c;