adapt changes according to qiling-next

Author: ucgJhe

qiling/debugger/qdb/arch/arch_arm.py

@@ -67,7 +67,7 @@ def thumb_mode(self) -> bool:
         helper function for checking thumb mode
         """
 
-        return self.ql.reg.cpsr & 0x00000020 != 0
+        return self.ql.arch.regs.cpsr & 0x00000020 != 0
 
     def read_insn(self, address: int) -> bytes:
         """

qiling/debugger/qdb/branch_predictor/branch_predictor.py

@@ -35,7 +35,7 @@ def read_reg(self, reg_name):
         read specific register value
         """
 
-        return self.ql.reg.read(reg_name)
+        return self.ql.arch.regs.read(reg_name)
 
     def predict(self):
         """

qiling/debugger/qdb/branch_predictor/branch_predictor_arm.py

@@ -23,7 +23,7 @@ def __init__(self, ql):
 
     def read_reg(self, reg_name):
         reg_name = reg_name.replace("ip", "r12").replace("fp", "r11")
-        return getattr(self.ql.reg, reg_name)
+        return getattr(self.ql.arch.regs, reg_name)
 
     def regdst_eq_pc(self, op_str):
         return op_str.partition(", ")[0] == "pc"
@@ -123,7 +123,7 @@ def predict(self):
                 }
 
         if line.mnemonic in jump_table:
-            prophecy.going = jump_table.get(line.mnemonic)(*self.get_cpsr(self.ql.reg.cpsr))
+            prophecy.going = jump_table.get(line.mnemonic)(*self.get_cpsr(self.ql.arch.regs.cpsr))
 
         elif line.mnemonic in cb_table:
             prophecy.going = cb_table.get(line.mnemonic)(self.read_reg(line.op_str.split(", ")[0]))
@@ -153,7 +153,7 @@ def predict(self):
                     "ls": lambda V, C, Z, N: (C == 0 or Z == 1),
                     "le": lambda V, C, Z, N: (Z == 1 or N != V),
                     "hi": lambda V, C, Z, N: (Z == 0 and C == 1),
-                    }.get(line.op_str)(*self.get_cpsr(self.ql.reg.cpsr))
+                    }.get(line.op_str)(*self.get_cpsr(self.ql.arch.regs.cpsr))
 
             it_block_range = [each_char for each_char in line.mnemonic[1:]]
 
@@ -184,7 +184,7 @@ def predict(self):
                     prophecy.where = self.unpack32(self.read_mem(self.read_reg(r), self.INST_SIZE))
 
         elif line.mnemonic in ("addls", "addne", "add") and self.regdst_eq_pc(line.op_str):
-            V, C, Z, N = self.get_cpsr(self.ql.reg.cpsr)
+            V, C, Z, N = self.get_cpsr(self.ql.arch.regs.cpsr)
             r0, r1, r2, *imm = line.op_str.split(", ")
 
             # program counter is awalys 8 bytes ahead when it comes with pc, need to add extra 8 bytes
@@ -234,7 +234,7 @@ def predict(self):
                     "pophi": lambda V, C, Z, N: (C == 1),
                     "popge": lambda V, C, Z, N: (N == V),
                     "poplt": lambda V, C, Z, N: (N != V),
-                    }.get(line.mnemonic)(*self.get_cpsr(self.ql.reg.cpsr)):
+                    }.get(line.mnemonic)(*self.get_cpsr(self.ql.arch.regs.cpsr)):
 
                 prophecy.where = cur_addr + self.INST_SIZE
 

qiling/debugger/qdb/branch_predictor/branch_predictor_mips.py

@@ -36,7 +36,7 @@ def is_negative(i: int) -> int:
 
     def read_reg(self, reg_name):
         reg_name = reg_name.strip("$").replace("fp", "s8")
-        return self.signed_val(getattr(self.ql.reg, reg_name))
+        return self.signed_val(getattr(self.ql.arch.regs, reg_name))
 
     def predict(self):
         prophecy = self.Prophecy()

qiling/debugger/qdb/branch_predictor/branch_predictor_x86.py

@@ -91,11 +91,11 @@ def predict(self):
                 }
 
         if line.mnemonic in jump_table:
-            eflags = self.get_flags(self.ql.reg.ef).values()
+            eflags = self.get_flags(self.ql.arch.regs.ef).values()
             prophecy.going = jump_table.get(line.mnemonic)(*eflags)
 
         elif line.mnemonic in jump_reg_table:
