added native code option and check in SootMethod.isConcrete()

Author: lukaswd

doc/soot_options.html

@@ -688,6 +688,10 @@ <H2><A name="section_2">Input Options</A></H2>
             <td><tt>-drop-bodies-after-load </tt><br></td>
             <td colspan="2">Drop the method source after it has served its purpose of loading the method body</td>
          </tr>
+         <tr>
+            <td><tt>-nc </tt><br><tt>-native-code </tt><br></td>
+            <td colspan="2">Enables native methods to be concrete. Needed for analyzing the Java Native Interface.</td>
+         </tr>
       </table>
       <H2><A name="section_3">Output Options</A></H2>
       <table border="3">

eclipse/ca.mcgill.sable.soot/src/ca/mcgill/sable/soot/ui/PhaseOptionsDialog.java

@@ -1212,6 +1212,12 @@ private boolean createNewConfig() {
 		if (boolRes != defBoolRes) {
 			getConfig().put(getInput_Optionsdrop_bodies_after_load_widget().getAlias(), new Boolean(boolRes));
 		}
+		boolRes = getInput_Optionsnative_code_widget().getButton().getSelection();
+		defBoolRes = false;
+
+		if (boolRes != defBoolRes) {
+			getConfig().put(getInput_Optionsnative_code_widget().getAlias(), new Boolean(boolRes));
+		}
 		stringRes = getInput_Optionssoot_classpath_widget().getText().getText();
 		defStringRes = "";
 
@@ -4915,6 +4921,16 @@ public BooleanOptionWidget getInput_Optionsdrop_bodies_after_load_widget() {
 		return Input_Optionsdrop_bodies_after_load_widget;
 	}	
 
+	private BooleanOptionWidget Input_Optionsnative_code_widget;
+	
+	private void setInput_Optionsnative_code_widget(BooleanOptionWidget widget) {
+		Input_Optionsnative_code_widget = widget;
+	}
+	
+	public BooleanOptionWidget getInput_Optionsnative_code_widget() {
+		return Input_Optionsnative_code_widget;
+	}	
+	
 
 	private ListOptionWidget Input_Optionsprocess_dir_widget;
 
@@ -9047,6 +9063,17 @@ private Composite Input_OptionsCreate(Composite parent) {
 
 		setInput_Optionsdrop_bodies_after_load_widget(new BooleanOptionWidget(editGroupInput_Options, SWT.NONE, new OptionData("Drop method source after loading bodies", "", "","drop-bodies-after-load", "\nEach method is associated with a method source for loading its \nbody. When this option is disabled, a reference to this source \nis kept around even after the body has already been loaded. This \nis a waste of memory for most use cases. When this option is \nenabled, the reference is dropped, allowing for garbage \ncollection of the method source. On the other hand, if the body \nis ever released, it cannot easily be recovered (i.e., loaded \nagain) easily.", defaultBool)));
 
+		defKey = ""+" "+""+" "+"nc native-code";
+		defKey = defKey.trim();
+
+		if (isInDefList(defKey)) {
+			defaultBool = getBoolDef(defKey);	
+		} else {
+			defaultBool = false;
+		}
+
+		setInput_Optionsnative_code_widget(new BooleanOptionWidget(editGroupInput_Options, SWT.NONE, new OptionData("Enable native code", "", "","nc native-code", "\nThis option is needed, when analyzing native code. Particularly \nwhen using the Java Native Interface (JNI). If this option is \nenabled (set true), it allows native methods to be concrete. \nThis flag will be checked in the SootMethod.isConcrete() method, \nallowing native methods to have a body.", defaultBool)));
+
 		data = new OptionData [] {
 
 				new OptionData("Class File",

src/main/generated/options/soot/AntTask.java

@@ -346,6 +346,10 @@ public void setdrop_bodies_after_load(boolean arg) {
             if(arg) addArg("-drop-bodies-after-load");
         }
 
+        public void setnative_code(boolean arg) {
+            if(arg) addArg("-native-code");
+        }
+  
         public void setoutput_dir(String arg) {
             addArg("-output-dir");
             addArg(arg);

src/main/generated/options/soot/options/Options.java

@@ -547,6 +547,11 @@ else if (false
                     || option.equals("no-drop-bodies-after-load")
             )
                 drop_bodies_after_load = false;
+            else if (false
+                    || option.equals("nc")
+                    || option.equals("native-code")
+            )
+                native_code = true;
             else if (false
                     || option.equals("d")
                     || option.equals("output-dir")
@@ -1664,6 +1669,10 @@ public int src_prec() {
     private boolean drop_bodies_after_load = true;
     public void set_drop_bodies_after_load(boolean setting) { drop_bodies_after_load = setting; }
 
+    public boolean native_code() { return native_code; }
+    private boolean native_code = false;
+    public void set_native_code(boolean setting) { native_code = setting; }
+
     public String output_dir() { return output_dir; }
     public void set_output_dir(String setting) { output_dir = setting; }
     private String output_dir = "";
@@ -1898,6 +1907,7 @@ public String getUsage() {
                 + padOpt("-polyglot", "Use Java 1.4 Polyglot frontend instead of JastAdd")
                 + padOpt("-permissive-resolving", "Use alternative sources when classes cannot be found using the normal resolving strategy")
                 + padOpt("-drop-bodies-after-load", "Drop the method source after it has served its purpose of loading the method body")
+                + padOpt("-nc, -native-code", "Enables native methods to be concrete. Needed for analyzing the Java Native Interface.")
                 + "\nOutput Options:\n"
                 + padOpt("-d ARG -output-dir ARG", "Store output files in ARG")
                 + padOpt("-f ARG -output-format ARG", "Set output format for Soot")

src/main/java/soot/SootMethod.java

@@ -230,7 +230,7 @@ public boolean isPhantom() {
    * Returns true if this method is not phantom, abstract or native, i.e. this method can have a body.
    */
   public boolean isConcrete() {
-    return !isPhantom() && !isAbstract();
+    return !isPhantom() && !isAbstract() && (!isNative() || Options.v().native_code()); 
   }
 
   /**

src/main/xml/options/soot_options.xml

@@ -929,6 +929,18 @@
                 recovered (i.e., loaded again) easily.
             </long_desc>
         </boolopt>
+        <boolopt>
+            <name>Enable native code</name>
+            <alias>nc</alias>
+            <alias>native-code</alias>
+            <default>false</default>
+            <short_desc>Enables native methods to be concrete. Needed for analyzing the Java Native Interface.</short_desc>
+            <long_desc>
+                This option is needed, when analyzing native code. Particularly when using the Java Native Interface (JNI).
+                If this option is enabled (set true), it allows native methods to be concrete. This flag will be checked in the 
+                SootMethod.isConcrete() method, allowing native methods to have a body.
+            </long_desc>
+        </boolopt>
     </section>
     <section>
         <name>Output Options</name>