diff --git a/qiling/arch/evm/evm.py b/qiling/arch/evm/evm.py index bd824517..81ce642c 100644 --- a/qiling/arch/evm/evm.py +++ b/qiling/arch/evm/evm.py @@ -5,11 +5,11 @@ import types +from qiling.arch.arch import QlArch +from qiling.arch.evm.hooks import monkeypatch_core_hooks +from qiling.arch.evm.vm.evm import QlArchEVMEmulator from qiling.arch.evm.vm.message import Message from qiling.const import * -from ..arch import QlArch -from .vm.evm import QlArchEVMEmulator -from .hooks import monkeypatch_core_hooks class QlArchEVM(QlArch): type = QL_ARCH.EVM diff --git a/qiling/os/windows/windows.py b/qiling/os/windows/windows.py index a0e615ac..6c115d99 100644 --- a/qiling/os/windows/windows.py +++ b/qiling/os/windows/windows.py @@ -4,13 +4,13 @@ # import ntpath -from typing import Callable, TextIO +from typing import Callable, TextIO, Type from unicorn import UcError from qiling import Qiling from qiling.arch.x86_const import GS_SEGMENT_ADDR, GS_SEGMENT_SIZE, FS_SEGMENT_ADDR, FS_SEGMENT_SIZE -from qiling.arch.x86_utils import GDTManager, SegmentManager86, SegmentManager64 +from qiling.arch.x86_utils import GDTManager, SegmentManager, SegmentManager86, SegmentManager64 from qiling.cc import intel from qiling.const import QL_ARCH, QL_OS, QL_INTERCEPT from qiling.exception import QlErrorSyscallError, QlErrorSyscallNotFound, QlMemoryMappedError @@ -137,7 +137,7 @@ class QlOsWindows(QlOs): def setupGDT(self): gdtm = GDTManager(self.ql) - segm_class = { + segm_class: Type[SegmentManager] = { 32 : SegmentManager86, 64 : SegmentManager64 }[self.ql.arch.bits]