Updated shared tasks iReport to have function pointer option

Solutions/sharedTasks/sharedTasks.py

@@ -22,6 +22,7 @@ def __init__(self, key: str, name: str, choices: list[str], default: str):
 FUN_REF_KINDS_OPTION = ', Use Ptr'
 OBJ_ENT_KINDS = 'Object'
 OBJ_REF_KINDS = 'Modify, Set, Use'
+OBJ_REF_KINDS_OPTION = ', Deref Call'
 
 # Patterns to look for in sub-architectures
 TASK_FIELDS = ('priority', 'core')
@@ -191,13 +192,17 @@ def globalObjRefs(function: Ent, options: dict[str, str | bool] | None = None) -
 
     for otherFunction in [function] + function.ents('Instanceof'):
         # Global objects
-        for ref in otherFunction.refs(OBJ_REF_KINDS, 'Global Object'):
+        refKinds = OBJ_REF_KINDS
+        if options[FUNCTION_POINTER] == 'On':
+            refKinds += OBJ_REF_KINDS_OPTION
+
+        for ref in otherFunction.refs(refKinds, 'Global Object'):
             if not memberObjectParents and entHasMembers(ref.ent()):
                 continue
             result.append(ref)
         # Members of global objects
         if memberObjects:
-            for ref in otherFunction.refs(OBJ_REF_KINDS, 'Member Object'):
+            for ref in otherFunction.refs(refKinds, 'Member Object'):
                 if not isMemberOfGlobal(ref.ent()):
                     continue
                 result.append(ref)

Solutions/sharedTasks/sharedTasksCSV.py

@@ -81,7 +81,10 @@ def generateCSVRows(db: Db, arch: Arch, options: dict[str, str | bool], lines: l
     # header
     headerFields = [field for field in TASK_FIELDS if field in foundFields]
 
-    header = 'Global Object, Shared, Protected, Function, Reference(M=Modify/S=Set/U=Use), File, Task'
+    referenceString = "Reference(M=Modify/S=Set/U=Use)"
+    if options[FUNCTION_POINTER] == 'On':
+        referenceString = "Reference(M=Modify/S=Set/U=Use/C=Call)"
+    header = 'Global Object, Shared, Protected, Function, ' + referenceString + ', File, Task'
     if headerFields:
       header += ', ' + ', '.join(field.capitalize() for field in headerFields)
     header += '\n'

Solutions/sharedTasks/sharedTasksCSV.upy

@@ -23,8 +23,6 @@ def test_architecture(arch: Arch) -> bool:
 def init(report: IReport):
     for option in CSV_OPTIONS:
         # Checkbox
-        if option.name == "Function Pointer":
-            continue
         if option.choices == OPTION_BOOL_CHOICES:
             report.options().checkbox(option.key, option.name, option.default == OPTION_BOOL_TRUE)
         # Choice