Simplify catch_KeyboardInterrupt

Author: elicn

qiling/core_hooks.py

@@ -149,14 +149,14 @@ def _hook_addr_cb(self, uc: Uc, addr: int, size: int, pack_data):
     # Class Hooks #
     ###############
     def _ql_hook_internal(self, hook_type, callback, user_data=None, *args) -> int:
-        _callback = (catch_KeyboardInterrupt(self))(callback)
+        _callback = catch_KeyboardInterrupt(self, callback)
         # pack user_data & callback for wrapper _callback
         return self._h_uc.hook_add(hook_type, _callback, (self, user_data), 1, 0, *args)
 
 
     def _ql_hook_addr_internal(self, callback: Callable, address: int) -> int:
-        _callback = (catch_KeyboardInterrupt(self))(callback)
-        # pack user_data & callback for wrapper _callback
+        _callback = catch_KeyboardInterrupt(self, callback)
+
         return self._h_uc.hook_add(UC_HOOK_CODE, _callback, self, address, address)
 
 

qiling/utils.py

@@ -21,18 +21,15 @@
 from qiling.const import QL_ARCH, QL_ENDIAN, QL_OS, QL_DEBUGGER
 from qiling.const import debugger_map, arch_map, os_map, arch_os_map
 
-def catch_KeyboardInterrupt(ql):
-    def decorator(func):
-        def wrapper(*args, **kw):
-            try:
-                return func(*args, **kw)
-            except BaseException as e:
-                ql.stop()
-                ql._internal_exception = e
-
-        return wrapper
-
-    return decorator
+def catch_KeyboardInterrupt(ql, func):
+    def wrapper(*args, **kw):
+        try:
+            return func(*args, **kw)
+        except BaseException as e:
+            ql.stop()
+            ql._internal_exception = e
+
+    return wrapper
 
 def enum_values(e: Type[Enum]) -> Container:
     return e.__members__.values()