Deduplicate protocol notifications handling

Author: elicn

examples/simple_efi_x8664.py

@@ -11,7 +11,7 @@
 from qiling import Qiling
 from qiling.const import QL_INTERCEPT, QL_VERBOSE
 from qiling.os.uefi.const import EFI_SUCCESS, EFI_INVALID_PARAMETER
-from qiling.os.uefi.utils import check_and_notify_protocols, signal_event
+from qiling.os.uefi.utils import execute_protocol_notifications, signal_event
 
 def force_notify_RegisterProtocolNotify(ql: Qiling, address: int, params):
     event_id = params['Event']
@@ -23,7 +23,7 @@ def force_notify_RegisterProtocolNotify(ql: Qiling, address: int, params):
         event["Set"] = False
 
         signal_event(ql, event_id)
-        check_and_notify_protocols(ql, True)
+        execute_protocol_notifications(ql, True)
 
         return EFI_SUCCESS
 

qiling/os/uefi/bs.py

@@ -436,7 +436,7 @@ def hook_InstallMultipleProtocolInterfaces(ql: Qiling, address: int, params):
 		index += 2
 
 	ql.loader.dxe_context.protocols[handle] = dic
-	check_and_notify_protocols(ql, True)
+	execute_protocol_notifications(ql, True)
 	write_int64(ql, params["Handle"], handle)
 
 	return EFI_SUCCESS

qiling/os/uefi/utils.py

@@ -63,22 +63,6 @@ def __notify_next(ql: Qiling):
 
 	return True
 
-def check_and_notify_protocols(ql: Qiling, from_hook: bool = False) -> bool:
-	if ql.loader.notify_list:
-		event_id, notify_func, notify_context = ql.loader.notify_list.pop(0)
-		ql.log.info(f'Notify event: id = {event_id}, calling: {notify_func:#x} context: {notify_context}')
-
-		if from_hook:
-			# When running from a hook the caller pops the return address from the stack.
-			# We need to push the address to the stack as opposed to setting it to the instruction pointer.
-			ql.loader.call_function(0, notify_context, notify_func)
-		else:
-			ql.loader.call_function(notify_func, notify_context, ql.loader.context.end_of_execution_ptr)
-
-		return True
-
-	return False
-
 def ptr_read8(ql: Qiling, addr: int) -> int:
 	"""Read BYTE data from a pointer
 	"""