-            prophecy.going = jump_reg_table.get(line.mnemonic)(self.ql.reg.ecx)
+            prophecy.going = jump_reg_table.get(line.mnemonic)(self.ql.arch.regs.ecx)
 
         if prophecy.going:
             takeaway_list = ["ptr", "dword", "[", "]"]
@@ -106,19 +106,19 @@ def predict(self):
                     new_line = new_line.replace(each, " ")
 
                 new_line = " ".join(new_line.split())
-                for each_reg in filter(lambda r: len(r) == 3, self.ql.reg.register_mapping.keys()):
+                for each_reg in filter(lambda r: len(r) == 3, self.ql.arch.regs.register_mapping.keys()):
                     if each_reg in new_line:
                         new_line = re.sub(each_reg, hex(self.read_reg(each_reg)), new_line)
 
-                for each_reg in filter(lambda r: len(r) == 2, self.ql.reg.register_mapping.keys()):
+                for each_reg in filter(lambda r: len(r) == 2, self.ql.arch.regs.register_mapping.keys()):
                     if each_reg in new_line:
                         new_line = re.sub(each_reg, hex(self.read_reg(each_reg)), new_line)
 
 
                 prophecy.where = check_and_eval(new_line)
 
-            elif line.op_str in self.ql.reg.register_mapping:
-                prophecy.where = self.ql.reg.read(line.op_str)
+            elif line.op_str in self.ql.arch.regs.register_mapping:
+                prophecy.where = self.ql.arch.regs.read(line.op_str)
 
             else:
                 prophecy.where = read_int(line.op_str)

qiling/debugger/qdb/context.py

@@ -19,7 +19,7 @@ class Context:
 
     def __init__(self, ql):
         self.ql = ql
-        self.pointersize = self.ql.pointersize
+        self.pointersize = self.ql.arch.pointersize
         self.unpack = ql.unpack
         self.unpack16 = ql.unpack16
         self.unpack32 = ql.unpack32
@@ -31,7 +31,7 @@ def cur_addr(self):
         program counter of qiling instance
         """
 
-        return self.ql.reg.arch_pc
+        return self.ql.arch.regs.arch_pc
 
     def read_mem(self, address: int, size: int):
         """
