Merge pull request #2029 from MarcMil/use-ordinary-maps

Remove coffi
soot-oss · Nov 29, 2023 · cda8d92 · cda8d92
2 parents 8698b75 + d43252e
commit cda8d92
Show file tree

Hide file tree

Showing 606 changed files with 10,194 additions and 38,380 deletions.
diff --git a/doc/soot_options.html b/doc/soot_options.html
@@ -445,10 +445,6 @@ <H1><A NAME="description">DESCRIPTION</A></H1>
       <H1><A NAME="options">OPTIONS</A></H1>
       <H2><A name="section_1">General Options</A></H2>
       <table border="3">
-         <tr>
-            <td><tt>-coffi </tt><br></td>
-            <td colspan="2">Use the good old Coffi front end for parsing Java bytecode (instead of using ASM).</td>
-         </tr>
          <tr>
             <td><tt>-jasmin-backend </tt><br></td>
             <td colspan="2">Use the Jasmin back end for generating Java bytecode (instead of using ASM).</td>

diff --git a/eclipse/ca.mcgill.sable.soot/src/ca/mcgill/sable/soot/ui/PhaseOptionsDialog.java b/eclipse/ca.mcgill.sable.soot/src/ca/mcgill/sable/soot/ui/PhaseOptionsDialog.java
@@ -996,12 +996,6 @@ private boolean createNewConfig() {
 		String nextListToken;
 
 
-		boolRes = getGeneral_Optionscoffi_widget().getButton().getSelection();
-		defBoolRes = false;
-
-		if (boolRes != defBoolRes) {
-			getConfig().put(getGeneral_Optionscoffi_widget().getAlias(), new Boolean(boolRes));
-		}
 		boolRes = getGeneral_Optionsjasmin_backend_widget().getButton().getSelection();
 		defBoolRes = false;
 
@@ -4553,16 +4547,6 @@ protected SootOption getInitialInput() {
 
 
 
-	private BooleanOptionWidget General_Optionscoffi_widget;
-
-	private void setGeneral_Optionscoffi_widget(BooleanOptionWidget widget) {
-		General_Optionscoffi_widget = widget;
-	}
-
-	public BooleanOptionWidget getGeneral_Optionscoffi_widget() {
-		return General_Optionscoffi_widget;
-	}	
-
 	private BooleanOptionWidget General_Optionsjasmin_backend_widget;
 
 	private void setGeneral_Optionsjasmin_backend_widget(BooleanOptionWidget widget) {
@@ -8620,17 +8604,6 @@ private Composite General_OptionsCreate(Composite parent) {
 
 
 
-		defKey = ""+" "+""+" "+"coffi";
-		defKey = defKey.trim();
-
-		if (isInDefList(defKey)) {
-			defaultBool = getBoolDef(defKey);	
-		} else {
-			defaultBool = false;
-		}
-
-		setGeneral_Optionscoffi_widget(new BooleanOptionWidget(editGroupGeneral_Options, SWT.NONE, new OptionData("Coffi Frontend", "", "","coffi", "\n", defaultBool)));
-
 		defKey = ""+" "+""+" "+"jasmin-backend";
 		defKey = defKey.trim();
 

diff --git a/src/main/generated/jastadd/soot/JastAddJ/ASTNode$State.java b/src/main/generated/jastadd/soot/JastAddJ/ASTNode$State.java
@@ -12,11 +12,7 @@
 import soot.*;
 import soot.util.*;
 import soot.jimple.*;
-import soot.coffi.ClassFile;
-import soot.coffi.method_info;
-import soot.coffi.CONSTANT_Utf8_info;
 import soot.tagkit.SourceFileTag;
-import soot.coffi.CoffiMethodSource;
 /**
  * @apilevel internal
   * @ast class

diff --git a/src/main/generated/jastadd/soot/JastAddJ/ASTNode.java b/src/main/generated/jastadd/soot/JastAddJ/ASTNode.java
@@ -13,11 +13,7 @@
 import soot.*;
 import soot.util.*;
 import soot.jimple.*;
-import soot.coffi.ClassFile;
-import soot.coffi.method_info;
-import soot.coffi.CONSTANT_Utf8_info;
 import soot.tagkit.SourceFileTag;
-import soot.coffi.CoffiMethodSource;
 /**
  * @production ASTNode;
  * @ast node

diff --git a/src/main/generated/jastadd/soot/JastAddJ/AbstractDot.java b/src/main/generated/jastadd/soot/JastAddJ/AbstractDot.java
@@ -13,11 +13,7 @@
 import soot.*;
 import soot.util.*;
 import soot.jimple.*;
-import soot.coffi.ClassFile;
-import soot.coffi.method_info;
-import soot.coffi.CONSTANT_Utf8_info;
 import soot.tagkit.SourceFileTag;
-import soot.coffi.CoffiMethodSource;
 /**
  * @production AbstractDot : {@link Access} ::= <span class="component">Left:{@link Expr}</span> <span class="component">Right:{@link Access}</span>;
  * @ast node

diff --git a/src/main/generated/jastadd/soot/JastAddJ/AbstractWildcard.java b/src/main/generated/jastadd/soot/JastAddJ/AbstractWildcard.java
@@ -13,11 +13,7 @@
 import soot.*;
 import soot.util.*;
 import soot.jimple.*;
-import soot.coffi.ClassFile;
-import soot.coffi.method_info;
-import soot.coffi.CONSTANT_Utf8_info;
 import soot.tagkit.SourceFileTag;
-import soot.coffi.CoffiMethodSource;
 /**
  * @production AbstractWildcard : {@link Access};
  * @ast node

diff --git a/src/main/generated/jastadd/soot/JastAddJ/AbstractWildcardType.java b/src/main/generated/jastadd/soot/JastAddJ/AbstractWildcardType.java
@@ -13,11 +13,7 @@
 import soot.*;
 import soot.util.*;
 import soot.jimple.*;
-import soot.coffi.ClassFile;
-import soot.coffi.method_info;
-import soot.coffi.CONSTANT_Utf8_info;
 import soot.tagkit.SourceFileTag;
-import soot.coffi.CoffiMethodSource;
 /**
  * @production AbstractWildcardType : {@link TypeDecl};
  * @ast node

diff --git a/src/main/generated/jastadd/soot/JastAddJ/Access.java b/src/main/generated/jastadd/soot/JastAddJ/Access.java
@@ -13,11 +13,7 @@
 import soot.*;
 import soot.util.*;
 import soot.jimple.*;
-import soot.coffi.ClassFile;
-import soot.coffi.method_info;
-import soot.coffi.CONSTANT_Utf8_info;
 import soot.tagkit.SourceFileTag;
-import soot.coffi.CoffiMethodSource;
 /**
  * @production Access : {@link Expr};
  * @ast node

diff --git a/src/main/generated/jastadd/soot/JastAddJ/AddExpr.java b/src/main/generated/jastadd/soot/JastAddJ/AddExpr.java
@@ -13,11 +13,7 @@
 import soot.*;
 import soot.util.*;
 import soot.jimple.*;
-import soot.coffi.ClassFile;
-import soot.coffi.method_info;
-import soot.coffi.CONSTANT_Utf8_info;
 import soot.tagkit.SourceFileTag;
-import soot.coffi.CoffiMethodSource;
 /**
  * @production AddExpr : {@link AdditiveExpr};
  * @ast node

diff --git a/src/main/generated/jastadd/soot/JastAddJ/AdditiveExpr.java b/src/main/generated/jastadd/soot/JastAddJ/AdditiveExpr.java
@@ -13,11 +13,7 @@
 import soot.*;
 import soot.util.*;
 import soot.jimple.*;
-import soot.coffi.ClassFile;
-import soot.coffi.method_info;
-import soot.coffi.CONSTANT_Utf8_info;
 import soot.tagkit.SourceFileTag;
-import soot.coffi.CoffiMethodSource;
 /**
  * @production AdditiveExpr : {@link ArithmeticExpr};
  * @ast node

diff --git a/src/main/generated/jastadd/soot/JastAddJ/AmbiguousAccess.java b/src/main/generated/jastadd/soot/JastAddJ/AmbiguousAccess.java
@@ -13,11 +13,7 @@
 import soot.*;
 import soot.util.*;
 import soot.jimple.*;
-import soot.coffi.ClassFile;
-import soot.coffi.method_info;
-import soot.coffi.CONSTANT_Utf8_info;
 import soot.tagkit.SourceFileTag;
-import soot.coffi.CoffiMethodSource;
 /**
  * @production AmbiguousAccess : {@link Access} ::= <span class="component">&lt;ID:String&gt;</span>;
  * @ast node

diff --git a/src/main/generated/jastadd/soot/JastAddJ/AndBitwiseExpr.java b/src/main/generated/jastadd/soot/JastAddJ/AndBitwiseExpr.java
@@ -13,11 +13,7 @@
 import soot.*;
 import soot.util.*;
 import soot.jimple.*;
-import soot.coffi.ClassFile;
-import soot.coffi.method_info;
-import soot.coffi.CONSTANT_Utf8_info;
 import soot.tagkit.SourceFileTag;
-import soot.coffi.CoffiMethodSource;
 /**
  * @production AndBitwiseExpr : {@link BitwiseExpr};
  * @ast node

diff --git a/src/main/generated/jastadd/soot/JastAddJ/AndLogicalExpr.java b/src/main/generated/jastadd/soot/JastAddJ/AndLogicalExpr.java
@@ -13,11 +13,7 @@
 import soot.*;
 import soot.util.*;
 import soot.jimple.*;
-import soot.coffi.ClassFile;
-import soot.coffi.method_info;
-import soot.coffi.CONSTANT_Utf8_info;
 import soot.tagkit.SourceFileTag;
-import soot.coffi.CoffiMethodSource;
 /**
  * @production AndLogicalExpr : {@link LogicalExpr};
  * @ast node

diff --git a/src/main/generated/jastadd/soot/JastAddJ/AnnotatedCompilationUnit.java b/src/main/generated/jastadd/soot/JastAddJ/AnnotatedCompilationUnit.java
@@ -13,11 +13,7 @@
 import soot.*;
 import soot.util.*;
 import soot.jimple.*;
-import soot.coffi.ClassFile;
-import soot.coffi.method_info;
-import soot.coffi.CONSTANT_Utf8_info;
 import soot.tagkit.SourceFileTag;
-import soot.coffi.CoffiMethodSource;
 
 /**
  * @production AnnotatedCompilationUnit : {@link CompilationUnit} ::= <span class="component">{@link Modifiers}</span>;

diff --git a/src/main/generated/jastadd/soot/JastAddJ/Annotation.java b/src/main/generated/jastadd/soot/JastAddJ/Annotation.java
@@ -13,11 +13,7 @@
 import soot.*;
 import soot.util.*;
 import soot.jimple.*;
-import soot.coffi.ClassFile;
-import soot.coffi.method_info;
-import soot.coffi.CONSTANT_Utf8_info;
 import soot.tagkit.SourceFileTag;
-import soot.coffi.CoffiMethodSource;
 
 /**
  * @production Annotation : {@link Modifier} ::= <span class="component">&lt;ID:String&gt;</span> <span class="component">{@link Access}</span> <span class="component">{@link ElementValuePair}*</span>;

diff --git a/src/main/generated/jastadd/soot/JastAddJ/AnnotationDecl.java b/src/main/generated/jastadd/soot/JastAddJ/AnnotationDecl.java
@@ -13,11 +13,7 @@
 import soot.*;
 import soot.util.*;
 import soot.jimple.*;
-import soot.coffi.ClassFile;
-import soot.coffi.method_info;
-import soot.coffi.CONSTANT_Utf8_info;
 import soot.tagkit.SourceFileTag;
-import soot.coffi.CoffiMethodSource;
 
 /**
  * @production AnnotationDecl : {@link InterfaceDecl} ::= <span class="component">SuperInterfaceId:{@link Access}*</span>;

diff --git a/src/main/generated/jastadd/soot/JastAddJ/AnnotationMethodDecl.java b/src/main/generated/jastadd/soot/JastAddJ/AnnotationMethodDecl.java
@@ -13,11 +13,7 @@
 import soot.*;
 import soot.util.*;
 import soot.jimple.*;
-import soot.coffi.ClassFile;
-import soot.coffi.method_info;
-import soot.coffi.CONSTANT_Utf8_info;
 import soot.tagkit.SourceFileTag;
-import soot.coffi.CoffiMethodSource;
 /**
  * @production AnnotationMethodDecl : {@link MethodDecl} ::= <span class="component">[DefaultValue:{@link ElementValue}]</span>;
  * @ast node

diff --git a/src/main/generated/jastadd/soot/JastAddJ/AnonymousDecl.java b/src/main/generated/jastadd/soot/JastAddJ/AnonymousDecl.java
@@ -13,11 +13,7 @@
 import soot.*;
 import soot.util.*;
 import soot.jimple.*;
-import soot.coffi.ClassFile;
-import soot.coffi.method_info;
-import soot.coffi.CONSTANT_Utf8_info;
 import soot.tagkit.SourceFileTag;
-import soot.coffi.CoffiMethodSource;
 /**
  * @production AnonymousDecl : {@link ClassDecl} ::= <span class="component">{@link Modifiers}</span> <span class="component">&lt;ID:String&gt;</span> <span class="component">[SuperClassAccess:{@link Access}]</span> <span class="component">Implements:{@link Access}*</span> <span class="component">{@link BodyDecl}*</span>;
  * @ast node

diff --git a/src/main/generated/jastadd/soot/JastAddJ/ArithmeticExpr.java b/src/main/generated/jastadd/soot/JastAddJ/ArithmeticExpr.java
@@ -13,11 +13,7 @@
 import soot.*;
 import soot.util.*;
 import soot.jimple.*;
-import soot.coffi.ClassFile;
-import soot.coffi.method_info;
-import soot.coffi.CONSTANT_Utf8_info;
 import soot.tagkit.SourceFileTag;
-import soot.coffi.CoffiMethodSource;
 /**
  * @production ArithmeticExpr : {@link Binary};
  * @ast node

diff --git a/src/main/generated/jastadd/soot/JastAddJ/ArrayAccess.java b/src/main/generated/jastadd/soot/JastAddJ/ArrayAccess.java
@@ -13,11 +13,7 @@
 import soot.*;
 import soot.util.*;
 import soot.jimple.*;
-import soot.coffi.ClassFile;
-import soot.coffi.method_info;
-import soot.coffi.CONSTANT_Utf8_info;
 import soot.tagkit.SourceFileTag;
-import soot.coffi.CoffiMethodSource;
 /**
  * @production ArrayAccess : {@link Access} ::= <span class="component">{@link Expr}</span>;
  * @ast node

diff --git a/src/main/generated/jastadd/soot/JastAddJ/ArrayCreationExpr.java b/src/main/generated/jastadd/soot/JastAddJ/ArrayCreationExpr.java
@@ -13,11 +13,7 @@
 import soot.*;
 import soot.util.*;
 import soot.jimple.*;
-import soot.coffi.ClassFile;
-import soot.coffi.method_info;
-import soot.coffi.CONSTANT_Utf8_info;
 import soot.tagkit.SourceFileTag;
-import soot.coffi.CoffiMethodSource;
 /**
  * @production ArrayCreationExpr : {@link PrimaryExpr} ::= <span class="component">TypeAccess:{@link Access}</span> <span class="component">[{@link ArrayInit}]</span>;
  * @ast node

diff --git a/src/main/generated/jastadd/soot/JastAddJ/ArrayDecl.java b/src/main/generated/jastadd/soot/JastAddJ/ArrayDecl.java
@@ -13,11 +13,7 @@
 import soot.*;
 import soot.util.*;
 import soot.jimple.*;
-import soot.coffi.ClassFile;
-import soot.coffi.method_info;
-import soot.coffi.CONSTANT_Utf8_info;
 import soot.tagkit.SourceFileTag;
-import soot.coffi.CoffiMethodSource;
 /**
  * @production ArrayDecl : {@link ClassDecl};
  * @ast node

diff --git a/src/main/generated/jastadd/soot/JastAddJ/ArrayInit.java b/src/main/generated/jastadd/soot/JastAddJ/ArrayInit.java
@@ -13,11 +13,7 @@
 import soot.*;
 import soot.util.*;
 import soot.jimple.*;
-import soot.coffi.ClassFile;
-import soot.coffi.method_info;
-import soot.coffi.CONSTANT_Utf8_info;
 import soot.tagkit.SourceFileTag;
-import soot.coffi.CoffiMethodSource;
 /**
  * @production ArrayInit : {@link Expr} ::= <span class="component">Init:{@link Expr}*</span>;
  * @ast node

diff --git a/src/main/generated/jastadd/soot/JastAddJ/ArrayTypeAccess.java b/src/main/generated/jastadd/soot/JastAddJ/ArrayTypeAccess.java
@@ -13,11 +13,7 @@
 import soot.*;
 import soot.util.*;
 import soot.jimple.*;
-import soot.coffi.ClassFile;
-import soot.coffi.method_info;
-import soot.coffi.CONSTANT_Utf8_info;
 import soot.tagkit.SourceFileTag;
-import soot.coffi.CoffiMethodSource;
 /**
  * @production ArrayTypeAccess : {@link TypeAccess} ::= <span class="component">&lt;Package:String&gt;</span> <span class="component">&lt;ID:String&gt;</span> <span class="component">{@link Access}</span>;
  * @ast node

diff --git a/src/main/generated/jastadd/soot/JastAddJ/ArrayTypeWithSizeAccess.java b/src/main/generated/jastadd/soot/JastAddJ/ArrayTypeWithSizeAccess.java
@@ -13,11 +13,7 @@
 import soot.*;
 import soot.util.*;
 import soot.jimple.*;
-import soot.coffi.ClassFile;
-import soot.coffi.method_info;
-import soot.coffi.CONSTANT_Utf8_info;
 import soot.tagkit.SourceFileTag;
-import soot.coffi.CoffiMethodSource;
 /**
  * @production ArrayTypeWithSizeAccess : {@link ArrayTypeAccess} ::= <span class="component">{@link Expr}</span>;
  * @ast node

diff --git a/src/main/generated/jastadd/soot/JastAddJ/AssertStmt.java b/src/main/generated/jastadd/soot/JastAddJ/AssertStmt.java
@@ -13,11 +13,7 @@
 import soot.*;
 import soot.util.*;
 import soot.jimple.*;
-import soot.coffi.ClassFile;
-import soot.coffi.method_info;
-import soot.coffi.CONSTANT_Utf8_info;
 import soot.tagkit.SourceFileTag;
-import soot.coffi.CoffiMethodSource;
 /**
  * @production AssertStmt : {@link Stmt} ::= <span class="component">first:{@link Expr}</span> <span class="component">[{@link Expr}]</span>;
  * @ast node

diff --git a/src/main/generated/jastadd/soot/JastAddJ/AssignAdditiveExpr.java b/src/main/generated/jastadd/soot/JastAddJ/AssignAdditiveExpr.java
@@ -13,11 +13,7 @@
 import soot.*;
 import soot.util.*;
 import soot.jimple.*;
-import soot.coffi.ClassFile;
-import soot.coffi.method_info;
-import soot.coffi.CONSTANT_Utf8_info;
 import soot.tagkit.SourceFileTag;
-import soot.coffi.CoffiMethodSource;
 /**
  * @production AssignAdditiveExpr : {@link AssignExpr};
  * @ast node

diff --git a/src/main/generated/jastadd/soot/JastAddJ/AssignAndExpr.java b/src/main/generated/jastadd/soot/JastAddJ/AssignAndExpr.java
@@ -13,11 +13,7 @@
 import soot.*;
 import soot.util.*;
 import soot.jimple.*;
-import soot.coffi.ClassFile;
-import soot.coffi.method_info;
-import soot.coffi.CONSTANT_Utf8_info;
 import soot.tagkit.SourceFileTag;
-import soot.coffi.CoffiMethodSource;
 /**
  * @production AssignAndExpr : {@link AssignBitwiseExpr};
  * @ast node

diff --git a/src/main/generated/jastadd/soot/JastAddJ/AssignBitwiseExpr.java b/src/main/generated/jastadd/soot/JastAddJ/AssignBitwiseExpr.java
@@ -13,11 +13,7 @@
 import soot.*;
 import soot.util.*;
 import soot.jimple.*;
-import soot.coffi.ClassFile;
-import soot.coffi.method_info;
-import soot.coffi.CONSTANT_Utf8_info;
 import soot.tagkit.SourceFileTag;
-import soot.coffi.CoffiMethodSource;
 /**
  * @production AssignBitwiseExpr : {@link AssignExpr};
  * @ast node

diff --git a/src/main/generated/jastadd/soot/JastAddJ/AssignDivExpr.java b/src/main/generated/jastadd/soot/JastAddJ/AssignDivExpr.java
@@ -13,11 +13,7 @@
 import soot.*;
 import soot.util.*;
 import soot.jimple.*;
-import soot.coffi.ClassFile;
-import soot.coffi.method_info;
-import soot.coffi.CONSTANT_Utf8_info;
 import soot.tagkit.SourceFileTag;
-import soot.coffi.CoffiMethodSource;
 /**
  * @production AssignDivExpr : {@link AssignMultiplicativeExpr};
  * @ast node