From 0662e743691bb8dcd6e85623e052f51ec03e9790 Mon Sep 17 00:00:00 2001 From: Adam Date: Sun, 7 Feb 2016 21:03:20 -0500 Subject: [PATCH] I dont know why this runs forever. --- .../deob/deobfuscators/rename/MappingExecutorUtil.java | 2 +- .../runelite/deob/execution/ParallellMappingExecutor.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/net/runelite/deob/deobfuscators/rename/MappingExecutorUtil.java b/src/main/java/net/runelite/deob/deobfuscators/rename/MappingExecutorUtil.java index b39f88673e..72525e93d1 100644 --- a/src/main/java/net/runelite/deob/deobfuscators/rename/MappingExecutorUtil.java +++ b/src/main/java/net/runelite/deob/deobfuscators/rename/MappingExecutorUtil.java @@ -102,7 +102,7 @@ public class MappingExecutorUtil assert e.paused; assert e2.paused; - System.out.println(p1.getInstruction() + " <-> " + p2.getInstruction()); + //System.out.println(p1.getInstruction() + " <-> " + p2.getInstruction()); //assert p1.getInstruction().getInstructions().getCode().getAttributes().getMethod() == m1; //assert p2.getInstruction().getInstructions().getCode().getAttributes().getMethod() == m2; diff --git a/src/main/java/net/runelite/deob/execution/ParallellMappingExecutor.java b/src/main/java/net/runelite/deob/execution/ParallellMappingExecutor.java index b43691a025..ab8f5e8ddb 100644 --- a/src/main/java/net/runelite/deob/execution/ParallellMappingExecutor.java +++ b/src/main/java/net/runelite/deob/execution/ParallellMappingExecutor.java @@ -180,7 +180,7 @@ public class ParallellMappingExecutor if (oldf1.otherStatic == oldf2 && oldf2.otherStatic == oldf1) { mappings.map(oldf1.getMethod(), oldf2.getMethod()); - System.out.println("hmmm"); + System.out.println("STEP OUT " + oldf1.getMethod() + " <-> " + oldf2.getMethod()); } // if (e.frames.size() - s1 != e2.frames.size() - s2) @@ -352,8 +352,8 @@ public class ParallellMappingExecutor f.other = null; f2.returnTo = new Frame(f); // where to go when we're done - assert f.getInstructions().isEmpty() == false; - f2.returnTo.getInstructions().addAll(f.getInstructions()); + assert f.getInstructions().isEmpty() == false; // this is wrong? + f2.returnTo.getInstructions().addAll(f.getInstructions()); // also wrong? return f2; }