Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
DiSL
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
5
Issues
5
List
Boards
Labels
Service Desk
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DiSL
DiSL
Commits
f1985a33
Commit
f1985a33
authored
Nov 12, 2018
by
Vít Kabele
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Marker package merged
parent
9da53e7b
Pipeline
#3377
passed with stages
in 2 minutes and 57 seconds
Changes
71
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
71 changed files
with
93 additions
and
130 deletions
+93
-130
.classpath
.classpath
+1
-0
build.properties
build.properties
+1
-0
build.xml
build.xml
+1
-0
disl/src/src-classparser/ch/usi/dag/disl/SnippetParser.java
disl/src/src-classparser/ch/usi/dag/disl/SnippetParser.java
+0
-2
disl/src/src-guard/ch/usi/dag/disl/ArgumentContextImpl.java
disl/src/src-guard/ch/usi/dag/disl/ArgumentContextImpl.java
+0
-1
disl/src/src-guard/ch/usi/dag/disl/GuardHelper.java
disl/src/src-guard/ch/usi/dag/disl/GuardHelper.java
+0
-1
disl/src/src-main/ch/usi/dag/disl/DiSL.java
disl/src/src-main/ch/usi/dag/disl/DiSL.java
+0
-4
disl/src/src-marker/ch/usi/dag/disl/AbstractDWRMarker.java
disl/src/src-marker/ch/usi/dag/disl/AbstractDWRMarker.java
+1
-1
disl/src/src-marker/ch/usi/dag/disl/AbstractInsnMarker.java
disl/src/src-marker/ch/usi/dag/disl/AbstractInsnMarker.java
+1
-1
disl/src/src-marker/ch/usi/dag/disl/AbstractMarker.java
disl/src/src-marker/ch/usi/dag/disl/AbstractMarker.java
+1
-4
disl/src/src-marker/ch/usi/dag/disl/AfterInitBodyMarker.java
disl/src/src-marker/ch/usi/dag/disl/AfterInitBodyMarker.java
+1
-3
disl/src/src-marker/ch/usi/dag/disl/BasicBlockMarker.java
disl/src/src-marker/ch/usi/dag/disl/BasicBlockMarker.java
+1
-2
disl/src/src-marker/ch/usi/dag/disl/BodyMarker.java
disl/src/src-marker/ch/usi/dag/disl/BodyMarker.java
+1
-2
disl/src/src-marker/ch/usi/dag/disl/BytecodeMarker.java
disl/src/src-marker/ch/usi/dag/disl/BytecodeMarker.java
+1
-3
disl/src/src-marker/ch/usi/dag/disl/EmptyMarker.java
disl/src/src-marker/ch/usi/dag/disl/EmptyMarker.java
+1
-1
disl/src/src-marker/ch/usi/dag/disl/ExceptionHandlerMarker.java
...rc/src-marker/ch/usi/dag/disl/ExceptionHandlerMarker.java
+2
-2
disl/src/src-marker/ch/usi/dag/disl/InsnNodeMarker.java
disl/src/src-marker/ch/usi/dag/disl/InsnNodeMarker.java
+1
-2
disl/src/src-marker/ch/usi/dag/disl/Marker.java
disl/src/src-marker/ch/usi/dag/disl/Marker.java
+15
-18
disl/src/src-marker/ch/usi/dag/disl/NewObjMarker.java
disl/src/src-marker/ch/usi/dag/disl/NewObjMarker.java
+2
-2
disl/src/src-marker/ch/usi/dag/disl/Parameter.java
disl/src/src-marker/ch/usi/dag/disl/Parameter.java
+1
-1
disl/src/src-marker/ch/usi/dag/disl/PreciseBasicBlockMarker.java
...c/src-marker/ch/usi/dag/disl/PreciseBasicBlockMarker.java
+1
-1
disl/src/src-marker/ch/usi/dag/disl/StrictBytecodeMarker.java
.../src/src-marker/ch/usi/dag/disl/StrictBytecodeMarker.java
+1
-3
disl/src/src-marker/ch/usi/dag/disl/TryClauseMarker.java
disl/src/src-marker/ch/usi/dag/disl/TryClauseMarker.java
+1
-1
disl/src/src-processor/ch/usi/dag/disl/PIResolver.java
disl/src/src-processor/ch/usi/dag/disl/PIResolver.java
+1
-3
disl/src/src-processor/ch/usi/dag/disl/ProcGenerator.java
disl/src/src-processor/ch/usi/dag/disl/ProcGenerator.java
+2
-10
disl/src/src-processor/ch/usi/dag/disl/ProcInstance.java
disl/src/src-processor/ch/usi/dag/disl/ProcInstance.java
+1
-1
disl/src/src-processor/ch/usi/dag/disl/ProcMethodInstance.java
...src/src-processor/ch/usi/dag/disl/ProcMethodInstance.java
+1
-1
disl/src/src-snippet/ch/usi/dag/disl/Snippet.java
disl/src/src-snippet/ch/usi/dag/disl/Snippet.java
+0
-1
disl/src/src-snippet/ch/usi/dag/disl/SnippetUnprocessedCode.java
...c/src-snippet/ch/usi/dag/disl/SnippetUnprocessedCode.java
+0
-2
disl/src/src-staticcontext/ch/usi/dag/disl/FieldAccessStaticContext.java
...aticcontext/ch/usi/dag/disl/FieldAccessStaticContext.java
+0
-2
disl/src/src-staticcontext/ch/usi/dag/disl/InvocationStaticContext.java
...taticcontext/ch/usi/dag/disl/InvocationStaticContext.java
+0
-2
src-disl/ch/usi/dag/disl/annotation/After.java
src-disl/ch/usi/dag/disl/annotation/After.java
+2
-2
src-disl/ch/usi/dag/disl/annotation/AfterReturning.java
src-disl/ch/usi/dag/disl/annotation/AfterReturning.java
+2
-2
src-disl/ch/usi/dag/disl/annotation/AfterThrowing.java
src-disl/ch/usi/dag/disl/annotation/AfterThrowing.java
+2
-2
src-disl/ch/usi/dag/disl/annotation/Before.java
src-disl/ch/usi/dag/disl/annotation/Before.java
+2
-2
src-disl/ch/usi/dag/disl/weaver/Weaver.java
src-disl/ch/usi/dag/disl/weaver/Weaver.java
+1
-1
src-disl/ch/usi/dag/disl/weaver/WeavingCode.java
src-disl/ch/usi/dag/disl/weaver/WeavingCode.java
+3
-3
src-test/ch/usi/dag/disl/test/suite/after/instr/DiSLClass.java
...est/ch/usi/dag/disl/test/suite/after/instr/DiSLClass.java
+1
-1
src-test/ch/usi/dag/disl/test/suite/after2/instr/DiSLClass.java
...st/ch/usi/dag/disl/test/suite/after2/instr/DiSLClass.java
+1
-1
src-test/ch/usi/dag/disl/test/suite/after3/instr/DiSLClass.java
...st/ch/usi/dag/disl/test/suite/after3/instr/DiSLClass.java
+1
-1
src-test/ch/usi/dag/disl/test/suite/afterinit1/app/TargetClass.java
...h/usi/dag/disl/test/suite/afterinit1/app/TargetClass.java
+1
-1
src-test/ch/usi/dag/disl/test/suite/afterinit1/instr/DiSLClass.java
...h/usi/dag/disl/test/suite/afterinit1/instr/DiSLClass.java
+1
-1
src-test/ch/usi/dag/disl/test/suite/afterinit2/app/TargetClass.java
...h/usi/dag/disl/test/suite/afterinit2/app/TargetClass.java
+1
-1
src-test/ch/usi/dag/disl/test/suite/afterinit2/instr/DiSLClass.java
...h/usi/dag/disl/test/suite/afterinit2/instr/DiSLClass.java
+1
-1
src-test/ch/usi/dag/disl/test/suite/args/instr/DiSLClass.java
...test/ch/usi/dag/disl/test/suite/args/instr/DiSLClass.java
+1
-1
src-test/ch/usi/dag/disl/test/suite/bbmarker/instr/DiSLClass.java
.../ch/usi/dag/disl/test/suite/bbmarker/instr/DiSLClass.java
+2
-2
src-test/ch/usi/dag/disl/test/suite/bodymarker/instr/DiSLClass.java
...h/usi/dag/disl/test/suite/bodymarker/instr/DiSLClass.java
+1
-1
src-test/ch/usi/dag/disl/test/suite/bytecodemarker/instr/DiSLClass.java
...i/dag/disl/test/suite/bytecodemarker/instr/DiSLClass.java
+1
-1
src-test/ch/usi/dag/disl/test/suite/cflow/instr/DiSLClass.java
...est/ch/usi/dag/disl/test/suite/cflow/instr/DiSLClass.java
+1
-1
src-test/ch/usi/dag/disl/test/suite/classinfo/instr/DiSLClass.java
...ch/usi/dag/disl/test/suite/classinfo/instr/DiSLClass.java
+1
-1
src-test/ch/usi/dag/disl/test/suite/dispatch/instr/DiSLClass.java
.../ch/usi/dag/disl/test/suite/dispatch/instr/DiSLClass.java
+2
-2
src-test/ch/usi/dag/disl/test/suite/dispatch2/instr/DiSLClass.java
...ch/usi/dag/disl/test/suite/dispatch2/instr/DiSLClass.java
+1
-1
src-test/ch/usi/dag/disl/test/suite/dispatchmp/instr/DiSLClass.java
...h/usi/dag/disl/test/suite/dispatchmp/instr/DiSLClass.java
+1
-1
src-test/ch/usi/dag/disl/test/suite/dynamiccontext/instr/DiSLClass.java
...i/dag/disl/test/suite/dynamiccontext/instr/DiSLClass.java
+2
-2
src-test/ch/usi/dag/disl/test/suite/dynamicinfo/instr/DiSLClass.java
.../usi/dag/disl/test/suite/dynamicinfo/instr/DiSLClass.java
+2
-2
src-test/ch/usi/dag/disl/test/suite/exception/instr/DiSLClass.java
...ch/usi/dag/disl/test/suite/exception/instr/DiSLClass.java
+2
-2
src-test/ch/usi/dag/disl/test/suite/exceptionhandler/instr/DiSLClass.java
...dag/disl/test/suite/exceptionhandler/instr/DiSLClass.java
+1
-1
src-test/ch/usi/dag/disl/test/suite/gettarget/instr/DiSLClass.java
...ch/usi/dag/disl/test/suite/gettarget/instr/DiSLClass.java
+1
-1
src-test/ch/usi/dag/disl/test/suite/guard/instr/DiSLClass.java
...est/ch/usi/dag/disl/test/suite/guard/instr/DiSLClass.java
+2
-2
src-test/ch/usi/dag/disl/test/suite/loop/instr/DiSLClass.java
...test/ch/usi/dag/disl/test/suite/loop/instr/DiSLClass.java
+1
-1
src-test/ch/usi/dag/disl/test/suite/newobjmarker/instr/DiSLClass.java
...usi/dag/disl/test/suite/newobjmarker/instr/DiSLClass.java
+1
-1
src-test/ch/usi/dag/disl/test/suite/pe/instr/DiSLClass.java
src-test/ch/usi/dag/disl/test/suite/pe/instr/DiSLClass.java
+1
-1
src-test/ch/usi/dag/disl/test/suite/pe2/instr/DiSLClass.java
src-test/ch/usi/dag/disl/test/suite/pe2/instr/DiSLClass.java
+1
-1
src-test/ch/usi/dag/disl/test/suite/pe3/instr/DiSLClass.java
src-test/ch/usi/dag/disl/test/suite/pe3/instr/DiSLClass.java
+1
-1
src-test/ch/usi/dag/disl/test/suite/processor/instr/DiSLClass.java
...ch/usi/dag/disl/test/suite/processor/instr/DiSLClass.java
+2
-2
src-test/ch/usi/dag/disl/test/suite/scope/instr/DiSLClass.java
...est/ch/usi/dag/disl/test/suite/scope/instr/DiSLClass.java
+1
-1
src-test/ch/usi/dag/disl/test/suite/stack/instr/DiSLClass.java
...est/ch/usi/dag/disl/test/suite/stack/instr/DiSLClass.java
+1
-1
src-test/ch/usi/dag/disl/test/suite/staticinfo/instr/DiSLClass.java
...h/usi/dag/disl/test/suite/staticinfo/instr/DiSLClass.java
+1
-1
src-test/ch/usi/dag/disl/test/suite/syntheticlocal/instr/DiSLClass.java
...i/dag/disl/test/suite/syntheticlocal/instr/DiSLClass.java
+1
-1
src-test/ch/usi/dag/disl/test/suite/threadlocal/instr/DiSLClass.java
.../usi/dag/disl/test/suite/threadlocal/instr/DiSLClass.java
+1
-1
src-test/ch/usi/dag/disl/test/suite/tryclause/instr/DiSLClass.java
...ch/usi/dag/disl/test/suite/tryclause/instr/DiSLClass.java
+1
-1
No files found.
.classpath
View file @
f1985a33
...
...
@@ -19,6 +19,7 @@
<classpathentry
kind=
"src"
path=
"disl-server/src"
/>
<classpathentry
kind=
"src"
path=
"disl/src/src-staticcontext"
/>
<classpathentry
kind=
"src"
path=
"disl/src/src-staticcontext-uid"
/>
<classpathentry
kind=
"src"
path=
"disl/src/src-marker"
/>
<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"
/>
...
...
build.properties
View file @
f1985a33
...
...
@@ -18,6 +18,7 @@ src.disl.guard=src-guard
src.disl.localvar
=
src-localvar
src.disl.exception
=
src-exception
src.disl.scope
=
src-scope
src.disl.marker
=
src-marker
src.disl.staticcontext
=
src-staticcontext
src.disl.staticcontext-uid
=
src-staticcontext-uid
src.disl.bypass
=
src-disl-bypass
...
...
build.xml
View file @
f1985a33
...
...
@@ -484,6 +484,7 @@
<src
path=
"${src.disl.prefix}/src/${src.disl.processor}"
/>
<src
path=
"${src.disl.prefix}/src/${src.disl.guard}"
/>
<src
path=
"${src.disl.prefix}/src/${src.disl.scope}"
/>
<src
path=
"${src.disl.prefix}/src/${src.disl.marker}"
/>
<src
path=
"${src.disl.prefix}/src/${src.disl.localvar}"
/>
<src
path=
"${src.disl.prefix}/src/${src.disl.staticcontext}"
/>
<src
path=
"${src.disl.prefix}/src/${src.disl.staticcontext-uid}"
/>
...
...
disl/src/src-classparser/ch/usi/dag/disl/SnippetParser.java
View file @
f1985a33
...
...
@@ -8,8 +8,6 @@ import org.objectweb.asm.Type;
import
org.objectweb.asm.tree.AnnotationNode
;
import
org.objectweb.asm.tree.MethodNode
;
import
ch.usi.dag.disl.marker.Marker
;
import
ch.usi.dag.disl.marker.Parameter
;
import
ch.usi.dag.util.logging.Logger
;
...
...
disl/src/src-guard/ch/usi/dag/disl/ArgumentContextImpl.java
View file @
f1985a33
package
ch.usi.dag.disl
;
import
ch.usi.dag.disl.processor.generator.ProcMethodInstance
;
import
ch.usi.dag.disl.processorcontext.ArgumentContext
;
// used for guard invocation - reduced visibility
...
...
disl/src/src-guard/ch/usi/dag/disl/GuardHelper.java
View file @
f1985a33
...
...
@@ -7,7 +7,6 @@ import java.util.HashSet;
import
java.util.Set
;
import
ch.usi.dag.disl.guardcontext.GuardContext
;
import
ch.usi.dag.disl.processor.generator.ProcMethodInstance
;
import
ch.usi.dag.disl.processorcontext.ArgumentContext
;
...
...
disl/src/src-main/ch/usi/dag/disl/DiSL.java
View file @
f1985a33
package
ch.usi.dag.disl
;
import
ch.usi.dag.disl.processor.generator.PIResolver
;
import
ch.usi.dag.disl.processor.generator.ProcGenerator
;
import
ch.usi.dag.disl.processor.generator.ProcInstance
;
import
ch.usi.dag.disl.processor.generator.ProcMethodInstance
;
import
ch.usi.dag.disl.weaver.Weaver
;
import
ch.usi.dag.util.asm.ClassNodeHelper
;
import
ch.usi.dag.util.logging.Logger
;
...
...
src-disl/ch/usi/dag/disl/marker
/AbstractDWRMarker.java
→
disl/src/src-marker/ch/usi/dag/disl
/AbstractDWRMarker.java
View file @
f1985a33
package
ch.usi.dag.disl
.marker
;
package
ch.usi.dag.disl
;
import
java.util.List
;
...
...
src-disl/ch/usi/dag/disl/marker
/AbstractInsnMarker.java
→
disl/src/src-marker/ch/usi/dag/disl
/AbstractInsnMarker.java
View file @
f1985a33
package
ch.usi.dag.disl
.marker
;
package
ch.usi.dag.disl
;
import
java.util.LinkedList
;
import
java.util.List
;
...
...
src-disl/ch/usi/dag/disl/marker
/AbstractMarker.java
→
disl/src/src-marker/ch/usi/dag/disl
/AbstractMarker.java
View file @
f1985a33
package
ch.usi.dag.disl
.marker
;
package
ch.usi.dag.disl
;
import
java.util.HashSet
;
import
java.util.LinkedList
;
...
...
@@ -11,10 +11,7 @@ import org.objectweb.asm.tree.LabelNode;
import
org.objectweb.asm.tree.MethodNode
;
import
org.objectweb.asm.tree.TryCatchBlockNode
;
import
ch.usi.dag.disl.MarkerException
;
import
ch.usi.dag.disl.Shadow
;
import
ch.usi.dag.disl.Shadow.WeavingRegion
;
import
ch.usi.dag.disl.Snippet
;
/**
...
...
src-disl/ch/usi/dag/disl/marker
/AfterInitBodyMarker.java
→
disl/src/src-marker/ch/usi/dag/disl
/AfterInitBodyMarker.java
View file @
f1985a33
package
ch.usi.dag.disl
.marker
;
package
ch.usi.dag.disl
;
import
java.util.LinkedList
;
import
java.util.List
;
...
...
@@ -12,9 +12,7 @@ import org.objectweb.asm.tree.MethodNode;
import
ch.usi.dag.disl.annotation.Before
;
import
ch.usi.dag.disl.Shadow.WeavingRegion
;
import
ch.usi.dag.disl.AsmHelper
;
import
ch.usi.dag.disl.AsmHelper.Insns
;
import
ch.usi.dag.disl.JavaNames
;
/**
...
...
src-disl/ch/usi/dag/disl/marker
/BasicBlockMarker.java
→
disl/src/src-marker/ch/usi/dag/disl
/BasicBlockMarker.java
View file @
f1985a33
package
ch.usi.dag.disl
.marker
;
package
ch.usi.dag.disl
;
import
java.util.LinkedList
;
import
java.util.List
;
...
...
@@ -7,7 +7,6 @@ import org.objectweb.asm.tree.AbstractInsnNode;
import
org.objectweb.asm.tree.MethodNode
;
import
ch.usi.dag.disl.AsmHelper.Insns
;
import
ch.usi.dag.disl.BasicBlockCalc
;
/**
...
...
src-disl/ch/usi/dag/disl/marker
/BodyMarker.java
→
disl/src/src-marker/ch/usi/dag/disl
/BodyMarker.java
View file @
f1985a33
package
ch.usi.dag.disl
.marker
;
package
ch.usi.dag.disl
;
import
java.util.LinkedList
;
import
java.util.List
;
...
...
@@ -7,7 +7,6 @@ import org.objectweb.asm.tree.AbstractInsnNode;
import
org.objectweb.asm.tree.MethodNode
;
import
ch.usi.dag.disl.Shadow.WeavingRegion
;
import
ch.usi.dag.disl.AsmHelper
;
import
ch.usi.dag.disl.AsmHelper.Insns
;
...
...
src-disl/ch/usi/dag/disl/marker
/BytecodeMarker.java
→
disl/src/src-marker/ch/usi/dag/disl
/BytecodeMarker.java
View file @
f1985a33
package
ch.usi.dag.disl
.marker
;
package
ch.usi.dag.disl
;
import
java.util.HashSet
;
import
java.util.LinkedList
;
...
...
@@ -8,9 +8,7 @@ import java.util.Set;
import
org.objectweb.asm.tree.AbstractInsnNode
;
import
org.objectweb.asm.tree.MethodNode
;
import
ch.usi.dag.disl.MarkerException
;
import
ch.usi.dag.disl.AsmHelper.Insns
;
import
ch.usi.dag.disl.AsmOpcodes
;
/**
...
...
src-disl/ch/usi/dag/disl/marker
/EmptyMarker.java
→
disl/src/src-marker/ch/usi/dag/disl
/EmptyMarker.java
View file @
f1985a33
package
ch.usi.dag.disl
.marker
;
package
ch.usi.dag.disl
;
import
java.util.LinkedList
;
import
java.util.List
;
...
...
src-disl/ch/usi/dag/disl/marker
/ExceptionHandlerMarker.java
→
disl/src/src-marker/ch/usi/dag/disl
/ExceptionHandlerMarker.java
View file @
f1985a33
package
ch.usi.dag.disl
.marker
;
package
ch.usi.dag.disl
;
import
java.util.LinkedList
;
import
java.util.List
;
...
...
@@ -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.CtrlFlowGraph
;
/**
* Marks an exception handler.
...
...
src-disl/ch/usi/dag/disl/marker
/InsnNodeMarker.java
→
disl/src/src-marker/ch/usi/dag/disl
/InsnNodeMarker.java
View file @
f1985a33
package
ch.usi.dag.disl
.marker
;
package
ch.usi.dag.disl
;
import
java.util.HashSet
;
import
java.util.LinkedList
;
...
...
@@ -8,7 +8,6 @@ import java.util.Set;
import
org.objectweb.asm.tree.AbstractInsnNode
;
import
org.objectweb.asm.tree.MethodNode
;
import
ch.usi.dag.disl.MarkerException
;
import
ch.usi.dag.disl.AsmHelper.Insns
;
/**
...
...
src-disl/ch/usi/dag/disl/marker
/Marker.java
→
disl/src/src-marker/ch/usi/dag/disl
/Marker.java
View file @
f1985a33
package
ch.usi.dag.disl
.marker
;
package
ch.usi.dag.disl
;
import
java.util.List
;
import
org.objectweb.asm.tree.ClassNode
;
import
org.objectweb.asm.tree.MethodNode
;
import
ch.usi.dag.disl.MarkerException
;
import
ch.usi.dag.disl.Shadow
;
import
ch.usi.dag.disl.Snippet
;
/**
* <p>
...
...
@@ -19,37 +16,37 @@ import ch.usi.dag.disl.Snippet;
* scoped methods.
* <ul>
* <li>
* {@link
ch.usi.dag.disl.marker.
AfterInitBodyMarker
* {@link AfterInitBodyMarker
* AfterInitBodyMarker}</li>
* <li>
* {@link
ch.usi.dag.disl.marker.
BasicBlockMarker
* {@link BasicBlockMarker
* BasicBlockMarker}</li>
* <li>
* {@link
ch.usi.dag.disl.marker.
BodyMarker
* {@link BodyMarker
* BodyMarker}</li>
* <li>
* {@link
ch.usi.dag.disl.marker.
BytecodeMarker
* {@link BytecodeMarker
* BytcodeMarker}</li>
* <li>
* {@link
ch.usi.dag.disl.marker.
EmptyMarker
* {@link EmptyMarker
* EmptyMarker}</li>
* <li>
* {@link
ch.usi.dag.disl.marker.
ExceptionHandlerMarker
* {@link ExceptionHandlerMarker
* ExceptionHandlerMarker}</li>
* <li>
* {@link
ch.usi.dag.disl.marker.
InsnNodeMarker
* {@link InsnNodeMarker
* InsnNodeMarker - experimental}</li>
* <li>
* {@link
ch.usi.dag.disl.marker.
NewObjMarker
* {@link NewObjMarker
* NewObjMarker - experimental}</li>
* <li>
* {@link
ch.usi.dag.disl.marker.
PreciseBasicBlockMarker
* {@link PreciseBasicBlockMarker
* PreciseBasicBlockMarker}</li>
* <li>
* {@link
ch.usi.dag.disl.marker.
StrictBytecodeMarker
* {@link StrictBytecodeMarker
* StrictBytecodeMarker}</li>
* <li>
* {@link
ch.usi.dag.disl.marker.
TryClauseMarker
* {@link TryClauseMarker
* TryClauseMarker}</li>
* </ul>
*
...
...
@@ -58,13 +55,13 @@ import ch.usi.dag.disl.Snippet;
* be implemented directly or following abstract markers might be used.
* <ul>
* <li>
* {@link
ch.usi.dag.disl.marker.
AbstractMarker
* {@link AbstractMarker
* AbstractMarker}</li>
* <li>
* {@link
ch.usi.dag.disl.marker.
AbstractDWRMarker
* {@link AbstractDWRMarker
* AbstractDWRMarker}</li>
* <li>
* {@link
ch.usi.dag.disl.marker.
AbstractInsnMarker
* {@link AbstractInsnMarker
* AbstractInsnMarker}</li>
* </ul>
*/
...
...
src-disl/ch/usi/dag/disl/marker
/NewObjMarker.java
→
disl/src/src-marker/ch/usi/dag/disl
/NewObjMarker.java
View file @
f1985a33
package
ch.usi.dag.disl
.marker
;
package
ch.usi.dag.disl
;
import
java.util.LinkedList
;
import
java.util.List
;
...
...
@@ -9,7 +9,7 @@ import org.objectweb.asm.tree.MethodInsnNode;
import
org.objectweb.asm.tree.MethodNode
;
import
ch.usi.dag.disl.AsmHelper.Insns
;
import
ch.usi.dag.disl.JavaNames
;
/**
* Marks object creation.
...
...
src-disl/ch/usi/dag/disl/marker
/Parameter.java
→
disl/src/src-marker/ch/usi/dag/disl
/Parameter.java
View file @
f1985a33
package
ch.usi.dag.disl
.marker
;
package
ch.usi.dag.disl
;
/**
* Used for marker parameter parsing.
...
...
src-disl/ch/usi/dag/disl/marker
/PreciseBasicBlockMarker.java
→
disl/src/src-marker/ch/usi/dag/disl
/PreciseBasicBlockMarker.java
View file @
f1985a33
package
ch.usi.dag.disl
.marker
;
package
ch.usi.dag.disl
;
/**
* <p>
...
...
src-disl/ch/usi/dag/disl/marker
/StrictBytecodeMarker.java
→
disl/src/src-marker/ch/usi/dag/disl
/StrictBytecodeMarker.java
View file @
f1985a33
package
ch.usi.dag.disl
.marker
;
package
ch.usi.dag.disl
;
import
java.util.HashSet
;
import
java.util.LinkedList
;
...
...
@@ -8,8 +8,6 @@ import java.util.Set;
import
org.objectweb.asm.tree.AbstractInsnNode
;
import
org.objectweb.asm.tree.MethodNode
;
import
ch.usi.dag.disl.MarkerException
;
import
ch.usi.dag.disl.AsmOpcodes
;
/**
* <p>
...
...
src-disl/ch/usi/dag/disl/marker
/TryClauseMarker.java
→
disl/src/src-marker/ch/usi/dag/disl
/TryClauseMarker.java
View file @
f1985a33
package
ch.usi.dag.disl
.marker
;
package
ch.usi.dag.disl
;
import
java.util.LinkedList
;
import
java.util.List
;
...
...
src-disl/ch/usi/dag/disl/processor/generator
/PIResolver.java
→
disl/src/src-processor/ch/usi/dag/disl
/PIResolver.java
View file @
f1985a33
package
ch.usi.dag.disl
.processor.generator
;
package
ch.usi.dag.disl
;
import
java.util.Collection
;
import
java.util.HashMap
;
import
java.util.Map
;
import
ch.usi.dag.disl.Shadow
;
public
class
PIResolver
{
...
...
src-disl/ch/usi/dag/disl/processor/generator
/ProcGenerator.java
→
disl/src/src-processor/ch/usi/dag/disl
/ProcGenerator.java
View file @
f1985a33
package
ch.usi.dag.disl
.processor.generator
;
package
ch.usi.dag.disl
;
import
java.util.HashMap
;
import
java.util.LinkedList
;
...
...
@@ -9,16 +9,8 @@ import org.objectweb.asm.Type;
import
org.objectweb.asm.tree.AbstractInsnNode
;
import
org.objectweb.asm.tree.MethodInsnNode
;
import
ch.usi.dag.disl.DiSLFatalException
;
import
ch.usi.dag.disl.ProcessorException
;
import
ch.usi.dag.disl.GuardHelper
;
import
ch.usi.dag.disl.ArgProcessor
;
import
ch.usi.dag.disl.ArgProcessorKind
;
import
ch.usi.dag.disl.ArgProcessorMethod
;
import
ch.usi.dag.disl.processorcontext.ArgumentProcessorMode
;
import
ch.usi.dag.disl.ProcInvocation
;
import
ch.usi.dag.disl.Shadow
;
import
ch.usi.dag.disl.Snippet
;
public
class
ProcGenerator
{
...
...
src-disl/ch/usi/dag/disl/processor/generator
/ProcInstance.java
→
disl/src/src-processor/ch/usi/dag/disl
/ProcInstance.java
View file @
f1985a33
package
ch.usi.dag.disl
.processor.generator
;
package
ch.usi.dag.disl
;
import
java.util.List
;
...
...
src-disl/ch/usi/dag/disl/processor/generator
/ProcMethodInstance.java
→
disl/src/src-processor/ch/usi/dag/disl
/ProcMethodInstance.java
View file @
f1985a33
package
ch.usi.dag.disl
.processor.generator
;
package
ch.usi.dag.disl
;
import
org.objectweb.asm.Type
;
...
...
disl/src/src-snippet/ch/usi/dag/disl/Snippet.java
View file @
f1985a33
...
...
@@ -12,7 +12,6 @@ import org.objectweb.asm.tree.ClassNode;
import
org.objectweb.asm.tree.MethodNode
;
import
ch.usi.dag.disl.DiSL.CodeOption
;
import
ch.usi.dag.disl.marker.Marker
;
/**
...
...
disl/src/src-snippet/ch/usi/dag/disl/SnippetUnprocessedCode.java
View file @
f1985a33
...
...
@@ -16,8 +16,6 @@ import org.objectweb.asm.tree.MethodInsnNode;
import
org.objectweb.asm.tree.MethodNode
;
import
ch.usi.dag.disl.DiSL.CodeOption
;
import
ch.usi.dag.disl.marker.BytecodeMarker
;
import
ch.usi.dag.disl.marker.Marker
;
import
ch.usi.dag.disl.processorcontext.ArgumentProcessorContext
;
import
ch.usi.dag.disl.processorcontext.ArgumentProcessorMode
;
import
ch.usi.dag.disl.AsmHelper.Insns
;
...
...
disl/src/src-staticcontext/ch/usi/dag/disl/FieldAccessStaticContext.java
View file @
f1985a33
...
...
@@ -2,8 +2,6 @@ package ch.usi.dag.disl;
import
org.objectweb.asm.tree.FieldInsnNode
;
import
ch.usi.dag.disl.marker.BytecodeMarker
;
/**
* Represents a field access static context. Provides field's name and type
...
...
disl/src/src-staticcontext/ch/usi/dag/disl/InvocationStaticContext.java
View file @
f1985a33
...
...
@@ -3,8 +3,6 @@ package ch.usi.dag.disl;
import
org.objectweb.asm.Type
;
import
org.objectweb.asm.tree.MethodInsnNode
;
import
ch.usi.dag.disl.marker.BytecodeMarker
;
/**
* Represents a static context for method invocations. Provides information
...
...
src-disl/ch/usi/dag/disl/annotation/After.java
View file @
f1985a33
...
...
@@ -6,7 +6,7 @@ import java.lang.annotation.Target;
import
ch.usi.dag.disl.classcontext.ClassContext
;
import
ch.usi.dag.disl.dynamiccontext.DynamicContext
;
import
ch.usi.dag.disl.
marker.
Marker
;
import
ch.usi.dag.disl.Marker
;
import
ch.usi.dag.disl.processorcontext.ArgumentProcessorContext
;
import
ch.usi.dag.disl.StaticContext
;
...
...
@@ -62,7 +62,7 @@ public @interface After {
* Selects the marker class. A marker determines the region of code within a
* method where to apply the snippet.
*
* @see
ch.usi.dag.disl.marker.
Marker Implementation details
* @see Marker Implementation details
*/
Class
<?
extends
Marker
>
marker
();
...
...
src-disl/ch/usi/dag/disl/annotation/AfterReturning.java
View file @
f1985a33
...
...
@@ -6,7 +6,7 @@ import java.lang.annotation.Target;
import
ch.usi.dag.disl.classcontext.ClassContext
;
import
ch.usi.dag.disl.dynamiccontext.DynamicContext
;
import
ch.usi.dag.disl.
marker.
Marker
;
import
ch.usi.dag.disl.Marker
;
import
ch.usi.dag.disl.processorcontext.ArgumentProcessorContext
;
import
ch.usi.dag.disl.StaticContext
;
...
...
@@ -62,7 +62,7 @@ public @interface AfterReturning {
* Selects the marker class. A marker determines the region of code within a
* method where to apply the snippet.
*
* @see
ch.usi.dag.disl.marker.
Marker Implementation details
* @see Marker Implementation details
*/
Class
<?
extends
Marker
>
marker
();
...
...
src-disl/ch/usi/dag/disl/annotation/AfterThrowing.java
View file @
f1985a33
...
...
@@ -6,7 +6,7 @@ import java.lang.annotation.Target;
import
ch.usi.dag.disl.classcontext.ClassContext
;
import
ch.usi.dag.disl.dynamiccontext.DynamicContext
;
import
ch.usi.dag.disl.
marker.
Marker
;
import
ch.usi.dag.disl.Marker
;
import
ch.usi.dag.disl.processorcontext.ArgumentProcessorContext
;
import
ch.usi.dag.disl.StaticContext
;
...
...
@@ -61,7 +61,7 @@ public @interface AfterThrowing {
* Selects the marker class. A marker determines the region of code within a
* method where to apply the snippet.
*
* @see
ch.usi.dag.disl.marker.
Marker Implementation details
* @see Marker Implementation details
*/
Class
<?
extends
Marker
>
marker
();
...
...
src-disl/ch/usi/dag/disl/annotation/Before.java
View file @
f1985a33
...
...
@@ -6,7 +6,7 @@ import java.lang.annotation.Target;
import
ch.usi.dag.disl.classcontext.ClassContext
;
import
ch.usi.dag.disl.dynamiccontext.DynamicContext
;
import
ch.usi.dag.disl.
marker.
Marker
;
import
ch.usi.dag.disl.Marker
;
import
ch.usi.dag.disl.processorcontext.ArgumentProcessorContext
;
import
ch.usi.dag.disl.StaticContext
;
...
...
@@ -61,7 +61,7 @@ public @interface Before {
* Selects the marker class. A marker determines the region of code within a
* method where to apply the snippet.
*
* @see
ch.usi.dag.disl.marker.
Marker Implementation details
* @see Marker Implementation details
*/
Class
<?
extends
Marker
>
marker
();
...
...
src-disl/ch/usi/dag/disl/weaver/Weaver.java
View file @
f1985a33
...
...
@@ -23,7 +23,7 @@ import ch.usi.dag.disl.annotation.SyntheticLocal.Initialize;
import
ch.usi.dag.disl.InvalidContextUsageException
;
import
ch.usi.dag.disl.SyntheticLocalVar
;
import
ch.usi.dag.disl.ThreadLocalVar
;
import
ch.usi.dag.disl.
processor.generator.
PIResolver
;
import
ch.usi.dag.disl.PIResolver
;
import
ch.usi.dag.disl.Shadow
;
import
ch.usi.dag.disl.Shadow.WeavingRegion
;
import
ch.usi.dag.disl.Snippet
;
...
...
src-disl/ch/usi/dag/disl/weaver/WeavingCode.java
View file @
f1985a33
...
...
@@ -24,9 +24,9 @@ import ch.usi.dag.disl.Code;
import
ch.usi.dag.disl.dynamiccontext.DynamicContext
;
import
ch.usi.dag.disl.DiSLFatalException
;
import
ch.usi.dag.disl.InvalidContextUsageException
;
import
ch.usi.dag.disl.
processor.generator.
PIResolver
;
import
ch.usi.dag.disl.
processor.generator.
ProcInstance
;
import
ch.usi.dag.disl.
processor.generator.
ProcMethodInstance
;
import
ch.usi.dag.disl.PIResolver
;
import
ch.usi.dag.disl.ProcInstance
;
import
ch.usi.dag.disl.ProcMethodInstance
;
import
ch.usi.dag.disl.processorcontext.ArgumentContext
;
import
ch.usi.dag.disl.processorcontext.ArgumentProcessorContext
;
import
ch.usi.dag.disl.processorcontext.ArgumentProcessorMode
;
...
...
src-test/ch/usi/dag/disl/test/suite/after/instr/DiSLClass.java
View file @
f1985a33
...
...
@@ -2,7 +2,7 @@ package ch.usi.dag.disl.test.suite.after.instr;
import
ch.usi.dag.disl.annotation.After
;
import
ch.usi.dag.disl.annotation.AfterThrowing
;
import
ch.usi.dag.disl.
marker.
BodyMarker
;
import
ch.usi.dag.disl.BodyMarker
;
public
class
DiSLClass
{
...
...
src-test/ch/usi/dag/disl/test/suite/after2/instr/DiSLClass.java
View file @
f1985a33
...
...
@@ -5,7 +5,7 @@ import java.util.Stack;
import
ch.usi.dag.disl.annotation.After
;
import
ch.usi.dag.disl.annotation.Before
;
import
ch.usi.dag.disl.annotation.ThreadLocal
;
import
ch.usi.dag.disl.
marker.
BodyMarker
;
import
ch.usi.dag.disl.BodyMarker
;
import
ch.usi.dag.disl.RandomMethodUid
;
import
ch.usi.dag.disl.test.suite.after2.instr.runtime.Analysis
;
...
...
src-test/ch/usi/dag/disl/test/suite/after3/instr/DiSLClass.java
View file @
f1985a33
...
...
@@ -2,7 +2,7 @@ package ch.usi.dag.disl.test.suite.after3.instr;
import
ch.usi.dag.disl.annotation.AfterReturning
;
import
ch.usi.dag.disl.annotation.AfterThrowing
;
import
ch.usi.dag.disl.
marker.
BodyMarker
;
import
ch.usi.dag.disl.BodyMarker
;
import
ch.usi.dag.disl.MethodStaticContext
;
public
class
DiSLClass
{
...
...
src-test/ch/usi/dag/disl/test/suite/afterinit1/app/TargetClass.java
View file @
f1985a33
package
ch.usi.dag.disl.test.suite.afterinit1.app
;
import
ch.usi.dag.disl.
marker.
AfterInitBodyMarker
;
import
ch.usi.dag.disl.AfterInitBodyMarker
;
/**
...
...
src-test/ch/usi/dag/disl/test/suite/afterinit1/instr/DiSLClass.java
View file @
f1985a33
...
...
@@ -2,7 +2,7 @@ package ch.usi.dag.disl.test.suite.afterinit1.instr;
import
ch.usi.dag.disl.annotation.After
;
import
ch.usi.dag.disl.annotation.Before
;
import
ch.usi.dag.disl.
marker.
AfterInitBodyMarker
;
import
ch.usi.dag.disl.AfterInitBodyMarker
;
public
class
DiSLClass
{
...
...
src-test/ch/usi/dag/disl/test/suite/afterinit2/app/TargetClass.java
View file @
f1985a33
...
...
@@ -2,7 +2,7 @@ package ch.usi.dag.disl.test.suite.afterinit2.app;
import
ch.usi.dag.disl.annotation.After
;
import
ch.usi.dag.disl.annotation.Before
;
import
ch.usi.dag.disl.
marker.
AfterInitBodyMarker
;
import
ch.usi.dag.disl.AfterInitBodyMarker
;
/**
...
...
src-test/ch/usi/dag/disl/test/suite/afterinit2/instr/DiSLClass.java
View file @
f1985a33
...
...
@@ -2,7 +2,7 @@ package ch.usi.dag.disl.test.suite.afterinit2.instr;
import
ch.usi.dag.disl.annotation.After
;
import
ch.usi.dag.disl.annotation.Before
;
import
ch.usi.dag.disl.
marker.
AfterInitBodyMarker
;
import
ch.usi.dag.disl.AfterInitBodyMarker
;
import
ch.usi.dag.disl.ClassStaticContext
;
import
ch.usi.dag.disl.MethodStaticContext
;
...
...
src-test/ch/usi/dag/disl/test/suite/args/instr/DiSLClass.java
View file @
f1985a33
package
ch.usi.dag.disl.test.suite.args.instr
;
import
ch.usi.dag.disl.annotation.AfterReturning
;
import
ch.usi.dag.disl.
marker.
BodyMarker
;
import
ch.usi.dag.disl.BodyMarker
;
import
ch.usi.dag.disl.processorcontext.ArgumentProcessorContext
;
import
ch.usi.dag.disl.processorcontext.ArgumentProcessorMode
;
import
ch.usi.dag.disl.MethodStaticContext
;
...