@@ -45,7 +45,7 @@ def disasm(self, address: int, detail: bool = False) -> Optional[CsInsn]:
         helper function for disassembling
         """
 
-        md = self.ql.disassembler
+        md = self.ql.arch.disassembler
         md.detail = detail
 
         return next(md.disasm(self.read_insn(address), address), None)

qiling/debugger/qdb/frontend.py

@@ -165,7 +165,6 @@ def setup_ctx_manager(ql: Qiling) -> CtxManager:
     return {
             QL_ARCH.X86: CtxManager_X86,
             QL_ARCH.ARM: CtxManager_ARM,
-            QL_ARCH.ARM_THUMB: CtxManager_ARM,
             QL_ARCH.CORTEX_M: CtxManager_ARM,
             QL_ARCH.MIPS: CtxManager_MIPS,
             }.get(ql.arch.type)(ql)
@@ -185,7 +184,7 @@ def print_asm(self, insn: CsInsn, to_jump: Optional[bool] = None, address: int =
             trace_line = f"0x{insn.address:08x} │ {opcode:10s} {insn.mnemonic:10} {insn.op_str:35s}"
 
         cursor = " "
-        if self.ql.reg.arch_pc == insn.address:
+        if self.ql.arch.regs.arch_pc == insn.address:
             cursor = "►"
 
         jump_sign = " "
@@ -195,7 +194,7 @@ def print_asm(self, insn: CsInsn, to_jump: Optional[bool] = None, address: int =
         print(f"{jump_sign}  {cursor}   {color.DARKGRAY}{trace_line}{color.END}")
 
     def dump_regs(self):
-        return {reg_name: getattr(self.ql.reg, reg_name) for reg_name in self.regs}
+        return {reg_name: getattr(self.ql.arch.regs, reg_name) for reg_name in self.regs}
 
     def context_reg(self, saved_states):
         return NotImplementedError
@@ -204,12 +203,12 @@ def context_reg(self, saved_states):
     def context_stack(self):
 
         for idx in range(10):
-            addr = self.ql.reg.arch_sp + idx * self.ql.pointersize
-            if (val := _try_read(self.ql, addr, self.ql.pointersize)[0]):
-                print(f"$sp+0x{idx*self.ql.pointersize:02x}│ [0x{addr:08x}] —▸ 0x{self.ql.unpack(val):08x}", end="")
+            addr = self.ql.arch.regs.arch_sp + idx * self.ql.arch.pointersize
+            if (val := _try_read(self.ql, addr, self.ql.arch.pointersize)[0]):
+                print(f"$sp+0x{idx*self.ql.arch.pointersize:02x}│ [0x{addr:08x}] —▸ 0x{self.ql.unpack(val):08x}", end="")
 
             # try to dereference wether it's a pointer
-            if (buf := _try_read(self.ql, addr, self.ql.pointersize))[0] is not None:
+            if (buf := _try_read(self.ql, addr, self.ql.arch.pointersize))[0] is not None:
 
                 if (addr := self.ql.unpack(buf[0])):
 
@@ -230,7 +229,7 @@ def context_stack(self):
     def context_asm(self):
         # assembly before current location
         past_list = []
-        cur_addr = self.ql.reg.arch_pc
+        cur_addr = self.ql.arch.regs.arch_pc
 
         line = disasm(self.ql, cur_addr-0x10)
 
@@ -336,7 +335,7 @@ def context_reg(self, saved_reg_dump):
             lines += line
 
         print(lines.format(*cur_regs.values()))
-        print(color.GREEN, "[{cpsr[mode]} mode], Thumb: {cpsr[thumb]}, FIQ: {cpsr[fiq]}, IRQ: {cpsr[irq]}, NEG: {cpsr[neg]}, ZERO: {cpsr[zero]}, Carry: {cpsr[carry]}, Overflow: {cpsr[overflow]}".format(cpsr=self.get_flags(self.ql.reg.cpsr)), color.END, sep="")
+        print(color.GREEN, "[{cpsr[mode]} mode], Thumb: {cpsr[thumb]}, FIQ: {cpsr[fiq]}, IRQ: {cpsr[irq]}, NEG: {cpsr[neg]}, ZERO: {cpsr[zero]}, Carry: {cpsr[carry]}, Overflow: {cpsr[overflow]}".format(cpsr=self.get_flags(self.ql.arch.regs.cpsr)), color.END, sep="")
 
 
 class CtxManager_MIPS(CtxManager):
@@ -417,12 +416,12 @@ def context_reg(self, saved_reg_dump):
             lines += line
 
         print(lines.format(*cur_regs.values()))
-        print(color.GREEN, "EFLAGS: [CF: {flags[CF]}, PF: {flags[PF]}, AF: {flags[AF]}, ZF: {flags[ZF]}, SF: {flags[SF]}, OF: {flags[OF]}]".format(flags=get_x86_eflags(self.ql.reg.ef)), color.END, sep="")
+        print(color.GREEN, "EFLAGS: [CF: {flags[CF]}, PF: {flags[PF]}, AF: {flags[AF]}, ZF: {flags[ZF]}, SF: {flags[SF]}, OF: {flags[OF]}]".format(flags=get_x86_eflags(self.ql.arch.regs.ef)), color.END, sep="")
 
     @context_printer("[ DISASM ]", footer=True)
     def context_asm(self):
         past_list = []
-        cur_addr = self.ql.reg.arch_pc
+        cur_addr = self.ql.arch.regs.arch_pc
 
         cur_insn = disasm(self.ql, cur_addr)
         prophecy = self.predictor.predict()
@@ -494,7 +493,7 @@ def context_reg(self, saved_reg_dump):
             lines += line
 
         print(lines.format(cur_regs.values()))
-        print(color.GREEN, "[{cpsr[mode]} mode], Thumb: {cpsr[thumb]}, FIQ: {cpsr[fiq]}, IRQ: {cpsr[irq]}, NEG: {cpsr[neg]}, ZERO: {cpsr[zero]}, Carry: {cpsr[carry]}, Overflow: {cpsr[overflow]}".format(cpsr=get_arm_flags(self.ql.reg.cpsr)), color.END, sep="")
+        print(color.GREEN, "[{cpsr[mode]} mode], Thumb: {cpsr[thumb]}, FIQ: {cpsr[fiq]}, IRQ: {cpsr[irq]}, NEG: {cpsr[neg]}, ZERO: {cpsr[zero]}, Carry: {cpsr[carry]}, Overflow: {cpsr[overflow]}".format(cpsr=get_arm_flags(self.ql.arch.regs.cpsr)), color.END, sep="")
 
 
 if __name__ == "__main__":