jessikitty/jadx
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

core: use late deletion for NOP instruction (#215)

Browse Source
This commit is contained in:
Skylot
2018-01-25 14:58:17 +03:00
parent d42bf2d43c
commit 9132ef57f1
2 changed files with 25 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jadx-core/src/main/java/jadx/core/dex/instructions/InsnDecoder.java
+2
View File
@@ -69,6 +69,8 @@ public class InsnDecoder {
private InsnNode decode(DecodedInstruction insn, int offset) throws DecodeException {
switch (insn.getOpcode()) {
case Opcodes.NOP:
return new InsnNode(InsnType.NOP, 0);
case Opcodes.PACKED_SWITCH_PAYLOAD:
case Opcodes.SPARSE_SWITCH_PAYLOAD:
case Opcodes.FILL_ARRAY_DATA_PAYLOAD:
jadx-core/src/main/java/jadx/core/dex/visitors/blocksmaker/BlockSplitter.java
+23 -21
View File
@@ -1,5 +1,11 @@
package jadx.core.dex.visitors.blocksmaker;
import java.util.EnumSet;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import jadx.core.dex.attributes.AFlag;
import jadx.core.dex.attributes.AType;
import jadx.core.dex.attributes.nodes.JumpInfo;
@@ -14,13 +20,6 @@ import jadx.core.dex.trycatch.SplitterBlockAttr;
import jadx.core.dex.visitors.AbstractVisitor;
import jadx.core.utils.exceptions.JadxRuntimeException;
import java.util.EnumSet;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
public class BlockSplitter extends AbstractVisitor {
// leave these instructions alone in block node
@@ -43,6 +42,7 @@ public class BlockSplitter extends AbstractVisitor {
mth.initBasicBlocks();
splitBasicBlocks(mth);
removeInsns(mth);
removeEmptyBlocks(mth);
}
private static void splitBasicBlocks(MethodNode mth) {
@@ -197,14 +197,12 @@ public class BlockSplitter extends AbstractVisitor {
private static boolean isDoWhile(Map<Integer, BlockNode> blocksMap, BlockNode curBlock, InsnNode insn) {
// split 'do-while' block (last instruction: 'if', target this block)
if (insn.getType() == InsnType.IF) {
IfNode ifs = (IfNode) insn;
BlockNode targetBlock = blocksMap.get(ifs.getTarget());
if (targetBlock == curBlock) {
return true;
}
if (insn.getType() != InsnType.IF) {
return false;
}
return false;
IfNode ifs = (IfNode) insn;
BlockNode targetBlock = blocksMap.get(ifs.getTarget());
return targetBlock == curBlock;
}
private static BlockNode getBlock(int offset, Map<Integer, BlockNode> blocksMap) {
@@ -217,14 +215,18 @@ public class BlockSplitter extends AbstractVisitor {
private static void removeInsns(MethodNode mth) {
for (BlockNode block : mth.getBasicBlocks()) {
Iterator<InsnNode> it = block.getInstructions().iterator();
while (it.hasNext()) {
InsnType insnType = it.next().getType();
if (insnType == InsnType.GOTO || insnType == InsnType.NOP) {
it.remove();
}
}
block.getInstructions().removeIf(insn -> {
InsnType insnType = insn.getType();
return insnType == InsnType.GOTO || insnType == InsnType.NOP;
});
}
}
private void removeEmptyBlocks(MethodNode mth) {
mth.getBasicBlocks().removeIf(block ->
block.getInstructions().isEmpty()
&& block.getPredecessors().isEmpty()
&& block.getSuccessors().isEmpty()
);
}
}