diff --git a/jadx-core/src/main/java/jadx/core/dex/instructions/args/InsnArg.java b/jadx-core/src/main/java/jadx/core/dex/instructions/args/InsnArg.java index 9640cb77f..0dc191977 100644 --- a/jadx-core/src/main/java/jadx/core/dex/instructions/args/InsnArg.java +++ b/jadx-core/src/main/java/jadx/core/dex/instructions/args/InsnArg.java @@ -35,7 +35,7 @@ public abstract class InsnArg extends Typed { return lit(insn.getLiteral(), type); } - public static InsnWrapArg wrap(InsnNode insn) { + private static InsnWrapArg wrap(InsnNode insn) { return new InsnWrapArg(insn); } @@ -81,7 +81,7 @@ public abstract class InsnArg extends Typed { return null; } - private static InsnArg wrapArg(InsnNode insn) { + public static InsnArg wrapArg(InsnNode insn) { InsnArg arg; switch (insn.getType()) { case MOVE: diff --git a/jadx-core/src/main/java/jadx/core/dex/instructions/mods/TernaryInsn.java b/jadx-core/src/main/java/jadx/core/dex/instructions/mods/TernaryInsn.java deleted file mode 100644 index 05d41fe86..000000000 --- a/jadx-core/src/main/java/jadx/core/dex/instructions/mods/TernaryInsn.java +++ /dev/null @@ -1,30 +0,0 @@ -package jadx.core.dex.instructions.mods; - -import jadx.core.dex.instructions.IfNode; -import jadx.core.dex.instructions.IfOp; -import jadx.core.dex.instructions.InsnType; -import jadx.core.dex.instructions.args.InsnArg; -import jadx.core.dex.nodes.InsnNode; -import jadx.core.utils.InsnUtils; -import jadx.core.utils.Utils; - -public class TernaryInsn extends IfNode { - - public TernaryInsn(IfOp op, InsnNode then, InsnNode els) { - super(then.getOffset(), - InsnArg.wrap(then), - els == null ? null : InsnArg.wrap(els)); - } - - @Override - public InsnType getType() { - return InsnType.TERNARY; - } - - @Override - public String toString() { - return InsnUtils.formatOffset(offset) + ": TERNARY" - + getResult() + " = " - + Utils.listToString(getArguments()); - } -} diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/SimplifyVisitor.java b/jadx-core/src/main/java/jadx/core/dex/visitors/SimplifyVisitor.java index 25282a7b2..4c1d664f2 100644 --- a/jadx-core/src/main/java/jadx/core/dex/visitors/SimplifyVisitor.java +++ b/jadx-core/src/main/java/jadx/core/dex/visitors/SimplifyVisitor.java @@ -165,7 +165,7 @@ public class SimplifyVisitor extends AbstractVisitor { for (int i = 1; i < argsCount; i++) { concat.addArg(wrap.getArg(i)); } - return new ArithNode(ArithOp.ADD, fArg, fArg, InsnArg.wrap(concat)); + return new ArithNode(ArithOp.ADD, fArg, fArg, InsnArg.wrapArg(concat)); } } catch (Throwable e) { LOG.debug("Can't convert field arith insn: {}, mth: {}", insn, mth, e);