Magic-Mirror/jadx
1
0
Fork 0
mirror of https://github.com/skylot/jadx.git synced 2025-02-18 12:09:38 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

core: allow subblock replace for 'if' region

Browse Source
This commit is contained in:
Skylot 2014-08-14 22:38:29 +04:00
parent 3bdda55102
commit 4f307c0085
3 changed files with 34 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jadx-core/src/main/java/jadx/core/dex/regions/AbstractRegion.java
View File

@ -4,7 +4,11 @@ import jadx.core.dex.attributes.AttrNode;
import jadx.core.dex.nodes.IContainer;
import jadx.core.dex.nodes.IRegion;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public abstract class AbstractRegion extends AttrNode implements IRegion {
private static final Logger LOG = LoggerFactory.getLogger(AbstractRegion.class);
private IRegion parent;
@ -23,7 +27,7 @@ public abstract class AbstractRegion extends AttrNode implements IRegion {
@Override
public boolean replaceSubBlock(IContainer oldBlock, IContainer newBlock) {
// TODO: implement for others regions
LOG.warn("Replace sub block not supported for class \"{}\"", this.getClass());
return false;
}
}

13
jadx-core/src/main/java/jadx/core/dex/regions/IfRegion.java
View File

@ -101,6 +101,19 @@ public final class IfRegion extends AbstractRegion {
return Collections.unmodifiableList(all);
}
@Override
public boolean replaceSubBlock(IContainer oldBlock, IContainer newBlock) {
if (oldBlock == thenRegion) {
thenRegion = newBlock;
return true;
}
if (oldBlock == elseRegion) {
elseRegion = newBlock;
return true;
}
return false;
}
@Override
public String baseString() {
if (ternRegion != null) {

25
jadx-core/src/main/java/jadx/core/dex/visitors/regions/ProcessTryCatchRegions.java
View File

@ -1,5 +1,6 @@
package jadx.core.dex.visitors.regions;
import jadx.core.dex.attributes.AFlag;
import jadx.core.dex.attributes.AType;
import jadx.core.dex.nodes.BlockNode;
import jadx.core.dex.nodes.IContainer;
@ -44,7 +45,7 @@ public class ProcessTryCatchRegions extends AbstractRegionVisitor {
DepthRegionTraversal.traverseAll(mth, new AbstractRegionVisitor() {
@Override
public void leaveRegion(MethodNode mth, IRegion region) {
checkAndWrap(tryBlocksMap, region);
checkAndWrap(mth, tryBlocksMap, region);
}
});
if (k++ > 100) {
@ -98,13 +99,16 @@ public class ProcessTryCatchRegions extends AbstractRegionVisitor {
}
}
private static void checkAndWrap(Map<BlockNode, TryCatchBlock> tryBlocksMap, IRegion region) {
private static void checkAndWrap(MethodNode mth, Map<BlockNode, TryCatchBlock> tryBlocksMap, IRegion region) {
// search dominator blocks in this region (don't need to go deeper)
for (Map.Entry<BlockNode, TryCatchBlock> entry : tryBlocksMap.entrySet()) {
BlockNode dominator = entry.getKey();
if (region.getSubBlocks().contains(dominator)) {
TryCatchBlock tb = tryBlocksMap.get(dominator);
wrapBlocks(region, tb, dominator);
if (!wrapBlocks(region, tb, dominator)) {
LOG.warn("Can't wrap try/catch for {}, method: {}", dominator, mth);
mth.add(AFlag.INCONSISTENT_CODE);
}
tryBlocksMap.remove(dominator);
return;
}
@ -114,9 +118,10 @@ public class ProcessTryCatchRegions extends AbstractRegionVisitor {
/**
* Extract all block dominated by 'dominator' to separate region and mark as try/catch block
*/
private static void wrapBlocks(IRegion region, TryCatchBlock tb, BlockNode dominator) {
private static boolean wrapBlocks(IRegion region, TryCatchBlock tb, BlockNode dominator) {
Region newRegion = new Region(region);
for (IContainer cont : region.getSubBlocks()) {
List<IContainer> subBlocks = region.getSubBlocks();
for (IContainer cont : subBlocks) {
if (RegionUtils.isDominatedBy(dominator, cont)) {
if (isHandlerPath(tb, cont)) {
break;
@ -125,13 +130,14 @@ public class ProcessTryCatchRegions extends AbstractRegionVisitor {
}
}
if (newRegion.getSubBlocks().isEmpty()) {
return;
return false;
}
// replace first node by region
IContainer firstNode = newRegion.getSubBlocks().get(0);
int i = region.getSubBlocks().indexOf(firstNode);
region.getSubBlocks().set(i, newRegion);
region.getSubBlocks().removeAll(newRegion.getSubBlocks());
if (!region.replaceSubBlock(firstNode, newRegion)) {
return false;
}
subBlocks.removeAll(newRegion.getSubBlocks());
newRegion.addAttr(tb.getCatchAttr());
@ -142,6 +148,7 @@ public class ProcessTryCatchRegions extends AbstractRegionVisitor {
aReg.setParent(newRegion);
}
}
return true;
}
private static boolean isHandlerPath(TryCatchBlock tb, IContainer cont) {