qilingframework/qiling
1
0
Fork 0
mirror of https://github.com/qilingframework/qiling.git synced 2026-10-12 02:21:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1574 from elicn/fix-qdb-cortexm

Browse Source 
Fix qdb support for ARM Cortex-M
This commit is contained in:
xwings
2025-06-23 21:30:30 +08:00
committed by GitHub
parent d614855e78 95d7b8f6d9
commit 7bcb5abc1b
3 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qiling/debugger/qdb/arch/arch_arm.py
+5 -1
View File
@@ -3,12 +3,14 @@
# Cross Platform and Multi Architecture Advanced Binary Emulation Framework
#
from typing import Dict, Optional
from typing import ClassVar, Dict, Optional
from .arch import Arch
class ArchARM(Arch):
_flags_reg: ClassVar[str] = 'cpsr'
def __init__(self) -> None:
regs = (
'r0', 'r1', 'r2', 'r3',
@@ -134,6 +136,8 @@ class ArchARM(Arch):
class ArchCORTEX_M(ArchARM):
_flags_reg: ClassVar[str] = 'xpsr'
def __init__(self):
super().__init__()
qiling/debugger/qdb/branch_predictor/branch_predictor_arm.py
+7 -7
View File
@@ -27,11 +27,11 @@ class BranchPredictorARM(BranchPredictor, ArchARM):
stop = 'udf'
def get_cpsr(self) -> Tuple[bool, bool, bool, bool]:
"""Get flags map of CPSR.
def get_cond_flags(self) -> Tuple[bool, bool, bool, bool]:
"""Get condition status flags from CPSR / xPSR.
"""
cpsr = self.read_reg('cpsr')
cpsr = self.read_reg(self._flags_reg)
return (
(cpsr & (0b1 << 28)) != 0, # V, overflow flag
@@ -122,9 +122,9 @@ class BranchPredictorARM(BranchPredictor, ArchARM):
def __is_taken(cc: int) -> Tuple[bool, Tuple[bool, ...]]:
pred = predicate[cc]
cpsr = self.get_cpsr()
flags = self.get_cond_flags()
return pred(*cpsr), cpsr
return pred(*flags), flags
# conditions predicate selector
predicate: Dict[int, Callable[..., bool]] = {
@@ -215,13 +215,13 @@ class BranchPredictorARM(BranchPredictor, ArchARM):
where = __parse_op(operands[1], **msize[suffix])
elif iname in binop:
going, cpsr = __is_taken(insn.cc)
going, flags = __is_taken(insn.cc)
if going:
operator = binop[iname]
op1 = __parse_op(operands[1])
op2 = __parse_op(operands[2])
carry = int(cpsr[1])
carry = int(flags[1])
where = (op1 and op2) and operator(op1, op2, carry)
qiling/debugger/qdb/render/render_arm.py
+2 -2
View File
@@ -3,7 +3,7 @@
# Cross Platform and Multi Architecture Advanced Binary Emulation Framework
#
from typing import Iterator, Optional
from typing import Iterator
from .render import Render, ContextRender
from ..arch import ArchARM, ArchCORTEX_M
@@ -15,7 +15,7 @@ class ContextRenderARM(ContextRender, ArchARM):
"""
def print_mode_info(self) -> None:
cpsr = self.read_reg('cpsr')
cpsr = self.read_reg(self._flags_reg)
flags = ArchARM.get_flags(cpsr)
mode = ArchARM.get_mode(cpsr)