MemoryManager should work now and move check_and_eval to misc.py

Author: ucgJhe

qiling/debugger/qdb/branch_predictor/branch_predictor_x86.py

@@ -9,6 +9,7 @@
 
 from .branch_predictor import *
 from ..arch import ArchX86
+from ..misc import check_and_eval
 
 class BranchPredictorX86(BranchPredictor, ArchX86):
     """
@@ -98,12 +99,6 @@ def predict(self):
 
         if prophecy.going:
             takeaway_list = ["ptr", "dword", "[", "]"]
-            class AST_checker(ast.NodeVisitor):
-                def generic_visit(self, node):
-                    if type(node) in (ast.Module, ast.Expr, ast.BinOp, ast.Constant, ast.Add, ast.Mult, ast.Sub):
-                        ast.NodeVisitor.generic_visit(self, node)
-                    else:
-                        raise ParseError("malform or invalid ast node")
 
             if len(line.op_str.split()) > 1:
                 new_line = line.op_str.replace(":", "+")
@@ -119,12 +114,8 @@ def generic_visit(self, node):
                     if each_reg in new_line:
                         new_line = re.sub(each_reg, hex(self.read_reg(each_reg)), new_line)
 
-                checker = AST_checker()
-                ast_tree = ast.parse(new_line)
 
-                checker.visit(ast_tree)
-
-                prophecy.where = eval(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)

qiling/debugger/qdb/context.py

@@ -74,7 +74,7 @@ def try_read_pointer(self, address: int) -> Optional[bytes]:
         try to read pointer size of data from ql.mem
         """
 
-        return self.try_read(address, self.pointersize)
+        return self.try_read(address, self.arch_insn_size)
 
     def read_string(self, address: int) -> Optional[str]:
         """

qiling/debugger/qdb/memory.py

@@ -7,7 +7,8 @@
 
 from .context import Context
 from .arch import ArchCORTEX_M, ArchARM, ArchMIPS, ArchX86
-import re, ast, math
+from .misc import check_and_eval
+import re, math
 
 
 
@@ -122,7 +123,12 @@ def parse(self, line: str):
             if (regs_dict := getattr(self, "regs_need_swapped", None)):
                 for each in rest:
                     for reg in regs_dict:
-                        line.append(regs_dict[each] if each in regs_dict else each)
+                        if each in regs_dict:
+                            line.append(regs_dict[each])
+                    else:
+                        line.append(each)
+            else:
+                line = rest
 
             # for simple calculation with register and address
 
@@ -133,20 +139,13 @@ def parse(self, line: str):
                 if reg in line:
                     line = re.sub(f"\{reg}", hex(self.ql.reg.read(each_reg)), line)
 
-            class AST_checker(ast.NodeVisitor):
-                def generic_visit(self, node):
-                    if type(node) in (ast.Module, ast.Expr, ast.BinOp, ast.Constant, ast.Add, ast.Mult, ast.Sub):
-                        ast.NodeVisitor.generic_visit(self, node)
-                    else:
-                        raise ParseError("malform or invalid ast node")
 
             ft, sz, ct = fmt
 
-            checker = AST_checker()
-            ast_tree = ast.parse(line)
-            checker.visit(ast_tree)
-
-            addr = eval(line)
+            try:
+                addr = check_and_eval(line)
+            except:
+                return "something went wrong ..."
 
             if ft == "i":
                 output = self.handle_i(addr, ct)

qiling/debugger/qdb/misc.py

@@ -5,6 +5,26 @@
 
 from typing import Callable, Optional
 
+import ast
+
+def check_and_eval(line: str):
+    """
+    This function will valid all type of nodes and evaluate it if nothing went wrong
+    """
+
+    class AST_checker(ast.NodeVisitor):
+        def generic_visit(self, node):
+            if type(node) in (ast.Module, ast.Expr, ast.BinOp, ast.Constant, ast.Add, ast.Mult, ast.Sub):
+                ast.NodeVisitor.generic_visit(self, node)
+            else:
+                raise ParseError("malform or invalid ast node")
+
+    checker = AST_checker()
+    ast_tree = ast.parse(line)
+    checker.visit(ast_tree)
+
+    return eval(line)
+
 
 class Breakpoint:
     """

qiling/debugger/qdb/qdb.py

@@ -322,11 +322,8 @@ def do_examine(self, line: str) -> None:
         e.g. x/4wx 0x41414141 , print 4 word size begin from address 0x41414141 in hex
         """
 
-        # try:
         if type(err_msg := self.mm.parse(line)) is str:
             qdb_print(QDB_MSG.ERROR, err_msg)
-        # except:
-            # qdb_print(QDB_MSG.ERROR, "something went wrong ...")
 
     def do_start(self, *args) -> None:
         """

qiling/debugger/qdb/utils.py

@@ -26,6 +26,7 @@
         )
 
 from .const import color, QDB_MSG
+
 
 
 def qdb_print(msgtype: QDB_MSG, msg: str) -> None: