Commit 824b5607 authored by Vít Kabele's avatar Vít Kabele
Browse files

Dislserver in separate directory, utils.cfg merged

parent 47b31d8a
Pipeline #3375 passed with stages
in 2 minutes and 57 seconds
......@@ -15,6 +15,8 @@
<classpathentry kind="src" path="disl/src/src-processor"/>
<classpathentry kind="src" path="disl/src/src-guard"/>
<classpathentry kind="src" path="disl/src/src-localvar"/>
<classpathentry kind="src" path="disl/src/src-scope"/>
<classpathentry kind="src" path="disl-server/src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="output/lib/disl-bypass.jar"/>
<classpathentry kind="lib" path="lib/disl/log4j.jar" sourcepath="lib/devel/log4j-source.jar"/>
......
......@@ -487,6 +487,8 @@
<src path="${src.disl.prefix}/src/${src.disl.localvar}"/>
<src path="${src.disl.prefix}/src/${src.disl.util}"/>
<src path="${src.disl.prefix}/src/${src.disl.main}"/>
<src path="disl-server/src"/>
<classpath>
<path refid="disl.bypass.classpath"/>
<path refid="util.classpath"/>
......
# DiSL instrumentation server
......@@ -20,7 +20,6 @@ import org.objectweb.asm.tree.MethodNode;
import org.objectweb.asm.tree.TryCatchBlockNode;
import ch.usi.dag.disl.AsmHelper.Insns;
import ch.usi.dag.disl.util.cfg.CtrlFlowGraph;
/**
......
package ch.usi.dag.disl.util.cfg;
package ch.usi.dag.disl;
import java.util.HashSet;
import java.util.Iterator;
......@@ -6,8 +6,6 @@ import java.util.Set;
import org.objectweb.asm.tree.AbstractInsnNode;
import ch.usi.dag.disl.DiSLFatalException;
public class BasicBlock implements Iterable <AbstractInsnNode> {
......
package ch.usi.dag.disl.util.cfg;
package ch.usi.dag.disl;
import java.util.HashSet;
import java.util.LinkedList;
......@@ -16,7 +16,7 @@ import org.objectweb.asm.tree.TableSwitchInsnNode;
import org.objectweb.asm.tree.TryCatchBlockNode;
import ch.usi.dag.disl.AsmHelper.Insns;
import ch.usi.dag.disl.BasicBlockCalc;
public class CtrlFlowGraph {
......
package ch.usi.dag.disl.tools;
package ch.usi.dag.disl;
import java.io.FileNotFoundException;
import java.io.PrintStream;
......
......@@ -8,7 +8,7 @@ import org.objectweb.asm.tree.MethodNode;
import org.objectweb.asm.tree.TryCatchBlockNode;
import ch.usi.dag.disl.AsmHelper.Insns;
import ch.usi.dag.disl.util.cfg.CtrlFlowGraph;
import ch.usi.dag.disl.CtrlFlowGraph;
/**
* Marks an exception handler.
......
......@@ -7,8 +7,8 @@ import org.objectweb.asm.tree.MethodNode;
import ch.usi.dag.disl.Insn;
import ch.usi.dag.disl.Logging;
import ch.usi.dag.disl.util.cfg.BasicBlock;
import ch.usi.dag.disl.util.cfg.CtrlFlowGraph;
import ch.usi.dag.disl.BasicBlock;
import ch.usi.dag.disl.CtrlFlowGraph;
import ch.usi.dag.util.logging.Logger;
......
......@@ -8,8 +8,8 @@ import java.util.Set;
import org.objectweb.asm.tree.MethodNode;
import org.objectweb.asm.tree.TryCatchBlockNode;
import ch.usi.dag.disl.util.cfg.BasicBlock;
import ch.usi.dag.disl.util.cfg.CtrlFlowGraph;
import ch.usi.dag.disl.BasicBlock;
import ch.usi.dag.disl.CtrlFlowGraph;
/**
* <b>NOTE: This class is work in progress</b>
......
......@@ -16,8 +16,8 @@ import org.objectweb.asm.tree.TryCatchBlockNode;
import org.objectweb.asm.tree.VarInsnNode;
import ch.usi.dag.disl.AsmHelper.Insns;
import ch.usi.dag.disl.util.cfg.BasicBlock;
import ch.usi.dag.disl.util.cfg.CtrlFlowGraph;
import ch.usi.dag.disl.BasicBlock;
import ch.usi.dag.disl.CtrlFlowGraph;
public class MaxCalculator {
......
......@@ -27,8 +27,8 @@ import org.objectweb.asm.tree.analysis.SourceValue;
import ch.usi.dag.disl.AsmHelper;
import ch.usi.dag.disl.AsmHelper.Insns;
import ch.usi.dag.disl.FrameHelper;
import ch.usi.dag.disl.util.cfg.BasicBlock;
import ch.usi.dag.disl.util.cfg.CtrlFlowGraph;
import ch.usi.dag.disl.BasicBlock;
import ch.usi.dag.disl.CtrlFlowGraph;
public class PartialEvaluator {
......
package ch.usi.dag.disl.util.cfg;
package ch.usi.dag.disl;
import java.io.IOException;
import java.util.function.Predicate;
......@@ -9,8 +9,6 @@ import org.objectweb.asm.tree.AbstractInsnNode;
import org.objectweb.asm.tree.ClassNode;
import org.objectweb.asm.tree.MethodNode;
import ch.usi.dag.disl.Insn;
import ch.usi.dag.disl.JavaNames;
import ch.usi.dag.util.asm.ClassNodeHelper;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment