Clean up

Author: elicn

qiling/arch/arm_const.py

@@ -4,7 +4,6 @@
 #
 
 from unicorn.arm_const import *
-from enum import IntEnum
 
 reg_map = {
             "r0": UC_ARM_REG_R0,

qiling/arch/x86.py

@@ -4,14 +4,11 @@
 #
 
 from functools import cached_property
-from typing import Union
 
 from unicorn import Uc, UC_ARCH_X86, UC_MODE_16, UC_MODE_32, UC_MODE_64
 from capstone import Cs, CS_ARCH_X86, CS_MODE_16, CS_MODE_32, CS_MODE_64
 from keystone import Ks, KS_ARCH_X86, KS_MODE_16, KS_MODE_32, KS_MODE_64
 
-from unicorn.x86_const import UC_X86_REG_EFLAGS
-
 from qiling.arch.arch import QlArch
 from qiling.arch.msr import QlMsrManager
 from qiling.arch.register import QlRegisterManager
@@ -126,33 +123,3 @@ def disassembler(self) -> Cs:
     @cached_property
     def assembler(self) -> Ks:
         return Ks(KS_ARCH_X86, KS_MODE_64)
-
-    # TODO: generalize this
-    def __reg_bits(self, register: int) -> int:
-        # all regs in reg_map_misc are 16 bits except of eflags
-        if register == UC_X86_REG_EFLAGS:
-            return 32
-
-        regmaps = (
-            (x86_const.reg_map_8, 8),
-            (x86_const.reg_map_16, 16),
-            (x86_const.reg_map_32, 32),
-            (x86_const.reg_map_64, 64),
-            (x86_const.reg_map_misc, 16),
-            (x86_const.reg_map_cr, 64),         # 32 bits for x86
-            (x86_const.reg_map_st, 32),
-            (x86_const.reg_map_seg_base, 64),   # 32 bits for x86
-        )
-
-        return next((rsize for rmap, rsize in regmaps if register in rmap.values()), 0)
-
-    # note: this method was not generalized for all archs since it requires a bookkeeping
-    # of all registers, while it is used only by gdb and only for x86-64
-    def reg_bits(self, reg: Union[str, int]) -> int:
-        """Get register size in bits.
-        """
-
-        if type(reg) is str:
-            reg = self.regs.register_mapping[reg]
-
-        return self.__reg_bits(reg)

qiling/const.py

@@ -60,9 +60,8 @@ class QL_STOP(Flag):
 
 QL_ARCH_INTERPRETER = (QL_ARCH.EVM,)
 
-QL_OS_NONPID      = (QL_OS.DOS, QL_OS.UEFI)
-QL_OS_POSIX       = (QL_OS.LINUX, QL_OS.FREEBSD, QL_OS.MACOS, QL_OS.QNX)
-QL_OS_BAREMETAL   = (QL_OS.MCU,)
+QL_OS_POSIX     = (QL_OS.LINUX, QL_OS.FREEBSD, QL_OS.MACOS, QL_OS.QNX)
+QL_OS_BAREMETAL = (QL_OS.MCU,)
 
 QL_HOOK_BLOCK = 0b0001
 QL_CALL_BLOCK = 0b0010