Commit 02a4ec31 authored by Lubomir Bulej's avatar Lubomir Bulej

- Converted ROClassWriter to anonymous inner class within DiSL.

- Moved CodeMerger and TLVInserter classes to ch.usi.dag.disl package, because DiSL class is the sole user.
- Removed the utilinstr.* packages to reduce package clutter.
parent 54db31da
package ch.usi.dag.disl.utilinstr.codemerger;
package ch.usi.dag.disl;
import java.util.List;
import java.util.Set;
......@@ -18,7 +18,7 @@ import ch.usi.dag.disl.dynamicbypass.BypassCheck;
import ch.usi.dag.disl.exception.DiSLFatalException;
import ch.usi.dag.disl.util.AsmHelper.ClonedCode;
public abstract class CodeMerger {
abstract class CodeMerger {
private static final String BPC_CLASS = Type.getInternalName (BypassCheck.class);
private static final String BPC_METHOD = "executeUninstrumented";
This diff is collapsed.
package ch.usi.dag.disl;
import org.objectweb.asm.ClassReader;
import org.objectweb.asm.ClassWriter;
public class ROClassWriter extends ClassWriter {
public ROClassWriter(ClassReader classReader, int flags) {
super(classReader, flags);
public ROClassWriter(int flags) {
protected String getCommonSuperClass(String type1, String type2) {
// same string as in super class
return "java/lang/Object";
package ch.usi.dag.disl.utilinstr.tlvinserter;
package ch.usi.dag.disl;
import java.util.Set;
......@@ -13,7 +13,7 @@ import ch.usi.dag.disl.localvar.ThreadLocalVar;
import ch.usi.dag.disl.util.AsmHelper;
import ch.usi.dag.disl.util.Constants;
public final class TLVInserter extends ClassVisitor {
final class TLVInserter extends ClassVisitor {
private final Set<ThreadLocalVar> threadLocalVars;
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment