Merge pull request #1011 from ucgJhe/qdb

Qdb: support mcu

Author: xwings

qiling/debugger/qdb/frontend.py

@@ -11,7 +11,7 @@
 
 from qiling.const import QL_ARCH
 
-from .utils import dump_regs, get_arm_flags, disasm, parse_int, handle_bnj
+from .utils import dump_regs, get_arm_flags, disasm, _parse_int, handle_bnj
 from .const import *
 
 
@@ -59,7 +59,7 @@ def extract_count(t):
     elif ql.archtype == QL_ARCH.MIPS:
         addr = addr.replace("fp", "s8")
 
-    addr = getattr(ql.reg, addr) if addr in ql.reg.register_mapping.keys() else parse_int(addr)
+    addr = getattr(ql.reg, addr) if addr in ql.reg.register_mapping.keys() else _parse_int(addr)
 
     def unpack(bs, sz):
         return {
@@ -164,67 +164,78 @@ def context_reg(ql: Qiling, saved_states: Optional[Mapping[str, int]] = None, /,
 
             print(lines.format(*_cur_regs.values()))
 
-        elif ql.archtype in (QL_ARCH.ARM, QL_ARCH.ARM_THUMB):
+        elif ql.archtype in (QL_ARCH.ARM, QL_ARCH.ARM_THUMB, QL_ARCH.CORTEX_M):
+
+            regs_in_row = 4
+            if ql.archtype == QL_ARCH.CORTEX_M:
+                regs_in_row = 3
 
             _cur_regs.update({"sl": _cur_regs.pop("r10")})
-            _cur_regs.update({"fp": _cur_regs.pop("r11")})
             _cur_regs.update({"ip": _cur_regs.pop("r12")})
+            _cur_regs.update({"fp": _cur_regs.pop("r11")})
+
+            # for re-order
+            _cur_regs.update({"xpsr": _cur_regs.pop("xpsr")})
+            _cur_regs.update({"control": _cur_regs.pop("control")})
+            _cur_regs.update({"primask": _cur_regs.pop("primask")})
+            _cur_regs.update({"faultmask": _cur_regs.pop("faultmask")})
+            _cur_regs.update({"basepri": _cur_regs.pop("basepri")})
 
+            _diff = None
             if saved_states is not None:
                 _saved_states = copy.deepcopy(saved_states)
                 _saved_states.update({"sl": _saved_states.pop("r10")})
-                _saved_states.update({"fp": _saved_states.pop("r11")})
                 _saved_states.update({"ip": _saved_states.pop("r12")})
+                _saved_states.update({"fp": _saved_states.pop("r11")})
                 _diff = [k for k in _cur_regs if _cur_regs[k] != _saved_states[k]]
 
-            else:
-                _diff = None
-
             lines = ""
             for idx, r in enumerate(_cur_regs, 1):
-                line = "{}{:}: 0x{{:08x}} {}\t".format(_colors[(idx-1) // 4], r, color.END)
+
+                line = "{}{:}: 0x{{:08x}} {}  ".format(_colors[(idx-1) // regs_in_row], r, color.END)
 
                 if _diff and r in _diff:
                     line = "{}{}".format(color.UNDERLINE, color.BOLD) + line
 
-                if idx % 4 == 0:
+                if idx % regs_in_row == 0:
                     line += "\n"
 
                 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(ql.reg.cpsr)), color.END, sep="")
 
-    # context render for Stack
-    with context_printer(ql, "[ STACK ]", ruler="─"):
-
-        for idx in range(10):
-            addr = ql.reg.arch_sp + idx * ql.pointersize
-            val = ql.mem.read(addr, ql.pointersize)
-            print(f"$sp+0x{idx*ql.pointersize:02x}│ [0x{addr:08x}] —▸ 0x{ql.unpack(val):08x}", end="")
+    if ql.archtype != QL_ARCH.CORTEX_M:
+    # context render for Stack, skip this for CORTEX_M
+        with context_printer(ql, "[ STACK ]", ruler="─"):
 
-            try:  # try to deference wether its a pointer
-                buf = ql.mem.read(addr, ql.pointersize)
-            except:
-                buf = None
+            for idx in range(10):
+                addr = ql.reg.arch_sp + idx * ql.pointersize
+                val = ql.mem.read(addr, ql.pointersize)
+                print(f"$sp+0x{idx*ql.pointersize:02x}│ [0x{addr:08x}] —▸ 0x{ql.unpack(val):08x}", end="")
 
-            if (addr := ql.unpack(buf)):
-                try:  # try to deference again
+                try:  # try to deference wether its a pointer
                     buf = ql.mem.read(addr, ql.pointersize)
                 except:
                     buf = None
 
-                if buf:
-                    try:
-                        s = ql.mem.string(addr)
+                if (addr := ql.unpack(buf)):
+                    try:  # try to deference again
+                        buf = ql.mem.read(addr, ql.pointersize)
                     except:
-                        s = None
+                        buf = None
 
-                    if s and s.isprintable():
-                        print(f" ◂— {ql.mem.string(addr)}", end="")
-                    else:
-                        print(f" ◂— 0x{ql.unpack(buf):08x}", end="")
-            print()
+                    if buf:
+                        try:
+                            s = ql.mem.string(addr)
+                        except:
+                            s = None
+
+                        if s and s.isprintable():
+                            print(f" ◂— {ql.mem.string(addr)}", end="")
+                        else:
+                            print(f" ◂— 0x{ql.unpack(buf):08x}", end="")
+                print()
 
 
 def print_asm(ql: Qiling, insn: CsInsn, to_jump: Optional[bool] = None, address: int = None) -> None:
@@ -251,9 +262,7 @@ def context_asm(ql: Qiling, address: int) -> None:
 
         past_list = []
 
-        if ql.archtype in (QL_ARCH.MIPS, QL_ARCH.ARM, QL_ARCH.ARM_THUMB):
-
-            line = disasm(ql, address-0x10)
+        line = disasm(ql, address-0x10)
 
         while line:
             if line.address == address: