ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Little cleanup

Browse Source
This commit is contained in:
Adam
2016-03-27 18:11:45 -04:00
parent 0462c4a1d1
commit 91289273fa
2 changed files with 3 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/net/runelite/asm/execution/Execution.java
View File

@@ -76,8 +76,6 @@ public class Execution
public boolean hasInvoked(InstructionContext from, Method to) 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<Method> methods = invokes.getCollection(from); Collection<Method> methods = invokes.getCollection(from);
if (methods != null && methods.contains(to)) if (methods != null && methods.contains(to))
return true; return true;

16
src/main/java/net/runelite/asm/execution/ParallellMappingExecutor.java
View File

@@ -25,19 +25,9 @@ public class ParallellMappingExecutor
} }
boolean step1 = true, step2 = true; boolean step1 = true, step2 = true;
static int count;
public boolean step()
{
++count;
if (count == 26) public boolean step()
{ {
int i = 5;
}
// this no longer holds with recursive stepinfo
//assert e.frames.size() == e2.frames.size();
p1 = p2 = null; p1 = p2 = null;
if (e.frames.isEmpty()) if (e.frames.isEmpty())
@@ -330,7 +320,7 @@ public class ParallellMappingExecutor
assert i2.getInstruction() instanceof InvokeStatic; assert i2.getInstruction() instanceof InvokeStatic;
if (returnValue != null) 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; assert i2.getPushes().size() == 1;
StackContext invokePushed = i2.getPushes().get(0); StackContext invokePushed = i2.getPushes().get(0);