I dont know why this runs forever.
This commit is contained in:
@@ -102,7 +102,7 @@ public class MappingExecutorUtil
|
|||||||
assert e.paused;
|
assert e.paused;
|
||||||
assert e2.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 p1.getInstruction().getInstructions().getCode().getAttributes().getMethod() == m1;
|
||||||
//assert p2.getInstruction().getInstructions().getCode().getAttributes().getMethod() == m2;
|
//assert p2.getInstruction().getInstructions().getCode().getAttributes().getMethod() == m2;
|
||||||
|
|||||||
@@ -180,7 +180,7 @@ public class ParallellMappingExecutor
|
|||||||
if (oldf1.otherStatic == oldf2 && oldf2.otherStatic == oldf1)
|
if (oldf1.otherStatic == oldf2 && oldf2.otherStatic == oldf1)
|
||||||
{
|
{
|
||||||
mappings.map(oldf1.getMethod(), oldf2.getMethod());
|
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)
|
// if (e.frames.size() - s1 != e2.frames.size() - s2)
|
||||||
@@ -352,8 +352,8 @@ public class ParallellMappingExecutor
|
|||||||
f.other = null;
|
f.other = null;
|
||||||
|
|
||||||
f2.returnTo = new Frame(f); // where to go when we're done
|
f2.returnTo = new Frame(f); // where to go when we're done
|
||||||
assert f.getInstructions().isEmpty() == false;
|
assert f.getInstructions().isEmpty() == false; // this is wrong?
|
||||||
f2.returnTo.getInstructions().addAll(f.getInstructions());
|
f2.returnTo.getInstructions().addAll(f.getInstructions()); // also wrong?
|
||||||
|
|
||||||
return f2;
|
return f2;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user