Merge remote-tracking branch 'origin/GP-1393_James_columns_for_function_attributes--SQUASHED'

Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/functionwindow/FunctionTableModel.java

@@ -62,6 +62,18 @@ public class FunctionTableModel extends AddressBasedTableModel<FunctionRowObject
 		// Function tag column is not something widely used, so make hidden by default
 		descriptor.addHiddenColumn(
 			DiscoverableTableUtils.adaptColumForModel(this, new FunctionTagTableColumn()));
+		
+		descriptor.addHiddenColumn(
+			DiscoverableTableUtils.adaptColumForModel(this, new IsFunctionInlineTableColumn()));
+		
+		descriptor.addHiddenColumn(
+			DiscoverableTableUtils.adaptColumForModel(this, new IsFunctionNonReturningTableColumn()));
+		
+		descriptor.addHiddenColumn(
+			DiscoverableTableUtils.adaptColumForModel(this, new IsFunctionVarargsTableColumn()));
+		
+		descriptor.addHiddenColumn(
+			DiscoverableTableUtils.adaptColumForModel(this, new IsFunctionCustomStorageTableColumn()));
 
 		return descriptor;
 	}

Ghidra/Features/Base/src/main/java/ghidra/util/table/field/IsFunctionCustomStorageTableColumn.java

@@ -0,0 +1,37 @@
+/* ###
+ * IP: GHIDRA
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package ghidra.util.table.field;
+
+import ghidra.docking.settings.Settings;
+import ghidra.framework.plugintool.ServiceProvider;
+import ghidra.program.model.listing.Function;
+import ghidra.program.model.listing.Program;
+
+public class IfFunctionCustomStorageTableColumn
+		extends ProgramBasedDynamicTableColumnExtensionPoint<Function, Boolean> {
+
+	@Override
+	public String getColumnName() {
+		return "Custom Storage";
+	}
+
+	@Override
+	public Boolean getValue(Function rowObject, Settings settings, Program data,
+			ServiceProvider serviceProvider) throws IllegalArgumentException {
+		return rowObject.hasCustomVariableStorage();
+	}
+
+}

Ghidra/Features/Base/src/main/java/ghidra/util/table/field/IsFunctionInlineTableColumn.java

@@ -0,0 +1,37 @@
+/* ###
+ * IP: GHIDRA
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package ghidra.util.table.field;
+
+import ghidra.docking.settings.Settings;
+import ghidra.framework.plugintool.ServiceProvider;
+import ghidra.program.model.listing.Function;
+import ghidra.program.model.listing.Program;
+
+public class IsFunctionInlineTableColumn
+		extends ProgramBasedDynamicTableColumnExtensionPoint<Function, Boolean> {
+
+	@Override
+	public String getColumnName() {
+		return "Inline";
+	}
+
+	@Override
+	public Boolean getValue(Function rowObject, Settings settings, Program data,
+			ServiceProvider serviceProvider) throws IllegalArgumentException {
+		return rowObject.isInline();
+	}
+
+}

Ghidra/Features/Base/src/main/java/ghidra/util/table/field/IsFunctionNonReturningTableColumn.java

@@ -0,0 +1,37 @@
+/* ###
+ * IP: GHIDRA
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package ghidra.util.table.field;
+
+import ghidra.docking.settings.Settings;
+import ghidra.framework.plugintool.ServiceProvider;
+import ghidra.program.model.listing.Function;
+import ghidra.program.model.listing.Program;
+
+public class IsFunctionNonReturningTableColumn
+		extends ProgramBasedDynamicTableColumnExtensionPoint<Function, Boolean> {
+
+	@Override
+	public String getColumnName() {
+		return "Non-returning";
+	}
+
+	@Override
+	public Boolean getValue(Function rowObject, Settings settings, Program data,
+			ServiceProvider serviceProvider) throws IllegalArgumentException {
+		return rowObject.hasNoReturn();
+	}
+
+}

Ghidra/Features/Base/src/main/java/ghidra/util/table/field/IsFunctionVarargsTableColumn.java

@@ -0,0 +1,37 @@
+/* ###
+ * IP: GHIDRA
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package ghidra.util.table.field;
+
+import ghidra.docking.settings.Settings;
+import ghidra.framework.plugintool.ServiceProvider;
+import ghidra.program.model.listing.Function;
+import ghidra.program.model.listing.Program;
+
+public class IsFunctionVarargsTableColumn
+		extends ProgramBasedDynamicTableColumnExtensionPoint<Function, Boolean>{
+
+	@Override
+	public String getColumnName() {
+		return "Varargs";
+	}
+
+	@Override
+	public Boolean getValue(Function rowObject, Settings settings, Program data,
+			ServiceProvider serviceProvider) throws IllegalArgumentException {
+		return rowObject.hasVarArgs();	
+	}
+
+}