Split the arch and interrupt handling

Author: cla7aye15I4nd

qiling/arch/arm_const.py

@@ -68,6 +68,7 @@ class CONTROL(IntEnum):
     PRIV  = 0b001
 
 class EXC_RETURN(IntEnum):
+    MASK = 0xfffffff0
     RETURN_SP   = 0b0100
     RETURN_MODE = 0b1000
 

qiling/core.py

@@ -859,8 +859,12 @@ def emu_stop(self):
     def stop(self):
         if self.multithread:
             self.os.thread_management.stop() 
+
+        elif self.archtype in QL_ARCH_HARDWARE:
+            self.arch.stop()
+
         else:
-            self.uc.emu_stop()            
+            self.uc.emu_stop()        
 
     # start emulation
     def emu_start(self, begin, end, timeout=0, count=0):

qiling/hw/intc/cm4_nvic.py

@@ -111,9 +111,7 @@ def step(self):
         while self.intrs:
             IRQn = self.intrs.pop(0)
             self.clear_pending(IRQn)
-            self.ql.arch.enter_intr()
-            self.ql.arch.handle_interupt(IRQn)
-            self.ql.arch.exit_intr()
+            self.ql.arch.handle_interupt(IRQn)            
 
     def read(self, offset: int, size: int) -> int:
         buf = ctypes.create_string_buffer(size)