Merge pull request #1154 from elicn/improv

Misc improvements

Author: xwings

examples/windows_trace.py

@@ -115,7 +115,6 @@ def emulate(path, rootfs, verbose=QL_VERBOSE.DEBUG, enable_trace=False):
     parser.add_argument("-t", "--trace", help="Enable full trace", action='store_true', default=False)
     parser.add_argument("-R", "--root", help="rootfs", default=None)
     parser.add_argument("-d", "--dump", help="Directory to dump memory regions to", default="dump")
-    #parser.add_argument("-a", "--automatize_input", help="Automatize writes on standard input", default=False)
     parser.add_argument("-p ", "--profile", help="customized profile",
                         default="qiling/profiles/windows.ql")
     parser.add_argument('input', nargs='*')

qiling/arch/x86_utils.py

@@ -4,7 +4,7 @@
 from qiling import Qiling
 from qiling.arch.x86 import QlArchIntel
 from qiling.arch.x86_const import *
-from qiling.exception import QlGDTError
+from qiling.exception import QlGDTError, QlMemoryMappedError
 from qiling.os.memory import QlMemoryManager
 
 class GDTArray:
@@ -50,8 +50,10 @@ class GDTManager:
     def __init__(self, ql: Qiling, base = QL_X86_GDT_ADDR, limit = QL_X86_GDT_LIMIT, num_entries = 16):
         ql.log.debug(f'Mapping GDT at {base:#x} with limit {limit:#x}')
 
-        if not ql.mem.is_mapped(base, limit):
-            ql.mem.map(base, limit, info="[GDT]")
+        if not ql.mem.is_available(base, limit):
+            raise QlMemoryMappedError('cannot map GDT, memory location is taken')
+
+        ql.mem.map(base, limit, info="[GDT]")
 
         # setup GDT by writing to GDTR
         ql.arch.regs.write(UC_X86_REG_GDTR, (0, base, limit, 0x0))

qiling/core.py

@@ -45,7 +45,7 @@ def __init__(
             filter = None,
             stop: QL_STOP = QL_STOP.NONE,
             *,
-            endian: QL_ENDIAN = None,
+            endian: Optional[QL_ENDIAN] = None,
             thumb: bool = False,
             libcache: bool = False
     ):
@@ -414,8 +414,8 @@ def debug_stop(self) -> bool:
         return self._debug_stop
 
     @debug_stop.setter
-    def debug_stop(self, ds):
-        self._debug_stop = ds
+    def debug_stop(self, enabled: bool):
+        self._debug_stop = enabled
 
     @property
     def debugger(self) -> bool: