From 91289273fa841badb335698cf177069c4970ca7d Mon Sep 17 00:00:00 2001 From: Adam Date: Sun, 27 Mar 2016 18:11:45 -0400 Subject: [PATCH] Little cleanup --- .../net/runelite/asm/execution/Execution.java | 2 -- .../asm/execution/ParallellMappingExecutor.java | 16 +++------------- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/src/main/java/net/runelite/asm/execution/Execution.java b/src/main/java/net/runelite/asm/execution/Execution.java index 9687d7b684..eecee4dbca 100644 --- a/src/main/java/net/runelite/asm/execution/Execution.java +++ b/src/main/java/net/runelite/asm/execution/Execution.java @@ -76,8 +76,6 @@ public class Execution public boolean hasInvoked(InstructionContext from, Method to) { - // this is wrong because the called of the method of from - // might be different, for building graph Collection methods = invokes.getCollection(from); if (methods != null && methods.contains(to)) return true; diff --git a/src/main/java/net/runelite/asm/execution/ParallellMappingExecutor.java b/src/main/java/net/runelite/asm/execution/ParallellMappingExecutor.java index 4c81929991..cdbbac0fe9 100644 --- a/src/main/java/net/runelite/asm/execution/ParallellMappingExecutor.java +++ b/src/main/java/net/runelite/asm/execution/ParallellMappingExecutor.java @@ -25,19 +25,9 @@ public class ParallellMappingExecutor } boolean step1 = true, step2 = true; - static int count; - public boolean step() - { - ++count; - - if (count == 26) - { - int i = 5; - } - // this no longer holds with recursive stepinfo - //assert e.frames.size() == e2.frames.size(); - + public boolean step() + { p1 = p2 = null; if (e.frames.isEmpty()) @@ -330,7 +320,7 @@ public class ParallellMappingExecutor assert i2.getInstruction() instanceof InvokeStatic; if (returnValue != null) { - // if the function retunred something, we must have pushed + // if the function returned something, we must have pushed assert i2.getPushes().size() == 1; StackContext invokePushed = i2.getPushes().get(0);